summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt5
-rw-r--r--lib/compatibility/CMakeLists.txt2
-rw-r--r--lib/compatibility/tdemdi/CMakeLists.txt24
-rw-r--r--lib/compatibility/tdemdi/qextmdi/CMakeLists.txt30
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp101
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.h18
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp56
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h6
-rw-r--r--lib/compatibility/tdemdi/qextmdi/ktabbar.cpp22
-rw-r--r--lib/compatibility/tdemdi/qextmdi/ktabbar.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp28
-rw-r--r--lib/compatibility/tdemdi/qextmdi/ktabwidget.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp14
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp148
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h10
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp12
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp44
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildview.h6
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp18
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp5
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp14
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h5
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp39
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h5
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp237
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp22
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h6
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp6
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp6
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h6
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h2
-rw-r--r--lib/ksavealldialog.cpp12
-rw-r--r--lib/ksavealldialog.h4
-rw-r--r--lib/qextfileinfo.cpp48
-rw-r--r--lib/qextfileinfo.h2
44 files changed, 504 insertions, 493 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index aaa33883..22bd24a9 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -11,6 +11,9 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
+)
+
+include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -21,3 +24,5 @@ include_directories(
tde_add_library( quantamodule STATIC_PIC AUTOMOC
SOURCES qextfileinfo.cpp ksavealldialog.cpp
)
+
+add_subdirectory( compatibility )
diff --git a/lib/compatibility/CMakeLists.txt b/lib/compatibility/CMakeLists.txt
new file mode 100644
index 00000000..e879bf03
--- /dev/null
+++ b/lib/compatibility/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory( tdemdi )
diff --git a/lib/compatibility/tdemdi/CMakeLists.txt b/lib/compatibility/tdemdi/CMakeLists.txt
new file mode 100644
index 00000000..980af1c9
--- /dev/null
+++ b/lib/compatibility/tdemdi/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_subdirectory( qextmdi )
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi
+)
+
+include_directories( SYSTEM
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+##### quantatdemdi (static)
+
+tde_add_library( quantatdemdi STATIC_PIC AUTOMOC
+
+ SOURCES
+ dummy.cpp
+ LINK
+ tdeparts-shared
+ tdeio-shared
+ quantaqextmdi-static
+)
diff --git a/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
new file mode 100644
index 00000000..78a41177
--- /dev/null
+++ b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
@@ -0,0 +1,30 @@
+#add_subdirectory( res )
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi/res
+)
+
+include_directories( SYSTEM
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+##### quantatdemdi (static)
+
+tde_add_library( quantaqextmdi STATIC_PIC AUTOMOC
+
+ SOURCES
+ tdemdichildarea.cpp tdemdichildfrm.cpp
+ tdemdichildfrmcaption.cpp tdemdichildview.cpp
+ tdemdimainfrm.cpp tdemditaskbar.cpp
+ tdemultitabbar.cpp tdemditoolviewaccessor.cpp
+ tdemdidocumentviewtabwidget.cpp tdemdifocuslist.cpp
+ tdemdiguiclient.cpp ktabwidget.cpp
+ ktabbar.cpp kdockwidget.cpp
+ kdockwidget_private.cpp tdemdidockcontainer.cpp
+ LINK
+ tdeparts-shared
+)
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index ee670afb..e8752b41 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -42,7 +42,10 @@
#include <kdebug.h>
#include <tdeglobalsettings.h>
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#ifdef TQ_WS_X11
#include <X11/X.h>
#include <X11/Xlib.h>
@@ -122,7 +125,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw )
void KDockMainWindow::setView( TQWidget *view )
{
if ( view->isA("KDockWidget") ){
- if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this );
+ if ( view->parent() != this ) ((KDockWidget*)view)->applyToWidget( this );
}
#ifndef NO_KDE2
@@ -203,7 +206,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+ style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -219,7 +222,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
#ifdef BORDERLESS_WINDOWS
setCursor(TQCursor(ArrowCursor));
#endif
- d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) );
+ d = new KDockWidgetHeaderPrivate( this );
layout = new TQHBoxLayout( this );
layout->setResizeMode( TQLayout::Minimum );
@@ -230,28 +233,28 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
TQToolTip::add( closeButton, i18n("Close") );
closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
- connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
- connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
+ connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked()));
+ connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock()));
stayButton = new KDockButton_Private( this, "DockStayButton" );
TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") );
stayButton->setToggleButton( true );
stayButton->setPixmap( const_cast< const char** >(not_close_xpm) );
stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
- connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked()));
+ connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked()));
dockbackButton = new KDockButton_Private( this, "DockbackButton" );
TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") );
dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm));
dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
- connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked()));
- connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack()));
+ connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked()));
+ connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack()));
d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" );
TQToolTip::add( d->toDesktopButton, i18n("Detach") );
d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm));
d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
- connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
+ connect( d->toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop()));
stayButton->hide();
d->dummy = new TQWidget( this );
@@ -501,7 +504,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
layout->setResizeMode( TQLayout::Minimum );
manager = dockManager;
- manager->childDock->append( TQT_TQOBJECT(this) );
+ manager->childDock->append( this );
installEventFilter( manager );
eDocking = DockFullDocking;
@@ -525,7 +528,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
setIcon( pixmap);
widget = 0L;
- TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) );
+ TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) );
applyToWidget( parent, TQPoint(0,0) );
}
@@ -565,8 +568,8 @@ KDockWidget::~KDockWidget()
}
}
emit iMBeingClosed();
- if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this));
- manager->childDock->remove( TQT_TQOBJECT(this) );
+ if (manager->d) manager->d->containerDocks.remove(this);
+ manager->childDock->remove( this );
delete pix;
delete d; // destroy private data
d=0;
@@ -577,7 +580,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
TQWidget::paintEvent(pe);
TQPainter paint;
paint.begin( this );
- style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
+ style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -779,7 +782,7 @@ void KDockWidget::updateHeader()
setCursor(TQCursor(ArrowCursor));
#endif
- if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){
+ if ( (parent() == manager->main) || isGroup || (eDocking == KDockWidget::DockNone) ){
header->hide();
} else {
header->setTopLevel( false );
@@ -800,7 +803,7 @@ void KDockWidget::updateHeader()
void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
{
- if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) )
+ if ( parent() != s )
{
hide();
reparent(s, 0, TQPoint(0,0), false);
@@ -922,7 +925,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
{
if (!parent()) return 0;
if (!parent()->inherits("KDockSplitter")) return 0;
- Qt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?Qt::Vertical:Qt::Horizontal;
+ TQt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?TQt::Vertical:TQt::Horizontal;
if (((KDockSplitter*)(parent()))->orientation()==orientation)
{
KDockWidget *neighbor=
@@ -931,7 +934,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast());
if (neighbor==this)
- return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos));
+ return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
else
if (neighbor->getWidget() && (neighbor->getWidget()->tqt_cast("KDockTabGroup")))
return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
@@ -939,7 +942,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
return neighbor;
}
else
- return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos));
+ return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
return 0;
}
@@ -1106,7 +1109,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
if ( dockPos == KDockWidget::DockCenter )
{
KDockTabGroup* tab = new KDockTabGroup( newDock, "_dock_tab");
- TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*)));
+ TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*)));
newDock->setWidget( tab );
target->applyToWidget( tab );
@@ -1143,13 +1146,13 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
// if to dock not to the center of the target dockwidget,
// dock to newDock
KDockSplitter* panner = 0L;
- if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() );
- if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() );
+ if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_",TQt::Horizontal, spliPos, manager->splitterHighResolution() );
+ if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_",TQt::Vertical , spliPos, manager->splitterHighResolution() );
newDock->setWidget( panner );
panner->setOpaqueResize(manager->splitterOpaqueResize());
panner->setKeepSize(manager->splitterKeepSize());
- panner->setFocusPolicy( TQ_NoFocus );
+ panner->setFocusPolicy( TQWidget::NoFocus );
target->applyToWidget( panner );
applyToWidget( panner );
target->formerDockPos = target->currentDockPos;
@@ -1328,13 +1331,13 @@ void KDockWidget::undock()
split->deactivate();
if ( split->getFirst() == parentOfTab ){
split->activate( lastTab );
- if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
+ if ( ((KDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical )
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft );
else
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop );
} else {
split->activate( 0L, lastTab );
- if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
+ if ( ((KDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical )
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight );
else
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom );
@@ -1430,7 +1433,7 @@ void KDockWidget::setWidget( TQWidget* mw )
{
if ( !mw ) return;
- if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){
+ if ( mw->parent() != this ){
mw->reparent(this, 0, TQPoint(0,0), false);
}
@@ -1447,7 +1450,7 @@ void KDockWidget::setWidget( TQWidget* mw )
if (dc)
{
d->isContainer=true;
- manager->d->containerDocks.append(TQT_TQOBJECT(this));
+ manager->d->containerDocks.append(this);
}
else
{
@@ -1486,13 +1489,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
bool KDockWidget::mayBeHide() const
{
- bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+ bool f = (parent() != manager->main);
return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) );
}
bool KDockWidget::mayBeShow() const
{
- bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+ bool f = (parent() != manager->main);
return ( !isGroup && !isTabGroup && f && !isVisible() );
}
@@ -1541,15 +1544,15 @@ void KDockWidget::setFormerBrotherDockWidget(KDockWidget *dockWidget)
{
formerBrotherDockWidget = dockWidget;
if( formerBrotherDockWidget )
- TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
- this, TQT_SLOT(loseFormerBrotherDockWidget()) );
+ TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+ this, TQ_SLOT(loseFormerBrotherDockWidget()) );
}
void KDockWidget::loseFormerBrotherDockWidget()
{
if( formerBrotherDockWidget )
- TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
- this, TQT_SLOT(loseFormerBrotherDockWidget()) );
+ TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+ this, TQ_SLOT(loseFormerBrotherDockWidget()) );
formerBrotherDockWidget = 0L;
repaint();
}
@@ -1639,8 +1642,8 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name )
menu = new TQPopupMenu();
#endif
- connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) );
- connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) );
+ connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) );
+ connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) );
childDock = new TQObjectList();
childDock->setAutoDelete( false );
@@ -1680,7 +1683,7 @@ void KDockManager::activate()
obj->show();
}
}
- if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show();
+ if ( !main->inherits("TQDialog") ) main->show();
}
bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
@@ -1700,7 +1703,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
break;
case TQEvent::MouseButtonPress:
- if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( curdw->eDocking != (int)KDockWidget::DockNone ){
dropCancel = true;
curdw->setFocus();
@@ -1725,7 +1728,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
}
break;
case TQEvent::MouseButtonRelease:
- if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( dragging ){
if ( !dropCancel )
drop();
@@ -1803,7 +1806,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
if (d->readyToDrag) {
d->readyToDrag = false;
}
- if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) &&
+ if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) &&
(curdw->eDocking != (int)KDockWidget::DockNone) ) {
startDrag( curdw);
}
@@ -1841,8 +1844,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
}
w = p;
}
- if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L;
- if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L;
+ if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L;
+ if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L;
if (dynamic_cast<KDockContainer*>(w)) return 0L;
if (!childDockWidgetList) return 0L;
@@ -2159,7 +2162,7 @@ void KDockManager::writeConfig(TQDomElement &base)
TQObjectListIt it(*childDock);
KDockWidget *obj1;
while ( (obj1=(KDockWidget*)it.current()) ) {
- if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
+ if ( obj1->parent() == main )
mainWidgetStr = TQString::fromLatin1(obj1->name());
nList.append(obj1->name());
++it;
@@ -2347,7 +2350,7 @@ void KDockManager::readConfig(TQDomElement &base)
KDockWidget *second = getDockWidgetFromName(secondName);
if (first && second) {
obj = first->manualDock(second,
- (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop,
+ (orientation == (int)TQt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop,
separatorPos);
if (obj)
obj->setName(name.latin1());
@@ -2458,7 +2461,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget)
{
if (!autoCreateDock) return;
autoCreateDock->setAutoDelete(false);
- autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget));
+ autoCreateDock->removeRef(pDockWidget);
autoCreateDock->setAutoDelete(true);
}
@@ -2494,7 +2497,7 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group )
++it;
//debug(" +Add subdock %s", obj->name());
nList.append( obj->name() );
- if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) )
+ if ( obj->parent() == main )
c->writeEntry( "Main:view", obj->name() );
}
@@ -2702,9 +2705,9 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
KDockWidget* last = getDockWidgetFromName( c->readEntry( oname + ":last_name" ) );
int sepPos = c->readNumEntry( oname + ":sepPos" );
- Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" );
+ TQt::Orientation p = (TQt::Orientation)c->readNumEntry( oname + ":orientation" );
if ( first && last ){
- obj = first->manualDock( last, ( p ==Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos );
+ obj = first->manualDock( last, ( p ==TQt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos );
if (obj){
obj->setName( oname.latin1() );
}
@@ -2831,7 +2834,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName )
if ( autoCreateDock ){
kdDebug(282)<<"Autocreating dock: "<<dockName<<endl;
autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) );
- autoCreateDock->append( TQT_TQOBJECT(autoCreate) );
+ autoCreateDock->append( autoCreate );
}
return autoCreate;
}
@@ -3046,7 +3049,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
#ifndef NO_KDE2
// kdDebug(282)<<"KDockArea::resize"<<endl;
#endif
- TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false);
+ TQObjectList *list=queryList("TQWidget",0,false);
TQObjectListIt it( *list ); // iterate over the buttons
TQObject *obj;
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
index aad41407..2f4d4d01 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
@@ -104,7 +104,7 @@ namespace KMDI
*/
class KDockWidgetAbstractHeader : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -154,7 +154,7 @@ private:
*/
class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -200,7 +200,7 @@ private:
*/
class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -242,7 +242,7 @@ private:
*/
class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -368,7 +368,7 @@ private:
*/
class TDEUI_EXPORT KDockTabGroup : public TQTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -429,7 +429,7 @@ private:
*/
class TDEUI_EXPORT KDockWidget: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
friend class KDockManager;
friend class KDockSplitter;
@@ -911,7 +911,7 @@ private:
*/
class TDEUI_EXPORT KDockManager: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class KDockWidget;
friend class KDockMainWindow;
@@ -1308,7 +1308,7 @@ private:
*/
class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
friend class KDockManager;
@@ -1475,7 +1475,7 @@ private:
class TDEUI_EXPORT KDockArea : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
friend class KDockManager;
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp
index ef60f031..06a3481a 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp
@@ -26,7 +26,7 @@
#include <tqtimer.h>
#include <tqapplication.h>
-KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
+KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, TQt::Orientation orient, int pos, bool highResolution)
: TQWidget(parent, name)
{
m_dontRecalc=false;
@@ -59,7 +59,7 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1)
divider->setLineWidth(1);
divider->raise();
- if (m_orientation ==Qt::Horizontal)
+ if (m_orientation ==TQt::Horizontal)
divider->setCursor(TQCursor(sizeVerCursor));
else
divider->setCursor(TQCursor(sizeHorCursor));
@@ -76,25 +76,25 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1)
if (((KDockWidget*)child0)->forcedFixedWidth()!=-1)
{
setForcedFixedWidth(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedWidth());
- //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize()));
+ //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize()));
}
else
if (((KDockWidget*)child1)->forcedFixedWidth()!=-1)
{
setForcedFixedWidth(((KDockWidget*)child1),((KDockWidget*)child1)->forcedFixedWidth());
- //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize()));
+ //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize()));
}
if (((KDockWidget*)child0)->forcedFixedHeight()!=-1)
{
setForcedFixedHeight(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedHeight());
- //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize()));
+ //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize()));
}
else
if (((KDockWidget*)child1)->forcedFixedHeight()!=-1)
{
setForcedFixedHeight(((KDockWidget*)child1),((KDockWidget*)child1)->forcedFixedHeight());
- //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize()));
+ //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize()));
}
@@ -179,7 +179,7 @@ void KDockSplitter::setupMinMaxSize()
{
// Set the minimum and maximum sizes
int minx, maxx, miny, maxy;
- if (m_orientation ==Qt::Horizontal) {
+ if (m_orientation ==TQt::Horizontal) {
miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
@@ -238,11 +238,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
double factor = (mHighResolution)? 10000.0:100.0;
// real resize event, recalculate xpos
if (ev && mKeepSize && isVisible()) {
-// kdDebug(282)<<"mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl;
+// kdDebug(282)<<"mKeepSize : "<< ((m_orientation ==TQt::Horizontal) ? "Horizontal":"Vertical") <<endl;
if (ev->oldSize().width() != ev->size().width())
{
- if (m_orientation ==Qt::Horizontal) {
+ if (m_orientation ==TQt::Horizontal) {
xpos = tqRound(factor * checkValue( child0->height()+1 ) / height());
} else {
xpos = tqRound(factor * checkValue( child0->width()+1 ) / width());
@@ -252,9 +252,9 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
}
else
{
-// kdDebug(282)<<"!mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl;
+// kdDebug(282)<<"!mKeepSize : "<< ((m_orientation ==TQt::Horizontal) ? "Horizontal":"Vertical") <<endl;
if (/*ev &&*/ isVisible()) {
- if (m_orientation ==Qt::Horizontal) {
+ if (m_orientation ==TQt::Horizontal) {
/* if (ev->oldSize().height() != ev->size().height())*/
{
if (fixedHeight0!=-1)
@@ -287,15 +287,15 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
KDockWidget *c0=(KDockWidget*)child0;
KDockWidget *c1=(KDockWidget*)child1;
bool stdHandling=false;
- if ( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
- ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
+ if ( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
+ ( (m_orientation==TQt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget()))
&& (dc->m_overlapMode)) {
- int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor);
+ int position= tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor);
position=checkValueOverlapped(position,child0);
child0->raise();
divider->raise();
- if (m_orientation ==Qt::Horizontal){
+ if (m_orientation ==TQt::Horizontal){
child0->setGeometry(0, 0, width(), position);
child1->setGeometry(0, dc->m_nonOverlapSize+4, width(),
height()-dc->m_nonOverlapSize-4);
@@ -309,11 +309,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
} else {
if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))
&& (dc->m_overlapMode)) {
- int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor);
+ int position= tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor);
position=checkValueOverlapped(position,child1);
child1->raise();
divider->raise();
- if (m_orientation ==Qt::Horizontal){
+ if (m_orientation ==TQt::Horizontal){
child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize-4);
child1->setGeometry(0, position+4, width(),
height()-position-4);
@@ -331,8 +331,8 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
else stdHandling=true;
if (stdHandling) {
- int position = checkValue( tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor) );
- if (m_orientation ==Qt::Horizontal){
+ int position = checkValue( tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor) );
+ if (m_orientation ==TQt::Horizontal){
child0->setGeometry(0, 0, width(), position);
child1->setGeometry(0, position+4, width(), height()-position-4);
divider->setGeometry(0, position, width(), 4);
@@ -349,7 +349,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const {
if (initialised) {
- if (m_orientation ==Qt::Vertical) {
+ if (m_orientation ==TQt::Vertical) {
if (child0==overlappingWidget) {
if (position<(child0->minimumSize().width()))
position=child0->minimumSize().width();
@@ -358,7 +358,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
position=width()-(child1->minimumSize().width())-4;
if (position<0) position=0;
}
- } else {// orientation ==Qt::Horizontal
+ } else {// orientation ==TQt::Horizontal
if (child0==overlappingWidget) {
if (position<(child0->minimumSize().height()))
position=child0->minimumSize().height();
@@ -377,7 +377,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
int KDockSplitter::checkValue( int position ) const
{
if (initialised){
- if (m_orientation ==Qt::Vertical){
+ if (m_orientation ==TQt::Vertical){
if (position < (child0->minimumSize().width()))
position = child0->minimumSize().width();
if ((width()-4-position) < (child1->minimumSize().width()))
@@ -392,9 +392,9 @@ int KDockSplitter::checkValue( int position ) const
if (position < 0) position = 0;
- if ((m_orientation ==Qt::Vertical) && (position > width()))
+ if ((m_orientation ==TQt::Vertical) && (position > width()))
position = width();
- if ((m_orientation ==Qt::Horizontal) && (position > height()))
+ if ((m_orientation ==TQt::Horizontal) && (position > height()))
position = height();
return position;
@@ -411,7 +411,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
mev= (TQMouseEvent*)e;
child0->setUpdatesEnabled(mOpaqueResize);
child1->setUpdatesEnabled(mOpaqueResize);
- if (m_orientation ==Qt::Horizontal) {
+ if (m_orientation ==TQt::Horizontal) {
if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
{
handled=true; break;
@@ -445,7 +445,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
child0->setUpdatesEnabled(true);
child1->setUpdatesEnabled(true);
mev= (TQMouseEvent*)e;
- if (m_orientation ==Qt::Horizontal){
+ if (m_orientation ==TQt::Horizontal){
if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
{
handled=true; break;
@@ -544,7 +544,7 @@ KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name )
:TQPushButton( parent, name )
{
moveMouse = false;
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
}
KDockButton_Private::~KDockButton_Private()
@@ -620,7 +620,7 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w)
{
if (w) {
TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget();
- if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) {
+ if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) {
embeddedWdg->setFocus();
}
}
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h
index 1a4d021f..44760156 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h
@@ -42,7 +42,7 @@ class KDockContainer;
*/
class TDEUI_EXPORT KDockSplitter : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient=TQt::Vertical, int pos= 50, bool highResolution=false);
@@ -117,7 +117,7 @@ private:
*/
class TDEUI_EXPORT KDockButton_Private : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDockButton_Private( TQWidget *parent=0, const char *name=0 );
@@ -143,7 +143,7 @@ private:
*/
class TDEUI_EXPORT KDockWidgetPrivate : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDockWidgetPrivate();
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
index fff6b2c1..dd339c61 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
@@ -43,12 +43,12 @@ KTabBar::KTabBar( TQWidget *parent, const char *name )
setMouseTracking( true );
mEnableCloseButtonTimer = new TQTimer( this );
- connect( mEnableCloseButtonTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( enableCloseButton() ) );
+ connect( mEnableCloseButtonTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( enableCloseButton() ) );
mActivateDragSwitchTabTimer = new TQTimer( this );
- connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) );
+ connect( mActivateDragSwitchTabTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( activateDragSwitchTab() ) );
- connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange()));
+ connect(this, TQ_SIGNAL(layoutChanged()), TQ_SLOT(onLayoutChange()));
}
KTabBar::~KTabBar()
@@ -87,7 +87,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
{
- if( e->button() != Qt::LeftButton )
+ if( e->button() != TQt::LeftButton )
return;
TQTab *tab = selectTab( e->pos() );
@@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
void KTabBar::mousePressEvent( TQMouseEvent *e )
{
- if( e->button() == Qt::LeftButton ) {
+ if( e->button() == TQt::LeftButton ) {
mEnableCloseButtonTimer->stop();
mDragStart = e->pos();
}
- else if( e->button() == Qt::RightButton ) {
+ else if( e->button() == TQt::RightButton ) {
TQTab *tab = selectTab( e->pos() );
if( tab ) {
emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) );
@@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e )
void KTabBar::mouseMoveEvent( TQMouseEvent *e )
{
- if ( e->state() == Qt::LeftButton ) {
+ if ( e->state() == TQt::LeftButton ) {
TQTab *tab = selectTab( e->pos() );
if ( mDragSwitchTab && tab != mDragSwitchTab ) {
mActivateDragSwitchTabTimer->stop();
@@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
}
}
}
- else if ( e->state() == Qt::MidButton ) {
+ else if ( e->state() == TQt::MidButton ) {
if (mReorderStartTab==-1) {
int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos = e->pos();
@@ -200,7 +200,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
mEnableCloseButtonTimer->start( TQApplication::doubleClickInterval(), true );
}
mHoverCloseButtonTab = t;
- connect( mHoverCloseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( closeButtonClicked() ) );
+ connect( mHoverCloseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( closeButtonClicked() ) );
return;
}
}
@@ -229,7 +229,7 @@ void KTabBar::activateDragSwitchTab()
void KTabBar::mouseReleaseEvent( TQMouseEvent *e )
{
- if( e->button() == Qt::MidButton ) {
+ if( e->button() == TQt::MidButton ) {
if ( mReorderStartTab==-1 ) {
TQTab *tab = selectTab( e->pos() );
if( tab ) {
@@ -281,7 +281,7 @@ void KTabBar::dropEvent( TQDropEvent *e )
#ifndef TQT_NO_WHEELEVENT
void KTabBar::wheelEvent( TQWheelEvent *e )
{
- if ( e->orientation() ==Qt::Horizontal )
+ if ( e->orientation() ==TQt::Horizontal )
return;
emit( wheelDelta( e->delta() ) );
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.h b/lib/compatibility/tdemdi/qextmdi/ktabbar.h
index 53e87c8b..14d5e738 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.h
@@ -34,7 +34,7 @@ class KTabBarPrivate;
*/
class TDEUI_EXPORT KTabBar: public TQTabBar
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
index 3b17a43a..abb0a447 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
@@ -55,16 +55,16 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f )
setTabBar( new KTabBar(this, "tabbar") );
setAcceptDrops( true );
- connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & )));
- connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int )));
- connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int )));
- connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int )));
- connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )));
- connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * )));
- connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int )));
- connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int )));
+ connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & )));
+ connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int )));
+ connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int )));
+ connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int )));
+ connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )));
+ connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * )));
+ connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int )));
+ connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int )));
#ifndef TQT_NO_WHEELEVENT
- connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int )));
+ connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int )));
#endif
}
@@ -174,7 +174,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
int iw = 0;
if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
- x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
+ x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,
TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
TQStyleOption( tab ) ) ).width();
}
@@ -316,7 +316,7 @@ void KTabWidget::dropEvent( TQDropEvent *e )
#ifndef TQT_NO_WHEELEVENT
void KTabWidget::wheelEvent( TQWheelEvent *e )
{
- if ( e->orientation() ==Qt::Horizontal )
+ if ( e->orientation() ==TQt::Horizontal )
return;
if ( isEmptyTabbarSpace( e->pos() ) )
@@ -344,7 +344,7 @@ void KTabWidget::wheelDelta( int delta )
void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
{
- if( e->button() != Qt::LeftButton )
+ if( e->button() != TQt::LeftButton )
return;
if ( isEmptyTabbarSpace( e->pos() ) ) {
@@ -356,12 +356,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
void KTabWidget::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::RightButton ) {
+ if ( e->button() == TQt::RightButton ) {
if ( isEmptyTabbarSpace( e->pos() ) ) {
emit( contextMenu( mapToGlobal( e->pos() ) ) );
return;
}
- } else if ( e->button() == Qt::MidButton ) {
+ } else if ( e->button() == TQt::MidButton ) {
if ( isEmptyTabbarSpace( e->pos() ) ) {
emit( mouseMiddleClick() );
return;
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.h b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h
index 5c9ba940..e2ac7c94 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h
@@ -35,7 +35,7 @@ class KTabWidgetPrivate;
*/
class TDEUI_EXPORT KTabWidget : public TQTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
TQ_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton )
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index 4b3940be..1d654392 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -58,7 +58,7 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent )
m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor();
m_pZ = new TQPtrList<KMdiChildFrm>;
m_pZ->setAutoDelete( true );
- setFocusPolicy( TQ_ClickFocus );
+ setFocusPolicy( TQWidget::ClickFocus );
m_defaultChildFrmSize = TQSize( 400, 300 );
}
@@ -112,7 +112,7 @@ void KMdiChildArea::destroyChild( KMdiChildFrm *child, bool focusTop )
bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
// destroy the old one
- TQT_BASE_OBJECT_NAME::disconnect( child );
+ TQObject::disconnect( child );
child->blockSignals( true );
m_pZ->setAutoDelete( false );
m_pZ->removeRef( child );
@@ -144,7 +144,7 @@ void KMdiChildArea::destroyChildButNotItsView( KMdiChildFrm* child, bool focusTo
bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
// destroy the old one
- TQT_BASE_OBJECT_NAME::disconnect( child );
+ TQObject::disconnect( child );
child->unsetClient();
m_pZ->setAutoDelete( false );
m_pZ->removeRef( child );
@@ -218,12 +218,8 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
else
child->raise();
-#ifdef USE_QT4
- child->m_pClient->setFocus();
-#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Other );
child->m_pClient->setFocus();
-#endif // USE_QT4
}
}
@@ -253,7 +249,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
void KMdiChildArea::mousePressEvent( TQMouseEvent *e )
{
//Popup the window menu
- if ( e->button() & Qt::RightButton )
+ if ( e->button() & TQt::RightButton )
emit popupWindowMenu( mapToGlobal( e->pos() ) );
}
@@ -789,5 +785,3 @@ void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeB
inactiveBG = TDEGlobalSettings::inactiveTitleColor();
inactiveFG = TDEGlobalSettings::inactiveTextColor();
}
-
-// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
index 0a85b26b..11a93414 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
@@ -54,7 +54,7 @@ class KMDI_EXPORT KMdiChildArea : public TQFrame
friend class KMdiChildFrmCaption;
friend class KMdiChildFrm;
-Q_OBJECT
+TQ_OBJECT
// attributes
@@ -303,5 +303,3 @@ private:
};
#endif // _TDEMDI_CHILDAREA_H_
-
-// kate: indent-mode csands; tab-width 4; auto-insert-doxygen on;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 62a973d9..54eba787 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -138,10 +138,10 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" );
m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" );
- TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
- TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) );
- TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) );
- TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) );
+ TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
+ TQObject::connect( m_pMaximize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( maximizePressed() ) );
+ TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closePressed() ) );
+ TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( undockPressed() ) );
m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) );
if ( m_pIconButtonPixmap->isNull() )
@@ -149,15 +149,15 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
redecorateButtons();
- m_pWinIcon->setFocusPolicy( TQ_NoFocus );
- m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
- m_pClose->setFocusPolicy( TQ_NoFocus );
- m_pMinimize->setFocusPolicy( TQ_NoFocus );
- m_pMaximize->setFocusPolicy( TQ_NoFocus );
- m_pUndock->setFocusPolicy( TQ_NoFocus );
+ m_pWinIcon->setFocusPolicy( TQWidget::NoFocus );
+ m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus );
+ m_pClose->setFocusPolicy( TQWidget::NoFocus );
+ m_pMinimize->setFocusPolicy( TQWidget::NoFocus );
+ m_pMaximize->setFocusPolicy( TQWidget::NoFocus );
+ m_pUndock->setFocusPolicy( TQWidget::NoFocus );
setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
setMouseTracking( true );
@@ -283,7 +283,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( m_bResizing )
{
- if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) )
+ if ( !( e->state() & TQt::RightButton ) && !( e->state() & TQt::MidButton ) )
{
// same as: if no button or left button pressed
TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() );
@@ -540,8 +540,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
}
m_pMinimize->setPixmap( *m_pMinButtonPixmap );
m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
- TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) );
- TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
+ TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) );
+ TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
setGeometry( m_restoredRect );
break;
case Normal:
@@ -566,8 +566,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
// reset to maximize-captionbar
m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
m_pMinimize->setPixmap( *m_pMinButtonPixmap );
- TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) );
- TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
+ TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) );
+ TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR +
m_pCaption->heightHint();
@@ -705,7 +705,7 @@ void KMdiChildFrm::setIcon( const TQPixmap& pxm )
if ( p.width() != 18 || p.height() != 18 )
{
TQImage img = p.convertToImage();
- p = img.smoothScale( 18, 18, TQ_ScaleMin );
+ p = img.smoothScale( 18, 18, TQImage::ScaleMin );
}
const bool do_resize = m_pIconButtonPixmap->size() != p.size();
*m_pIconButtonPixmap = p;
@@ -750,9 +750,9 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
}
// memorize the focuses in a dictionary because they will get lost during reparenting
- TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
+ TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>;
pFocPolDict->setAutoDelete( true );
- TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over the buttons
TQObject * obj;
int i = 1;
@@ -768,14 +768,14 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
widg->setName( tmpStr.latin1() );
i++;
}
- TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
+ TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy;
*pFocPol = widg->focusPolicy();
pFocPolDict->insert( widg->name(), pFocPol );
}
delete list; // delete the list, not the objects
//Reparent if needed
- if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) )
+ if ( w->parent() != this )
{
//reparent to this widget , no flags , point , show it
TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
@@ -795,7 +795,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
linkChildren( pFocPolDict );
- TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
+ TQObject::connect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) );
if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() )
setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
@@ -814,10 +814,10 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
if ( !m_pClient )
return ;
- TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
+ TQObject::disconnect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) );
//reparent to desktop widget , no flags , point , show it
- TQDict<TQ_FocusPolicy>* pFocPolDict;
+ TQDict<TQWidget::FocusPolicy>* pFocPolDict;
pFocPolDict = unlinkChildren();
// get name of focused child widget
@@ -833,7 +833,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
m_pClient->setMaximumSize( maxs.width(), maxs.height() );
// remember the focus policies using the dictionary and reset them
- TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject * obj;
TQWidget* firstFocusableChildWidget = 0;
@@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
{ // for each found object...
TQWidget * widg = ( TQWidget* ) obj;
++it;
- TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
+ TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
if ( pFocPol )
widg->setFocusPolicy( *pFocPol );
@@ -851,7 +851,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
widg->setFocus();
// get first and last focusable widget
- if ( ( widg->focusPolicy() == TQ_StrongFocus ) || ( widg->focusPolicy() == TQ_TabFocus ) )
+ if ( ( widg->focusPolicy() == TQWidget::StrongFocus ) || ( widg->focusPolicy() == TQWidget::TabFocus ) )
{
if ( firstFocusableChildWidget == 0 )
firstFocusableChildWidget = widg; // first widget
@@ -860,7 +860,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
}
else
{
- if ( widg->focusPolicy() == TQ_WheelFocus )
+ if ( widg->focusPolicy() == TQWidget::WheelFocus )
{
if ( firstFocusableChildWidget == 0 )
firstFocusableChildWidget = widg; // first widget
@@ -877,29 +877,29 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget );
// reset the focus policy of the view
- m_pClient->setFocusPolicy( TQ_ClickFocus );
+ m_pClient->setFocusPolicy( TQWidget::ClickFocus );
// lose information about the view (because it's undocked now)
m_pClient = 0;
}
//============== linkChildren =============//
-void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
+void KMdiChildFrm::linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict )
{
// reset the focus policies for all widgets in the view (take them from the dictionary)
- TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList* list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject* obj;
while ( ( obj = it.current() ) != 0 )
{ // for each found object...
TQWidget* widg = ( TQWidget* ) obj;
++it;
- TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
+ TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
if ( pFocPol != 0 )
widg->setFocusPolicy( *pFocPol );
- if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) )
+ if ( !( widg->inherits( "TQPopupMenu" ) ) )
widg->installEventFilter( this );
}
@@ -907,14 +907,14 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
delete pFocPolDict;
// reset the focus policies for the rest
- m_pWinIcon->setFocusPolicy( TQ_NoFocus );
- m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
- m_pClient->setFocusPolicy( TQ_ClickFocus );
- m_pCaption->setFocusPolicy( TQ_NoFocus );
- m_pUndock->setFocusPolicy( TQ_NoFocus );
- m_pMinimize->setFocusPolicy( TQ_NoFocus );
- m_pMaximize->setFocusPolicy( TQ_NoFocus );
- m_pClose->setFocusPolicy( TQ_NoFocus );
+ m_pWinIcon->setFocusPolicy( TQWidget::NoFocus );
+ m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus );
+ m_pClient->setFocusPolicy( TQWidget::ClickFocus );
+ m_pCaption->setFocusPolicy( TQWidget::NoFocus );
+ m_pUndock->setFocusPolicy( TQWidget::NoFocus );
+ m_pMinimize->setFocusPolicy( TQWidget::NoFocus );
+ m_pMaximize->setFocusPolicy( TQWidget::NoFocus );
+ m_pClose->setFocusPolicy( TQWidget::NoFocus );
// install the event filter (catch mouse clicks) for the rest
m_pWinIcon->installEventFilter( this );
@@ -930,13 +930,13 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
//============== unlinkChildren =============//
-TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
+TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren()
{
// memorize the focuses in a dictionary because they will get lost during reparenting
- TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
+ TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>;
pFocPolDict->setAutoDelete( true );
- TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject * obj;
int i = 1;
@@ -953,7 +953,7 @@ TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
w->setName( tmpStr.latin1() );
i++;
}
- TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
+ TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy;
*pFocPol = w->focusPolicy();
// memorize focus policy
pFocPolDict->insert( w->name(), pFocPol );
@@ -1085,7 +1085,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
TQObject* pObj = obj;
while ( ( pObj != 0L ) && !bIsChild )
{
- bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) );
+ bIsChild = ( pObj == this );
pObj = pObj->parent();
}
// unset the resize cursor if the cursor moved from the frame into a inner widget
@@ -1095,13 +1095,13 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
break;
case TQEvent::MouseButtonPress:
{
- if ( !hasParent( TQT_TQOBJECT(m_pClient), TQT_TQOBJECT(obj) ) )
+ if ( !hasParent( m_pClient, obj ) )
{
bool bIsSecondClick = false;
if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() )
bIsSecondClick = true; // of a possible double click
- if ( !( ( ( TQT_BASE_OBJECT(obj) == m_pWinIcon ) || ( TQT_BASE_OBJECT(obj) == m_pUnixIcon ) ) && bIsSecondClick ) )
+ if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) )
{
// in case we didn't click on the icon button
TQFocusEvent* pFE = new TQFocusEvent( TQFocusEvent::FocusIn );
@@ -1112,16 +1112,16 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
m_pClient->activate();
}
- if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
+ if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) )
{
TQWidget* w = ( TQWidget* ) obj;
- if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) )
+ if ( ( w->focusPolicy() == TQWidget::ClickFocus ) || ( w->focusPolicy() == TQWidget::StrongFocus ) )
{
w->setFocus();
}
}
}
- if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_TQOBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) )
+ if ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) )
{
// in case we clicked on the icon button
if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() )
@@ -1139,7 +1139,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
break;
case TQEvent::Resize:
{
- if ( ( ( TQWidget* ) TQT_TQOBJECT(obj) == m_pClient ) && ( m_state == Normal ) )
+ if ( ( ( TQWidget* ) obj == m_pClient ) && ( m_state == Normal ) )
{
TQResizeEvent* re = ( TQResizeEvent* ) e;
int captionHeight = m_pCaption->heightHint();
@@ -1154,8 +1154,8 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
{
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child());
- if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ )
+ TQObject* pLostChild = ( ( TQChildEvent* ) e )->child();
+ if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ )
{
TQObjectList* list = pLostChild->queryList();
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
@@ -1176,11 +1176,11 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child we install ourself as event filter for the new
// child and its children (as we did when we got our client).
// XXX see linkChildren() and focus policy stuff
- TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
- if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
+ TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child();
+ if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) )
{
- TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
- TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild );
+ TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets
TQObject * obj;
@@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
{ // for each found object...
TQWidget * widg = ( TQWidget* ) obj;
++it;
- if ( !::tqqt_cast<TQPopupMenu*>( widg ) )
+ if ( !::tqt_cast<TQPopupMenu*>( widg ) )
{
widg->installEventFilter( this );
}
@@ -1234,11 +1234,11 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
{
- m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) );
- m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) );
- m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) );
- m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQT_SLOT( minimizePressed() ) );
- m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQT_SLOT( maximizePressed() ) );
+ m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) );
+ m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) );
+ m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) );
+ m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQ_SLOT( minimizePressed() ) );
+ m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQ_SLOT( maximizePressed() ) );
if ( state() == Normal )
m_pSystemMenu->setItemEnabled( m_pSystemMenu->idAt( 0 ), false );
else if ( state() == Maximized )
@@ -1256,20 +1256,20 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const
else
{
if ( state() != Normal )
- m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) );
+ m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) );
if ( state() != Maximized )
- m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQT_SLOT( maximizePressed() ) );
+ m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQ_SLOT( maximizePressed() ) );
if ( state() != Minimized )
- m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQT_SLOT( minimizePressed() ) );
+ m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQ_SLOT( minimizePressed() ) );
if ( state() != Maximized )
- m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) );
+ m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) );
if ( state() == Normal )
- m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) );
+ m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) );
}
- m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQT_SLOT( undockPressed() ) );
+ m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQ_SLOT( undockPressed() ) );
m_pSystemMenu->insertSeparator();
- m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQT_SLOT( closePressed() ) );
+ m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQ_SLOT( closePressed() ) );
return m_pSystemMenu;
}
@@ -1301,8 +1301,8 @@ void KMdiChildFrm::switchToMinimizeLayout()
// temporary use of minimize button for restore function
m_pMinimize->setPixmap( *m_pRestoreButtonPixmap );
- TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
- TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) );
+ TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
+ TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) );
// resizing
resize( 300, minimumHeight() );
@@ -1405,5 +1405,3 @@ TQRect KMdiChildFrm::mdiAreaContentsRect() const
return empty;
}
}
-
-// kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
index 6de8b922..c9a7faa6 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
@@ -51,7 +51,7 @@ class TQToolButton;
*/
class KMDI_EXPORT KMdiWin32IconButton : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMdiWin32IconButton( TQWidget* parent, const char* name = 0 );
@@ -133,7 +133,7 @@ class KMDI_EXPORT KMdiChildFrm : public TQFrame
friend class KMdiChildArea;
friend class KMdiChildFrmCaption;
- Q_OBJECT
+ TQ_OBJECT
// attributes
@@ -424,13 +424,13 @@ protected:
* Restore the focus policies for _all_ widgets in the view using the list given as parameter.
* Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
*/
- void linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict );
+ void linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict );
/**
* Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent.
* Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
*/
- TQDict<TQ_FocusPolicy>* unlinkChildren();
+ TQDict<TQWidget::FocusPolicy>* unlinkChildren();
/**
* Calculates the corner id for the resize cursor. The return value can be tested for:
@@ -444,5 +444,3 @@ private:
};
#endif //_TDEMDI_CHILD_FRM_H_
-
-// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
index 5b069a47..4fd24174 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
@@ -72,7 +72,7 @@ KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
m_bActive = false;
m_pParent = parent;
setBackgroundMode( NoBackground );
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
m_bChildInDrag = false;
}
@@ -85,7 +85,7 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption()
void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
setMouseTracking( false );
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
@@ -95,7 +95,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
m_pParent->m_bDragging = true;
m_offset = mapToParent( e->pos() );
}
- else if ( e->button() == Qt::RightButton )
+ else if ( e->button() == TQt::RightButton )
{
m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) );
}
@@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
TQApplication::restoreOverrideCursor();
@@ -146,7 +146,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() );
// mouse out of child area? stop child frame dragging
- if ( !TQT_TQRECT_OBJECT(m_pParent->m_pManager->rect()).contains( relMousePosInChildArea ) )
+ if ( !m_pParent->m_pManager->rect().contains( relMousePosInChildArea ) )
{
if ( relMousePosInChildArea.x() < 0 )
relMousePosInChildArea.rx() = 0;
@@ -318,5 +318,3 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu()
m_pParent->m_bDragging = true;
m_offset = mapFromGlobal( TQCursor::pos() );
}
-
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
index 984fe00f..4aaf1af7 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
@@ -43,7 +43,7 @@ class KMdiChildFrmCaptionPrivate;
*/
class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -142,5 +142,3 @@ private:
};
#endif //_TDEMDI_CHILD_FRM_CAPTION_H_
-
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
index ddc313ab..76d3b56e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
@@ -63,7 +63,7 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c
m_szCaption = i18n( "Unnamed" );
m_sTabCaption = m_szCaption;
- setFocusPolicy( TQ_ClickFocus );
+ setFocusPolicy( TQWidget::ClickFocus );
installEventFilter( this );
// store the current time
@@ -87,7 +87,7 @@ KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f
setGeometry( 0, 0, 0, 0 ); // reset
m_szCaption = i18n( "Unnamed" );
m_sTabCaption = m_szCaption;
- setFocusPolicy( TQ_ClickFocus );
+ setFocusPolicy( TQWidget::ClickFocus );
installEventFilter( this );
// store the current time
@@ -362,7 +362,7 @@ void KMdiChildView::youAreDetached()
if ( myIconPtr() )
setIcon( *( myIconPtr() ) );
- setFocusPolicy( TQ_StrongFocus );
+ setFocusPolicy( TQWidget::StrongFocus );
emit isDetachedNow();
}
@@ -492,10 +492,10 @@ void KMdiChildView::slot_childDestroyed()
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- const TQObject * pLostChild = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQT_BASE_OBJECT_NAME::sender()));
+ const TQObject * pLostChild = TQObject::sender();
if ( pLostChild && ( pLostChild->isWidgetType() ) )
{
- TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject* obj;
@@ -526,8 +526,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
if ( ke->key() == TQt::Key_Tab )
{
TQWidget* w = ( TQWidget* ) obj;
- TQ_FocusPolicy wfp = w->focusPolicy();
- if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || w->focusPolicy() == TQ_WheelFocus )
+ TQWidget::FocusPolicy wfp = w->focusPolicy();
+ if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || w->focusPolicy() == TQWidget::WheelFocus )
{
if ( m_lastFocusableChildWidget != 0 )
{
@@ -544,7 +544,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
{
if ( obj->isWidgetType() )
{
- TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList * list = queryList( "TQWidget" );
if ( list->find( obj ) != -1 )
m_focusedChildWidget = ( TQWidget* ) obj;
@@ -565,10 +565,10 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
{
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+ TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
{
- TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList * list = pLostChild->queryList( "TQWidget" );
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * o;
@@ -577,8 +577,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
TQWidget * widg = ( TQWidget* ) o;
++it;
widg->removeEventFilter( this );
- TQ_FocusPolicy wfp = widg->focusPolicy();
- if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
+ TQWidget::FocusPolicy wfp = widg->focusPolicy();
+ if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus )
{
if ( m_firstFocusableChildWidget == widg )
m_firstFocusableChildWidget = 0L; // reset first widget
@@ -595,13 +595,13 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child and we are attached to the MDI system we
// install ourself as event filter for the new child and its children
// (as we did when we were added to the MDI system).
- TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+ TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) )
{
TQWidget * pNewWidget = ( TQWidget* ) pNewChild;
if ( pNewWidget->testWFlags( TQt::WType_Dialog | TQt::WShowModal ) )
return false;
- TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets
TQObject * o;
@@ -610,9 +610,9 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
TQWidget * widg = ( TQWidget* ) o;
++it;
widg->installEventFilter( this );
- connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) );
- TQ_FocusPolicy wfp = widg->focusPolicy();
- if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
+ connect( widg, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slot_childDestroyed() ) );
+ TQWidget::FocusPolicy wfp = widg->focusPolicy();
+ if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus )
{
if ( m_firstFocusableChildWidget == 0 )
m_firstFocusableChildWidget = widg; // first widge
@@ -628,14 +628,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
if ( e->type() == TQEvent::IconChange )
{
// tqDebug("KMDiChildView:: TQEvent:IconChange intercepted\n");
- if ( TQT_BASE_OBJECT(obj) == this )
+ if ( obj == this )
iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() );
- else if ( TQT_BASE_OBJECT(obj) == m_trackChanges )
+ else if ( obj == m_trackChanges )
setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() );
}
if ( e->type() == TQEvent::CaptionChange )
{
- if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) )
+ if ( obj == this )
captionUpdated( this, caption() );
}
}
@@ -646,7 +646,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
/** Switches interposing in event loop of all current child widgets off. */
void KMdiChildView::removeEventFilterForAllChildren()
{
- TQObjectList* list = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList* list = queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets
TQObject* obj;
while ( ( obj = it.current() ) != 0 )
@@ -769,5 +769,3 @@ void KMdiChildView::raise()
TQWidget::raise();
}
-
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
index 42251495..90e5f3ae 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
@@ -94,7 +94,7 @@ class KMdiChildViewPrivate;
* flags = KMdi::Hide;
* }
* // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels
- * connect( m_pParent, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(initKeyAccel(TQWidget*)) );
+ * connect( m_pParent, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(initKeyAccel(TQWidget*)) );
*
* m_pParent->addWindow( pMDICover, flags);
* // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses)
@@ -109,7 +109,7 @@ class KMDI_EXPORT KMdiChildView : public TQWidget
{
friend class KMdiMainFrm;
friend class KMdiChildFrm;
- Q_OBJECT
+ TQ_OBJECT
// attributes
@@ -612,5 +612,3 @@ inline KMdiChildFrm *KMdiChildView::mdiParent() const
}
#endif //_TDEMDI_CHILD_VIEW_H_
-
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index a8a4dc37..738711e7 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
@@ -220,7 +220,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
m_overlapButtons.insert( w, btn );
btn->setOn( !isOverlapMode() );
- connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) );
+ connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeOverlapMode() ) );
}
m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() );
@@ -228,7 +228,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() <<
" to the tabbar" << endl;
- connect( m_tb->tab( tab ), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( tabClicked( int ) ) );
+ connect( m_tb->tab( tab ), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( tabClicked( int ) ) );
mTabCnt++;
m_inserted = tab;
@@ -277,7 +277,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
}
m_dockManager = w->dockManager();
- m_dragPanel = TQT_TQOBJECT(hdr->dragPanel());
+ m_dragPanel = hdr->dragPanel();
if ( m_dragPanel )
m_movingState = WaitingForMoveStart;
@@ -300,7 +300,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() );
if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
{
- m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) );
+ m_dockManager->eventFilter( m_dragPanel, m_startEvent );
m_dockManager->eventFilter( m_dragPanel, event );
m_movingState = Moving;
}
@@ -610,7 +610,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
if ( it.key() ->name() == raise )
{
m_delayedRaise = it.data();
- TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) );
kdDebug( 760 ) << k_funcinfo << "raising " << it.key()->name() << endl;
break;
}
@@ -618,7 +618,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
}
if ( m_delayedRaise == -1 )
- TQTimer::singleShot( 0, this, TQT_SLOT( init() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( init() ) );
}
void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix )
@@ -742,7 +742,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
kapp->syncX();*/
m_delayedRaise = it.data();
- TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) );
kdDebug( 760 ) << k_funcinfo << "raising" << it.key() ->name() << endl;
break;
}
@@ -750,7 +750,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
}
if ( m_delayedRaise == -1 )
- TQTimer::singleShot( 0, this, TQT_SLOT( init() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( init() ) );
cfg->setGroup( grp );
}
@@ -852,5 +852,3 @@ void KMdiDockContainer::nextToolView()
m_tb->setTab( tab->id(), true );
tabClicked( tab->id() );
}
-
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
index e6aeb5a0..613505cf 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
@@ -36,7 +36,7 @@ class KDockButton_Private;
class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -164,5 +164,3 @@ signals:
};
#endif
-
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
index fe60b25f..0f8b5396 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
@@ -20,7 +20,7 @@ KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const ch
setHoverCloseButton( true );
#endif
- connect( this, TQT_SIGNAL( closeRequest( TQWidget* ) ), this, TQT_SLOT( closeTab( TQWidget* ) ) );
+ connect( this, TQ_SIGNAL( closeRequest( TQWidget* ) ), this, TQ_SLOT( closeTab( TQWidget* ) ) );
}
KMdiDocumentViewTabWidget::~KMdiDocumentViewTabWidget()
@@ -147,6 +147,3 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( )
#ifndef NO_INCLUDE_MOCFILES
#include "tdemdidocumentviewtabwidget.moc"
#endif
-
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
index 9c47cf27..2e05039b 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
@@ -22,7 +22,7 @@ class TDEPopupMenu;
class KMDI_EXPORT KMdiDocumentViewTabWidget:
public KTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 );
@@ -120,5 +120,3 @@ signals:
#endif
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp
index a4592e38..edabbae4 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp
@@ -31,19 +31,19 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
{
//this method should never be called twice on the same hierarchy
m_list.insert( w, w->focusPolicy() );
- w->setFocusPolicy( TQ_ClickFocus );
+ w->setFocusPolicy( TQWidget::ClickFocus );
kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl;
- connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
- TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ connect( w, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
+ TQObjectList *l = w->queryList( "TQWidget" );
TQObjectListIt it( *l );
TQObject *obj;
while ( ( obj = it.current() ) != 0 )
{
TQWidget * wid = ( TQWidget* ) obj;
m_list.insert( wid, wid->focusPolicy() );
- wid->setFocusPolicy( TQ_ClickFocus );
+ wid->setFocusPolicy( TQWidget::ClickFocus );
kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl;
- connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
+ connect( wid, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
++it;
}
delete l;
@@ -51,7 +51,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
void KMdiFocusList::restore()
{
- for ( TQMap<TQWidget*, TQ_FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it )
+ for ( TQMap<TQWidget*, TQWidget::FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it )
{
it.key() ->setFocusPolicy( it.data() );
}
@@ -66,5 +66,3 @@ void KMdiFocusList::objectHasBeenDestroyed( TQObject * o )
TQWidget *w = ( TQWidget* ) o;
m_list.remove( w );
}
-
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h
index f3c70ad1..63290687 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h
@@ -25,7 +25,7 @@
class KMDI_EXPORT KMdiFocusList: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMdiFocusList( TQObject *parent );
@@ -35,9 +35,8 @@ public:
protected slots:
void objectHasBeenDestroyed( TQObject* );
private:
- TQMap<TQWidget*, TQ_FocusPolicy> m_list;
+ TQMap<TQWidget*, TQWidget::FocusPolicy> m_list;
};
#endif
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index 2e0076a1..d718601b 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -63,9 +63,9 @@ ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShort
{
if ( m_dw )
{
- connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) );
- connect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) );
- connect( m_dw, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotWidgetDestroyed() ) );
+ connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) );
+ connect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) );
+ connect( m_dw, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotWidgetDestroyed() ) );
setChecked( m_dw->mayBeHide() );
}
}
@@ -104,8 +104,8 @@ void ToggleToolViewAction::slotToggled( bool t )
void ToggleToolViewAction::slotWidgetDestroyed()
{
- disconnect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) );
- disconnect( this, TQT_SIGNAL( toggled( bool ) ), 0, 0 );
+ disconnect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) );
+ disconnect( this, TQ_SIGNAL( toggled( bool ) ), 0, 0 );
unplugAll();
deleteLater();
}
@@ -116,8 +116,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
{
m_mdiMode = KMdi::ChildframeMode;
m_mdiMainFrm = mdiMainFrm;
- connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
- this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+ connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+ this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
/* re-use an existing resource file if it exists. can happen if the user launches the
* toolbar editor */
@@ -143,27 +143,27 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
TQStringList modes;
modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" );
m_mdiModeAction->setItems( modes );
- connect( m_mdiModeAction, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( changeViewMode( int ) ) );
+ connect( m_mdiModeAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( changeViewMode( int ) ) );
}
else
m_mdiModeAction = 0;
- connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
- this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
+ connect( m_mdiMainFrm, TQ_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
+ this, TQ_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
- m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQ_SIGNAL( toggleTop() ),
actionCollection(), "tdemdi_activate_top" ) );
- m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQ_SIGNAL( toggleLeft() ),
actionCollection(), "tdemdi_activate_left" ) );
- m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQ_SIGNAL( toggleRight() ),
actionCollection(), "tdemdi_activate_right" ) );
- m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQ_SIGNAL( toggleBottom() ),
actionCollection(), "tdemdi_activate_bottom" ) );
m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
- m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQ_SLOT( prevToolViewInDock() ),
actionCollection(), "tdemdi_prev_toolview" ) );
- m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ),
actionCollection(), "tdemdi_next_toolview" ) );
actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -225,7 +225,7 @@ void KMDIGUIClient::setupActions()
// m_toolBars = builder.toolBars();
// m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString(), 0,
- // this, TQT_SLOT(blah()),actionCollection(),"nothing"));
+ // this, TQ_SLOT(blah()),actionCollection(),"nothing"));
TQPtrList<TDEAction> addList;
if ( m_toolViewActions.count() < 3 )
@@ -265,7 +265,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) );
#endif
- connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) );
+ connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) );
m_toolViewActions.append( a );
m_toolMenu->insert( a );
mtva->d->action = a;
@@ -315,6 +315,3 @@ void KMDIGUIClient::mdiModeHasBeenChangedTo( KMdi::MdiMode mode )
setupActions();
}
-
-
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
index cf853428..60004a7b 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
@@ -41,7 +41,7 @@ namespace KMDIPrivate
class KMDI_EXPORT KMDIGUIClient : public TQObject,
public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -121,7 +121,7 @@ private:
*/
class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -145,4 +145,3 @@ protected slots:
}
#endif
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
index 57c49d0c..9bdb5234 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
@@ -47,5 +47,3 @@ protected:
;
#endif // _TDEMDIITERATOR_H_
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
index ead83413..a4738fd3 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
@@ -57,5 +57,3 @@ private:
};
#endif // _TDEMDILISTITERATOR_H_
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 2b1dfea6..779e3388 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -33,7 +33,9 @@
* ATTENTION: please do you part to try to make this file legible. It's
* extremely hard to read already. Especially follow the indenting rules.
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <assert.h>
@@ -183,7 +185,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
m_pToolViews = new TQMap<TQWidget*, KMdiToolViewAccessor*>;
// This seems to be needed (re-check it after TQt2.0 comed out)
- setFocusPolicy( TQ_ClickFocus );
+ setFocusPolicy( TQWidget::ClickFocus );
// create the central widget
createMdiManager();
@@ -206,7 +208,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
m_pWindowMenu = new TQPopupMenu( this, "window_menu" );
m_pWindowMenu->setCheckable( true );
- TQObject::connect( m_pWindowMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillWindowMenu() ) );
+ TQObject::connect( m_pWindowMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillWindowMenu() ) );
m_pDockMenu = new TQPopupMenu( this, "dock_menu" );
m_pDockMenu->setCheckable( true );
@@ -222,7 +224,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
#else
0,
#endif
- TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
+ this, TQ_SLOT(closeActiveView()), actionCollection(), "window_close");
// the MDI view taskbar
createTaskBar();
@@ -253,11 +255,11 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
// drag end timer
m_pDragEndTimer = new TQTimer();
- connect( m_pDragEndTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( dragEndTimeOut() ) );
- connect( guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient* ) ),
- this, TQT_SLOT( verifyToplevelHeight() ) );
- connect( guiFactory(), TQT_SIGNAL( clientRemoved( KXMLGUIClient* ) ),
- this, TQT_SLOT( verifyToplevelHeight() ) );
+ connect( m_pDragEndTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( dragEndTimeOut() ) );
+ connect( guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient* ) ),
+ this, TQ_SLOT( verifyToplevelHeight() ) );
+ connect( guiFactory(), TQ_SIGNAL( clientRemoved( KXMLGUIClient* ) ),
+ this, TQ_SLOT( verifyToplevelHeight() ) );
}
void KMdiMainFrm::verifyToplevelHeight()
@@ -275,21 +277,21 @@ void KMdiMainFrm::verifyToplevelHeight()
void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu )
{
m_mdiGUIClient = new KMDIPrivate::KMDIGUIClient( this, showModeMenu );
- connect( m_mdiGUIClient, TQT_SIGNAL( toggleTop() ), this, TQT_SIGNAL( toggleTop() ) );
- connect( m_mdiGUIClient, TQT_SIGNAL( toggleLeft() ), this, TQT_SIGNAL( toggleLeft() ) );
- connect( m_mdiGUIClient, TQT_SIGNAL( toggleRight() ), this, TQT_SIGNAL( toggleRight() ) );
- connect( m_mdiGUIClient, TQT_SIGNAL( toggleBottom() ), this, TQT_SIGNAL( toggleBottom() ) );
+ connect( m_mdiGUIClient, TQ_SIGNAL( toggleTop() ), this, TQ_SIGNAL( toggleTop() ) );
+ connect( m_mdiGUIClient, TQ_SIGNAL( toggleLeft() ), this, TQ_SIGNAL( toggleLeft() ) );
+ connect( m_mdiGUIClient, TQ_SIGNAL( toggleRight() ), this, TQ_SIGNAL( toggleRight() ) );
+ connect( m_mdiGUIClient, TQ_SIGNAL( toggleBottom() ), this, TQ_SIGNAL( toggleBottom() ) );
if ( m_mdiMode == KMdi::IDEAlMode )
{
if ( m_topContainer )
- connect( this, TQT_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQT_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQ_SLOT( toggle() ) );
if ( m_leftContainer )
- connect( this, TQT_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQT_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQ_SLOT( toggle() ) );
if ( m_rightContainer )
- connect( this, TQT_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQT_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQ_SLOT( toggle() ) );
if ( m_bottomContainer )
- connect( this, TQT_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQT_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQ_SLOT( toggle() ) );
}
emit mdiModeHasBeenChangedTo( m_mdiMode );
@@ -367,16 +369,16 @@ void KMdiMainFrm::createMdiManager()
kdDebug(760) << k_funcinfo << "creating MDI manager" << endl;
m_pMdi = new KMdiChildArea( this );
setCentralWidget( m_pMdi );
- TQObject::connect( m_pMdi, TQT_SIGNAL( nowMaximized( bool ) ),
- this, TQT_SLOT( setEnableMaximizedChildFrmMode( bool ) ) );
- TQObject::connect( m_pMdi, TQT_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ),
- this, TQT_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) );
- TQObject::connect( m_pMdi, TQT_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ),
- this, TQT_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) );
- TQObject::connect( m_pMdi, TQT_SIGNAL( popupWindowMenu( TQPoint ) ),
- this, TQT_SLOT( popupWindowMenu( TQPoint ) ) );
- TQObject::connect( m_pMdi, TQT_SIGNAL( lastChildFrmClosed() ),
- this, TQT_SIGNAL( lastChildFrmClosed() ) );
+ TQObject::connect( m_pMdi, TQ_SIGNAL( nowMaximized( bool ) ),
+ this, TQ_SLOT( setEnableMaximizedChildFrmMode( bool ) ) );
+ TQObject::connect( m_pMdi, TQ_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ),
+ this, TQ_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) );
+ TQObject::connect( m_pMdi, TQ_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ),
+ this, TQ_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) );
+ TQObject::connect( m_pMdi, TQ_SIGNAL( popupWindowMenu( TQPoint ) ),
+ this, TQ_SLOT( popupWindowMenu( TQPoint ) ) );
+ TQObject::connect( m_pMdi, TQ_SIGNAL( lastChildFrmClosed() ),
+ this, TQ_SIGNAL( lastChildFrmClosed() ) );
}
//============ createTaskBar ==============//
@@ -462,14 +464,14 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index )
d->closeWindowAction->setEnabled(true);
// common connections used when under MDI control
- TQObject::connect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) );
- TQObject::connect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) );
- TQObject::connect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
- TQObject::connect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) );
- TQObject::connect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) );
- TQObject::connect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) );
- TQObject::connect( pWnd, TQT_SIGNAL( activated( KMdiChildView* ) ), this, TQT_SIGNAL( viewActivated( KMdiChildView* ) ) );
- TQObject::connect( pWnd, TQT_SIGNAL( deactivated( KMdiChildView* ) ), this, TQT_SIGNAL( viewDeactivated( KMdiChildView* ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( activated( KMdiChildView* ) ), this, TQ_SIGNAL( viewActivated( KMdiChildView* ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( deactivated( KMdiChildView* ) ), this, TQ_SIGNAL( viewDeactivated( KMdiChildView* ) ) );
if ( index == -1 )
m_pDocumentViews->append( pWnd );
@@ -479,7 +481,7 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index )
if ( m_pTaskBar )
{
KMdiTaskBarButton* but = m_pTaskBar->addWinButton( pWnd );
- TQObject::connect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) );
+ TQObject::connect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) );
}
// embed the view depending on the current MDI mode
@@ -491,8 +493,8 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index )
m_documentTabWidget->insertTab( pWnd, pixmap, pWnd->tabCaption(), index );
- connect( pWnd, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
- connect( pWnd, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
+ connect( pWnd, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
+ connect( pWnd, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
}
else
{
@@ -740,19 +742,19 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
if ( m_pWinList->count() == 0 )
m_pCurrentWindow = 0L;
- TQObject::disconnect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) );
- TQObject::disconnect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) );
- TQObject::disconnect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) );
- TQObject::disconnect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
- TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) );
- TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) );
+ TQObject::disconnect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) );
+ TQObject::disconnect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) );
+ TQObject::disconnect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) );
+ TQObject::disconnect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
+ TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) );
+ TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) );
if ( m_pTaskBar )
{
KMdiTaskBarButton * but = m_pTaskBar->getButton( pWnd );
if ( but != 0L )
{
- TQObject::disconnect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) );
+ TQObject::disconnect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) );
}
m_pTaskBar->removeWinButton( pWnd );
}
@@ -993,19 +995,19 @@ TQPopupMenu* KMdiMainFrm::taskBarPopup( KMdiChildView *pWnd, bool /*bIncludeWind
m_pTaskBarPopup->clear();
if ( pWnd->isAttached() )
{
- m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQT_SLOT( detach() ) );
+ m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQ_SLOT( detach() ) );
m_pTaskBarPopup->insertSeparator();
if ( pWnd->isMinimized() || pWnd->isMaximized() )
- m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQT_SLOT( restore() ) );
+ m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQ_SLOT( restore() ) );
if ( !pWnd->isMaximized() )
- m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQT_SLOT( maximize() ) );
+ m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQ_SLOT( maximize() ) );
if ( !pWnd->isMinimized() )
- m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQT_SLOT( minimize() ) );
+ m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQ_SLOT( minimize() ) );
}
else
- m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQT_SLOT( attach() ) );
+ m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQ_SLOT( attach() ) );
m_pTaskBarPopup->insertSeparator();
- m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQT_SLOT( close() ) );
+ m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQ_SLOT( close() ) );
// the window has a view...get the window popup
m_pTaskBarPopup->insertSeparator();
m_pTaskBarPopup->insertItem( i18n( "Operations" ), windowPopup( pWnd, false ) ); //alvoid recursion
@@ -1295,12 +1297,12 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
KDockWidget* dockWindow = 0L; /* pDockW */
KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */
KDockWidget* undockCandidate = 0L; /* pUndockCandidate */
- TQWidget* pW = TQT_TQWIDGET( ( *it ) );
+ TQWidget* pW = static_cast<TQWidget*>( ( *it ) );
// find the oldest ancestor of the current dockwidget that can be undocked
while ( !pW->isTopLevel() )
{
- if ( ::tqqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
+ if ( ::tqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
{
undockCandidate = static_cast<KDockWidget*>( pW );
if ( undockCandidate->enableDocking() != KDockWidget::DockNone )
@@ -1637,7 +1639,7 @@ void KMdiMainFrm::switchToTabPageMode()
if ( m_pClose )
{
- TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+ TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
if ( m_pDocumentViews->count() > 0 )
m_pClose->show();
}
@@ -1654,7 +1656,7 @@ void KMdiMainFrm::finishTabPageMode()
if ( m_mdiMode == KMdi::TabPageMode )
{
m_pClose->hide();
- TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+ TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
TQPtrListIterator<KMdiChildView> it( *m_pDocumentViews );
for ( ; it.current(); ++it )
@@ -1719,7 +1721,7 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace()
#endif
delete m_documentTabWidget;
m_documentTabWidget = new KMdiDocumentViewTabWidget( m_pDockbaseAreaOfDocumentViews );
- connect( m_documentTabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( slotDocCurrentChanged( TQWidget* ) ) );
+ connect( m_documentTabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotDocCurrentChanged( TQWidget* ) ) );
m_pDockbaseAreaOfDocumentViews->setWidget( m_documentTabWidget );
m_documentTabWidget->show();
TQPtrListIterator<KMdiChildView> it4( *m_pDocumentViews );
@@ -1728,11 +1730,11 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace()
KMdiChildView* pView = it4.current();
m_documentTabWidget->addTab( pView, pView->icon() ? *( pView->icon() ) : TQPixmap(), pView->tabCaption() );
/*
- connect(pView,TQT_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)),
- m_documentTabWidget,TQT_SLOT(updateView(TQWidget*,TQPixmap,const TQString&)));
+ connect(pView,TQ_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)),
+ m_documentTabWidget,TQ_SLOT(updateView(TQWidget*,TQPixmap,const TQString&)));
*/
- connect( pView, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
- connect( pView, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
+ connect( pView, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
+ connect( pView, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
}
}
@@ -1862,7 +1864,7 @@ void KMdiMainFrm::switchToIDEAlMode()
if ( m_pClose )
{
- TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+ TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
if ( m_pDocumentViews->count() > 0 )
m_pClose->show();
}
@@ -1903,7 +1905,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
if ( widget && widget->parentDockTabGroup() )
{
- widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) );
+ widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() );
if ( widget )
{
@@ -1935,7 +1937,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
KDockWidget *mainDock = getMainDockWidget();
KDockWidget *w = mainDock;
if ( mainDock->parentDockTabGroup() )
- w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) );
+ w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
TQPtrList<KDockWidget> leftReparentWidgets;
TQPtrList<KDockWidget> rightReparentWidgets;
@@ -1943,7 +1945,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
TQPtrList<KDockWidget> topReparentWidgets;
if ( mainDock->parentDockTabGroup() )
- mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
+ mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
@@ -1960,40 +1962,40 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
m_leftContainer->manualDock( mainDock, KDockWidget::DockLeft, 20 );
tmpDC->init();
if ( m_mdiGUIClient )
- connect ( this, TQT_SIGNAL( toggleLeft() ), tmpDC, TQT_SLOT( toggle() ) );
- connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
- connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
- connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+ connect ( this, TQ_SIGNAL( toggleLeft() ), tmpDC, TQ_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+ connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+ connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
m_rightContainer->setWidget( tmpDC = new KMdiDockContainer( m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode ) );
m_rightContainer->setEnableDocking( KDockWidget::DockRight );
m_rightContainer->manualDock( mainDock, KDockWidget::DockRight, 80 );
tmpDC->init();
if ( m_mdiGUIClient )
- connect ( this, TQT_SIGNAL( toggleRight() ), tmpDC, TQT_SLOT( toggle() ) );
- connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
- connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
- connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+ connect ( this, TQ_SIGNAL( toggleRight() ), tmpDC, TQ_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+ connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+ connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
m_topContainer->setWidget( tmpDC = new KMdiDockContainer( m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode ) );
m_topContainer->setEnableDocking( KDockWidget::DockTop );
m_topContainer->manualDock( mainDock, KDockWidget::DockTop, 20 );
tmpDC->init();
if ( m_mdiGUIClient )
- connect ( this, TQT_SIGNAL( toggleTop() ), tmpDC, TQT_SLOT( toggle() ) );
- connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
- connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
- connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+ connect ( this, TQ_SIGNAL( toggleTop() ), tmpDC, TQ_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+ connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+ connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
m_bottomContainer->setWidget( tmpDC = new KMdiDockContainer( m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode ) );
m_bottomContainer->setEnableDocking( KDockWidget::DockBottom );
m_bottomContainer->manualDock( mainDock, KDockWidget::DockBottom, 80 );
tmpDC->init();
if ( m_mdiGUIClient )
- connect ( this, TQT_SIGNAL( toggleBottom() ), tmpDC, TQT_SLOT( toggle() ) );
- connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
- connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
- connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+ connect ( this, TQ_SIGNAL( toggleBottom() ), tmpDC, TQ_SLOT( toggle() ) );
+ connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+ connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+ connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
m_leftContainer->setDockSite( KDockWidget::DockCenter );
m_rightContainer->setDockSite( KDockWidget::DockCenter );
@@ -2028,7 +2030,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
{
assert( m_pClose );
m_pClose->hide();
- TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+ TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
TQStringList leftNames;
@@ -2141,7 +2143,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
KDockWidget * mainDock = getMainDockWidget();
if ( mainDock->parentDockTabGroup() )
{
- mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
+ mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
}
if ( widgetNames.count() > 0 )
@@ -2436,23 +2438,23 @@ void KMdiMainFrm::setEnableMaximizedChildFrmMode( bool enableMaxChildFrameMode )
if ( !pCurrentChild || !m_pMainMenuBar )
return ;
- TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( undockPressed() ) );
- TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( minimizePressed() ) );
- TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( maximizePressed() ) );
+ TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( undockPressed() ) );
+ TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( minimizePressed() ) );
+ TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( maximizePressed() ) );
m_pMinimize->show();
m_pUndock->show();
m_pRestore->show();
if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook )
{
- m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQT_SLOT( closePressed() ), 0, -1, 0 );
+ m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQ_SLOT( closePressed() ), 0, -1, 0 );
}
else
{
m_pMainMenuBar->insertItem( *pCurrentChild->icon(), pCurrentChild->systemMenu(), -1, 0 );
if ( m_pClose )
{
- TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( closePressed() ) );
+ TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( closePressed() ) );
m_pClose->show();
}
else
@@ -2488,10 +2490,10 @@ void KMdiMainFrm::switchOffMaximizeModeForMenu( KMdiChildFrm* oldChild )
if ( oldChild )
{
Q_ASSERT( m_pClose );
- TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) );
- TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) );
- TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) );
- TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) );
+ TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) );
+ TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) );
+ TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) );
+ TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) );
}
m_pUndock->hide();
m_pMinimize->hide();
@@ -2510,7 +2512,7 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF
if ( newChild )
{
if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook )
- m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQT_SLOT( closePressed() ), 0, -1, 0 );
+ m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQ_SLOT( closePressed() ), 0, -1, 0 );
else
m_pMainMenuBar->insertItem( *newChild->icon(), newChild->systemMenu(), -1, 0 );
}
@@ -2519,18 +2521,18 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF
{
m_pMainMenuBar->removeItem( m_pMainMenuBar->idAt( 1 ) );
Q_ASSERT( m_pClose );
- TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) );
- TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) );
- TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) );
- TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) );
+ TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) );
+ TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) );
+ TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) );
+ TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) );
}
if ( newChild )
{
Q_ASSERT( m_pClose );
- TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( undockPressed() ) );
- TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( minimizePressed() ) );
- TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( maximizePressed() ) );
- TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( closePressed() ) );
+ TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( undockPressed() ) );
+ TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( minimizePressed() ) );
+ TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( maximizePressed() ) );
+ TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( closePressed() ) );
}
}
@@ -2578,7 +2580,7 @@ void KMdiMainFrm::fillWindowMenu()
d->closeWindowAction->plug(m_pWindowMenu);
- int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQT_SLOT( closeAllViews() ) );
+ int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQ_SLOT( closeAllViews() ) );
if ( noViewOpened )
{
d->closeWindowAction->setEnabled(false);
@@ -2587,7 +2589,7 @@ void KMdiMainFrm::fillWindowMenu()
if ( !tabPageMode && !IDEAlMode )
{
- int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQT_SLOT( iconifyAllViews() ) );
+ int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQ_SLOT( iconifyAllViews() ) );
if ( noViewOpened )
m_pWindowMenu->setItemEnabled( iconifyId, false );
}
@@ -2595,10 +2597,10 @@ void KMdiMainFrm::fillWindowMenu()
m_pWindowMenu->insertSeparator();
m_pWindowMenu->insertItem( i18n( "&MDI Mode" ), m_pMdiModeMenu );
m_pMdiModeMenu->clear();
- m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQT_SLOT( switchToToplevelMode() ) );
- m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQT_SLOT( switchToChildframeMode() ) );
- m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQT_SLOT( switchToTabPageMode() ) );
- m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQT_SLOT( switchToIDEAlMode() ) );
+ m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQ_SLOT( switchToToplevelMode() ) );
+ m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQ_SLOT( switchToChildframeMode() ) );
+ m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQ_SLOT( switchToTabPageMode() ) );
+ m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQ_SLOT( switchToIDEAlMode() ) );
switch ( m_mdiMode )
{
case KMdi::ToplevelMode:
@@ -2622,13 +2624,13 @@ void KMdiMainFrm::fillWindowMenu()
{
int placMenuId = m_pWindowMenu->insertItem( i18n( "&Tile" ), m_pPlacingMenu );
m_pPlacingMenu->clear();
- m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQT_SLOT( cascadeWindows() ) );
- m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQT_SLOT( cascadeMaximized() ) );
- m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQT_SLOT( expandVertical() ) );
- m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQT_SLOT( expandHorizontal() ) );
- m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQT_SLOT( tileAnodine() ) );
- m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQT_SLOT( tilePragma() ) );
- m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQT_SLOT( tileVertically() ) );
+ m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQ_SLOT( cascadeWindows() ) );
+ m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQ_SLOT( cascadeMaximized() ) );
+ m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQ_SLOT( expandVertical() ) );
+ m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQ_SLOT( expandHorizontal() ) );
+ m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQ_SLOT( tileAnodine() ) );
+ m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQ_SLOT( tilePragma() ) );
+ m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQ_SLOT( tileVertically() ) );
if ( m_mdiMode == KMdi::ToplevelMode )
{
m_pWindowMenu->setItemEnabled( placMenuId, false );
@@ -2690,7 +2692,7 @@ void KMdiMainFrm::fillWindowMenu()
}
if ( putHere )
{
- m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount );
+ m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount );
if ( pView == m_pCurrentWindow )
{
m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( indx + entryCount ), true );
@@ -2698,7 +2700,7 @@ void KMdiMainFrm::fillWindowMenu()
pView->setWindowMenuID( i );
if ( !tabPageMode )
{
- m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, indx );
+ m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, indx );
if ( pView->isAttached() )
{
m_pDockMenu->setItemChecked( m_pDockMenu->idAt( indx ), true );
@@ -2711,7 +2713,7 @@ void KMdiMainFrm::fillWindowMenu()
}
if ( !inserted )
{ // append it
- m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount );
+ m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount );
if ( pView == m_pCurrentWindow )
{
m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( windowItemCount + entryCount ), true );
@@ -2719,7 +2721,7 @@ void KMdiMainFrm::fillWindowMenu()
pView->setWindowMenuID( i );
if ( !tabPageMode )
{
- m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount );
+ m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount );
if ( pView->isAttached() )
{
m_pDockMenu->setItemChecked( m_pDockMenu->idAt( windowItemCount ), true );
@@ -2936,6 +2938,3 @@ KTabWidget * KMdiMainFrm::tabWidget() const
}
#include "tdemdimainfrm.moc"
-
-// vim: ts=2 sw=2 et
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
index c1a0f1d4..733c2b62 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
@@ -240,7 +240,7 @@ class KMDI_EXPORT KMdiMainFrm : public KParts::DockMainWindow
{
friend class KMdiChildView;
friend class KMdiTaskBar;
- Q_OBJECT
+ TQ_OBJECT
friend class KMdiToolViewAccessor;
@@ -869,5 +869,3 @@ signals:
};
#endif //_TDEMDIMAINFRM_H_
-
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
index 59ffed85..b018564f 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
@@ -45,5 +45,3 @@ public:
};
#endif // _TDEMDINULLITERATOR_H_
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
index 207217dc..1d5c9ab7 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
@@ -63,7 +63,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_
m_pWindow = win_ptr;
TQToolTip::add
( this, win_ptr->caption() );
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
}
KMdiTaskBarButton::~KMdiTaskBarButton()
@@ -73,10 +73,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e )
{
switch ( e->button() )
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
emit leftMouseButtonClicked( m_pWindow );
break;
- case Qt::RightButton:
+ case TQt::RightButton:
emit rightMouseButtonClicked( m_pWindow );
break;
default:
@@ -152,7 +152,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
m_pButtonList->setAutoDelete( true );
//QT30 setFontPropagation(TQWidget::SameFont);
setMinimumWidth( 1 );
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
parent->moveToolBar( this, dock ); //XXX obsolete!
}
@@ -171,11 +171,11 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr )
}
KMdiTaskBarButton *b = new KMdiTaskBarButton( this, win_ptr );
- TQObject::connect( b, TQT_SIGNAL( clicked() ), win_ptr, TQT_SLOT( setFocus() ) );
- TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) );
- TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) );
- TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) );
- TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) );
+ TQObject::connect( b, TQ_SIGNAL( clicked() ), win_ptr, TQ_SLOT( setFocus() ) );
+ TQObject::connect( b, TQ_SIGNAL( clicked( KMdiChildView* ) ), this, TQ_SLOT( setActiveButton( KMdiChildView* ) ) );
+ TQObject::connect( b, TQ_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( activateView( KMdiChildView* ) ) );
+ TQObject::connect( b, TQ_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) );
+ TQObject::connect( b, TQ_SIGNAL( buttonTextChanged( int ) ), this, TQ_SLOT( layoutTaskBar( int ) ) );
m_pButtonList->append( b );
b->setToggleButton( true );
b->setText( win_ptr->tabCaption() );
@@ -359,7 +359,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
newButtonWidth = buttonAreaWidth / buttonCount;
else
newButtonWidth = 0;
- if ( orientation() == Qt::Vertical )
+ if ( orientation() == TQt::Vertical )
newButtonWidth = 80;
if ( newButtonWidth > 0 )
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
@@ -386,5 +386,3 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse )
}
TDEToolBar::resizeEvent( rse );
}
-
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
index 59ccfadb..5071e076 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
@@ -50,7 +50,7 @@ class KMdiTaskBarButtonPrivate;
*/
class KMdiTaskBarButton : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
// methods
public:
@@ -129,7 +129,7 @@ class KMdiTaskBarPrivate;
*/
class KMDI_EXPORT KMdiTaskBar : public TDEToolBar
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -217,5 +217,3 @@ private:
};
#endif //_TDEMDITASKBAR_H_
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp
index ce6fcca0..25562e34 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp
@@ -95,7 +95,7 @@ TQWidget *KMdiToolViewAccessor::wrapperWidget()
if ( !d->widgetContainer )
{
d->widgetContainer = mdiMainFrm->createDockWidget( "KMdiToolViewAccessor::null", TQPixmap() );
- connect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) );
+ connect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) );
}
return d->widgetContainer;
}
@@ -110,7 +110,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri
{
Q_ASSERT( !( d->widget ) );
Q_ASSERT( !widgetToWrap->inherits( "KDockWidget" ) );
- disconnect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) );
+ disconnect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) );
delete d->widget;
d->widget = widgetToWrap;
KDockWidget *tmp = d->widgetContainer;
@@ -265,5 +265,3 @@ void KMdiToolViewAccessor::show()
#ifndef NO_INCLUDE_MOCFILES
#include "tdemditoolviewaccessor.moc"
#endif
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
index f5bbcf6c..244c1487 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
@@ -37,7 +37,7 @@ class KMDIGUIClient;
class KMDI_EXPORT KMdiToolViewAccessor : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
@@ -83,5 +83,3 @@ protected:
#endif //_TDEMDITOOLVIEWACCESSOR_H_
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
-
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
index b33fc27f..422e1aa9 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
@@ -395,7 +395,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text,
setFixedWidth(24);
m_id=id;
TQToolTip::add(this,text);
- connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
+ connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
}
KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
@@ -410,7 +410,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
setFixedWidth(24);
m_id=id;
TQToolTip::add(this,text);
- connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
+ connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
}
KMultiTabBarButton::~KMultiTabBarButton() {
@@ -492,7 +492,7 @@ TQSize KMultiTabBarButton::sizeHint() const
h = TQMAX(h, sz.height());
}
- return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+ return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
index be5bf4a5..42e3f545 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
@@ -53,7 +53,7 @@ class KMultiTabBarInternal;
*/
class TDEUTILS_EXPORT KMultiTabBar: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum KMultiTabBarMode{Horizontal,Vertical};
@@ -154,7 +154,7 @@ private:
*/
class TDEUTILS_EXPORT KMultiTabBarButton: public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
@@ -207,7 +207,7 @@ protected slots:
*/
class TDEUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
index 878f3ff0..203d436d 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
@@ -29,7 +29,7 @@
class KMultiTabBarInternal: public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp
index d8b04b5e..e303b1f6 100644
--- a/lib/ksavealldialog.cpp
+++ b/lib/ksavealldialog.cpp
@@ -79,9 +79,9 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co
++it;
}
- connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) );
- connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) );
- connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) );
+ connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) );
+ connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(save()) );
+ connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(saveNone()) );
}
KSaveSelectDialog::~KSaveSelectDialog() {}
@@ -159,9 +159,9 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent
setButtonTip( User1, i18n("Lose all modifications") );
setButtonTip( Close, i18n("Cancels the action") );
- connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) );
- connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) );
- connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) );
+ connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) );
+ connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveAll()) );
+ connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(revert()) );
}
KSaveAllDialog::~KSaveAllDialog()
diff --git a/lib/ksavealldialog.h b/lib/ksavealldialog.h
index fcd63fc0..59a16f87 100644
--- a/lib/ksavealldialog.h
+++ b/lib/ksavealldialog.h
@@ -35,7 +35,7 @@ Dialog to save selected files.
*/
class KSaveSelectDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -61,7 +61,7 @@ Dialog to save all files.
*/
class KSaveAllDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp
index 094e1f77..72cdb56d 100644
--- a/lib/qextfileinfo.cpp
+++ b/lib/qextfileinfo.cpp
@@ -300,10 +300,10 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true);
job->setWindow(window);
m_listJobCount = 1;
- connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)),
- this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&)));
- connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
- this, TQT_SLOT( slotListResult (TDEIO::Job *) ) );
+ connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)),
+ this, TQ_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&)));
+ connect( job, TQ_SIGNAL( result (TDEIO::Job *) ),
+ this, TQ_SLOT( slotListResult (TDEIO::Job *) ) );
m_listStartURL = startURL.url();
//kdDebug(24000) << "Now listing: " << startURL.url() << endl;
@@ -338,10 +338,10 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c
TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true);
job->setWindow(window);
m_listJobCount = 1;
- connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)),
- this, TQT_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&)));
- connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
- this, TQT_SLOT( slotListResult (TDEIO::Job *) ) );
+ connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)),
+ this, TQ_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&)));
+ connect( job, TQ_SIGNAL( result (TDEIO::Job *) ),
+ this, TQ_SLOT( slotListResult (TDEIO::Job *) ) );
m_listStartURL = startURL.url();
//kdDebug(24000) << "Now listing: " << startURL.url() << endl;
enter_loop();
@@ -397,11 +397,11 @@ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *w
job->setWindow(window);
job->setDetails(0);
job->setSide(readingOnly);
- connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
- this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
+ connect( job, TQ_SIGNAL( result (TDEIO::Job *) ),
+ this, TQ_SLOT( slotResult (TDEIO::Job *) ) );
//To avoid lock-ups, start a timer.
- TQTimer::singleShot(60*1000, this,TQT_SLOT(slotTimeout()));
+ TQTimer::singleShot(60*1000, this,TQ_SLOT(slotTimeout()));
//kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl;
enter_loop();
//kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl;
@@ -417,8 +417,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume, false );
// TDEIO::Job * job2 = TDEIO::del(target, false );
//job2->setWindow (window);
- //connect( job2, TQT_SIGNAL( result (TDEIO::Job *) ),
-// this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
+ //connect( job2, TQ_SIGNAL( result (TDEIO::Job *) ),
+// this, TQ_SLOT( slotResult (TDEIO::Job *) ) );
//enter_loop();
//if (bJobOK)
@@ -426,8 +426,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
// kdDebug(24000) << "Copying " << src << " to " << target << endl;
// TDEIO::Job *job = TDEIO::copy( src, target, false );
job->setWindow (window);
- connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
- this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
+ connect( job, TQ_SIGNAL( result (TDEIO::Job *) ),
+ this, TQ_SLOT( slotResult (TDEIO::Job *) ) );
enter_loop();
}
return bJobOK;
@@ -440,7 +440,7 @@ void tqt_leave_modal( TQWidget *widget );
void QExtFileInfo::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( TQ_NoFocus );
+ dummy.setFocusPolicy( TQWidget::NoFocus );
tqt_enter_modal(&dummy);
//kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<< endl;
tqApp->enter_loop();
@@ -536,10 +536,10 @@ void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& ud
TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true);
m_listJobCount++;
//kdDebug(24000) << "Now listing: " << (*it)->url() << endl;
- connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
- this,TQT_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
- connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)),
- this,TQT_SLOT (slotListResult(TDEIO::Job *)));
+ connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
+ this,TQ_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
+ connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this,TQ_SLOT (slotListResult(TDEIO::Job *)));
}
}
@@ -603,10 +603,10 @@ void QExtFileInfo::slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntry
TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true);
m_listJobCount++;
// kdDebug(24000) << "Now listing: " << (*it)->url() << endl;
- connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
- this,TQT_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
- connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)),
- this,TQT_SLOT (slotListResult(TDEIO::Job *)));
+ connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
+ this,TQ_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
+ connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)),
+ this,TQ_SLOT (slotListResult(TDEIO::Job *)));
}
}
diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h
index bb3f3c05..df2267ec 100644
--- a/lib/qextfileinfo.h
+++ b/lib/qextfileinfo.h
@@ -24,7 +24,7 @@
class QExtFileInfo:public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
QExtFileInfo() {};