diff options
Diffstat (limited to 'kommander/editor')
91 files changed, 1458 insertions, 1612 deletions
diff --git a/kommander/editor/CMakeLists.txt b/kommander/editor/CMakeLists.txt new file mode 100644 index 00000000..098bc825 --- /dev/null +++ b/kommander/editor/CMakeLists.txt @@ -0,0 +1,88 @@ +add_subdirectory( pics ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/widgets + ${CMAKE_SOURCE_DIR}/kommander/plugin + ${CMAKE_SOURCE_DIR}/kommander/factory +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +add_definitions( -DKOMMANDER -DTQT_NO_SQL -DDESIGNER ) + + +##### kmdr-editor (executable) + +tde_add_executable( kmdr-editor AUTOMOC + + SOURCES + actioneditor.ui assoctexteditor.ui + connectioneditor.ui createtemplate.ui + formsettings.ui iconvieweditor.ui + listboxeditor.ui listeditor.ui + listvieweditor.ui multilineeditor.ui + newform.ui paletteeditor.ui + paletteeditoradvanced.ui pixmapfunction.ui + preferences.ui previewwidget.ui + tableeditor.ui wizardeditor.ui + choosewidget.ui functions.ui + actiondnd.cpp actioneditorimpl.cpp + assoctexteditorimpl.cpp actionlistview.cpp + asciivalidator.cpp assistproc.cpp + command.cpp connectioneditorimpl.cpp + defs.cpp filechooser.cpp + formfile.cpp formsettingsimpl.cpp + formwindow.cpp hierarchyview.cpp + iconvieweditorimpl.cpp layout.cpp + listboxeditorimpl.cpp listvieweditorimpl.cpp + main.cpp mainwindow.cpp + mainwindowactions.cpp metadatabase.cpp + multilineeditorimpl.cpp newformimpl.cpp + orderindicator.cpp paletteeditoradvancedimpl.cpp + paletteeditorimpl.cpp parser.cpp + pixmapchooser.cpp previewframe.cpp + previewwidgetimpl.cpp propertyeditor.cpp + qcompletionedit.cpp resource.cpp + sizehandle.cpp styledbutton.cpp + tableeditorimpl.cpp widgetdatabase.cpp + widgetfactory.cpp wizardeditorimpl.cpp + workspace.cpp choosewidgetimpl.cpp + functionsimpl.cpp messagelog.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeparts-shared + tdetexteditor-shared + kommanderwidget-shared + kommanderwidgets-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES kommander.xml kommander-new.xml + DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax +) + +tde_create_translated_desktop( + SOURCE kmdr-editor.desktop + PO_DIR kommander-desktops +) diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index d07bfebf..bc3b2a21 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -47,7 +47,7 @@ bool QDesignerAction::addTo( TQWidget *w ) if ( !widgetToInsert ) return TQAction::addTo( w ); - if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQPopupMenu" ) ) return false; widgetToInsert->reparent( w, TQPoint( 0, 0 ), false ); @@ -68,23 +68,23 @@ void QDesignerAction::remove() { if ( !widgetToInsert ) return; - MainWindow::self->formWindow()->selectWidget( TQT_TQOBJECT(widgetToInsert), false ); + MainWindow::self->formWindow()->selectWidget( widgetToInsert, false ); widgetToInsert->reparent( 0, TQPoint( 0, 0 ), false ); } -QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), - this, TQT_SLOT(setOrientation(Qt::Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } -void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) +void QDesignerToolBarSeparator::setOrientation( TQt::Orientation o ) { orient = o; } @@ -98,7 +98,7 @@ TQSize QDesignerToolBarSeparator::sizeHint() const { int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) return TQSize( extent, 0 ); else return TQSize( 0, extent ); @@ -109,10 +109,10 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() ==Qt::Horizontal ) + if ( orientation() ==TQt::Horizontal ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } @@ -125,11 +125,11 @@ QSeparatorAction::QSeparatorAction( TQObject *parent ) bool QSeparatorAction::addTo( TQWidget *w ) { - if ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQToolBar" ) ) { TQToolBar *tb = (TQToolBar*)w; wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); return true; - } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQPopupMenu" ) ) { idx = ( (TQPopupMenu*)w )->count(); ( (TQPopupMenu*)w )->insertSeparator( idx ); return true; @@ -139,10 +139,10 @@ bool QSeparatorAction::addTo( TQWidget *w ) bool QSeparatorAction::removeFrom( TQWidget *w ) { - if ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQToolBar" ) ) { delete wid; return true; - } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQPopupMenu" ) ) { ( (TQPopupMenu*)w )->removeItemAt( idx ); return true; } @@ -163,7 +163,7 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw ) insertAnchor = 0; afterAnchor = true; setAcceptDrops( true ); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); lastIndicatorPos = TQPoint( -1, -1 ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); @@ -181,7 +181,7 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock ) setAcceptDrops( true ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); installEventFilter( this ); widgetInserting = false; findFormWindow(); @@ -201,8 +201,8 @@ void QDesignerToolBar::findFormWindow() void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); + if ( a->inherits( "TQActionGroup" ) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); } else if ( a->inherits( "QSeparatorAction" ) ) { @@ -222,16 +222,16 @@ static void fixObject( TQObject *&o ) bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) { - if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) ) + if ( !o || !e || o->inherits( "TQDockWindowHandle" ) || o->inherits( "TQDockWindowTitleBar" ) ) return TQToolBar::eventFilter( o, e ); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress && - ( ( TQMouseEvent*)e )->button() == Qt::LeftButton ) { + if ( o == this && e->type() == TQEvent::MouseButtonPress && + ( ( TQMouseEvent*)e )->button() == TQt::LeftButton ) { mousePressEvent( (TQMouseEvent*)e ); return true; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if ( o == this ) return TQToolBar::eventFilter( o, e ); if ( e->type() == TQEvent::MouseButtonPress ) { @@ -304,7 +304,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerToolBar::mousePressEvent( TQMouseEvent *e ) { widgetInserting = false; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL ) { @@ -391,10 +391,10 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) { widgetInserting = false; - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) return; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL ) { @@ -430,7 +430,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w ) void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) { - if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 ) + if ( widgetInserting || ( e->state() & TQt::LeftButton ) == 0 ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; @@ -450,15 +450,15 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQApplication::sendPostedEvents(); adjustSize(); - TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) : a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); - TQStoredDrag *drag = new TQStoredDrag( type, this ); + TQStoredDrag *drag = new TQStoredDrag( type.utf8(), this ); TQString s = TQString::number( (long)a ); // #### huha, that is evil drag->setEncodedData( TQCString( s.latin1() ) ); drag->setPixmap( a->iconSet().pixmap() ); if ( a->inherits( "QDesignerAction" ) ) { if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) ) - formWindow->selectWidget( TQT_TQOBJECT(( (QDesignerAction*)a )->widget()), false ); + formWindow->selectWidget( ( (QDesignerAction*)a )->widget(), false ); } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Action '%1' to Toolbar '%2'" ). @@ -560,7 +560,7 @@ void QDesignerToolBar::reInsert() clear(); for ( a = actionList.first(); a; a = actionList.next() ) { a->addTo( this ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); if ( ( (QDesignerActionGroup*)a )->widget() ) ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); @@ -583,7 +583,7 @@ void QDesignerToolBar::actionRemoved() TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) { - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { TQPoint pnt( width() - 2, 0 ); insertAnchor = 0; afterAnchor = true; @@ -637,7 +637,7 @@ void QDesignerToolBar::drawIndicator( const TQPoint &pos ) if ( lastIndicatorPos == pos ) return; bool wasVsisible = indicator->isVisible(); - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { indicator->resize( 3, height() ); if ( pos != TQPoint( -1, -1 ) ) indicator->move( pos.x() - 1, 0 ); @@ -691,7 +691,7 @@ void QDesignerToolBar::installEventFilters( TQWidget *w ) { if ( !w ) return; - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( this ); delete l; @@ -704,7 +704,7 @@ QDesignerMenuBar::QDesignerMenuBar( TQWidget *mw ) { show(); setAcceptDrops( true ); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); itemNum = 0; mousePressed = false; lastIndicatorPos = TQPoint( -1, -1 ); @@ -769,7 +769,7 @@ void QDesignerMenuBar::mousePressEvent( TQMouseEvent *e ) lastIndicatorPos = TQPoint( -1, -1 ); insertAt = -1; mousePressed = true; - if ( e->button() == Qt::MidButton || e->button() == Qt::RightButton ) + if ( e->button() == TQt::MidButton || e->button() == TQt::RightButton ) return; dragStartPos = e->pos(); @@ -778,7 +778,7 @@ void QDesignerMenuBar::mousePressEvent( TQMouseEvent *e ) void QDesignerMenuBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( !mousePressed || e->state() == Qt::NoButton ) { + if ( !mousePressed || e->state() == TQt::NoButton ) { TQMenuBar::mouseMoveEvent( e ); return; } @@ -847,12 +847,12 @@ void QDesignerMenuBar::dragMoveEvent( TQDragMoveEvent *e ) e->provides( "application/x-designer-actiongroup" ) || e->provides( "application/x-designer-separator" ) ) { int item = itemAtPos( e->pos() ); - bool uieffect = TQApplication::isEffectEnabled( Qt::UI_AnimateMenu ); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, false ); + bool uieffect = TQApplication::isEffectEnabled( TQt::UI_AnimateMenu ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, false ); if ( !tqApp->activePopupWidget() ) actItem = -1; activateItemAt( item ); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, uieffect ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, uieffect ); if ( item == -1 ) hidePopups(); } else { @@ -977,7 +977,7 @@ void QDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e ) { #if defined( TQ_WS_MAC ) //the mac needs us to use context menu rather than right click e->accept(); - TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::RightButton, Qt::RightButton ); + TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), TQt::RightButton, TQt::RightButton ); mousePressEvent(&me); #else Q_UNUSED( e ); @@ -986,10 +986,10 @@ void QDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) return; - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { // A popup for a popup, we only need one, so make sure that // we don't create multiple. The timer keeps the event loop sane. popupPos = e->globalPos(); @@ -998,7 +998,7 @@ void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e ) popupMenu->close(); } e->accept(); - TQTimer::singleShot( 0, this, TQT_SLOT(createPopupMenu()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(createPopupMenu()) ); return; } mousePressed = true; @@ -1054,7 +1054,7 @@ void QDesignerPopupMenu::createPopupMenu() void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) { - if ( !mousePressed || e->state() == Qt::NoButton ) { + if ( !mousePressed || e->state() == TQt::NoButton ) { TQPopupMenu::mouseMoveEvent( e ); return; } @@ -1074,9 +1074,9 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) : a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); - TQStoredDrag *drag = new TQStoredDrag( type, this ); + TQStoredDrag *drag = new TQStoredDrag( type.utf8(), this ); TQString s = TQString::number( (long)a ); // #### huha, that is evil drag->setEncodedData( TQCString( s.latin1() ) ); drag->setPixmap( a->iconSet().pixmap() ); @@ -1217,7 +1217,7 @@ TQPoint QDesignerPopupMenu::calcIndicatorPos( const TQPoint &pos ) void QDesignerPopupMenu::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); } void QDesignerPopupMenu::actionRemoved() diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index b71d2c2c..2f4649a5 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -36,12 +36,12 @@ class FormWindow; class QDesignerActionGroup : public TQActionGroup { - Q_OBJECT + TQ_OBJECT public: QDesignerActionGroup( TQObject *parent ) - : TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} + : TQActionGroup( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} TQWidget *widget() const { return wid; } TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } @@ -67,14 +67,14 @@ private: class QDesignerAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: QDesignerAction( TQObject *parent ) - : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} + : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} QDesignerAction( TQWidget *w, TQObject *parent ) - : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} + : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} TQWidget *widget() const { return wid; } int index() const { return idx; } @@ -102,7 +102,7 @@ private: class QDesignerToolBarSeparator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -122,7 +122,7 @@ private: class QSeparatorAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: @@ -141,7 +141,7 @@ private: class QDesignerToolBar : public TQToolBar { - Q_OBJECT + TQ_OBJECT public: @@ -200,7 +200,7 @@ private: class QDesignerMenuBar : public TQMenuBar { - Q_OBJECT + TQ_OBJECT friend class QDesignerPopupMenu; @@ -249,7 +249,7 @@ private: class QDesignerPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: @@ -298,7 +298,7 @@ private: class QDesignerIndicatorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 8dea07ad..3b5df0e8 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -44,17 +44,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( false ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( i18n("New &Action" ), this, TQT_SLOT( newAction() ) ); - popup->insertItem( i18n("New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); - popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); + popup->insertItem( i18n("New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( i18n("New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); - connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); - connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); - connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); - connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) @@ -86,10 +86,10 @@ void ActionEditor::deleteAction() formWindow->actionList().removeRef( currentAction ); delete currentAction; TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), currentAction ); + MetaDataBase::connections( formWindow, currentAction ); for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin(); it2 != conns.end(); ++it2 ) - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal, + MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal, (*it2).receiver, (*it2).slot ); delete it.current(); break; @@ -97,10 +97,10 @@ void ActionEditor::deleteAction() formWindow->actionList().removeRef( currentAction ); delete currentAction; TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), currentAction ); + MetaDataBase::connections( formWindow, currentAction ); for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin(); it2 != conns.end(); ++it2 ) - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal, + MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal, (*it2).receiver, (*it2).slot ); delete it.current(); break; @@ -109,7 +109,7 @@ void ActionEditor::deleteAction() } if ( formWindow ) - formWindow->setActiveObject( TQT_TQOBJECT(formWindow->mainContainer()) ); + formWindow->setActiveObject( formWindow->mainContainer() ); } void ActionEditor::newAction() @@ -117,7 +117,7 @@ void ActionEditor::newAction() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -130,7 +130,7 @@ void ActionEditor::newAction() TQString n = "Action"; formWindow->unify( i->action(), n, true ); i->setText( 0, n ); - i->action()->setName( n ); + i->action()->setName( n.utf8() ); i->action()->setText( i->action()->name() ); if ( actionParent && actionParent->actionGroup() && actionParent->actionGroup()->usesDropDown() ) { @@ -149,7 +149,7 @@ void ActionEditor::newActionGroup() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -164,7 +164,7 @@ void ActionEditor::newActionGroup() TQString n = "ActionGroup"; formWindow->unify( i->action(), n, true ); i->setText( 0, n ); - i->actionGroup()->setName( n ); + i->actionGroup()->setName( n.utf8() ); i->actionGroup()->setText( i->actionGroup()->name() ); MetaDataBase::setPropertyChanged( i->actionGroup(), "text", true ); MetaDataBase::setPropertyChanged( i->actionGroup(), "name", true ); @@ -186,18 +186,18 @@ void ActionEditor::setFormWindow( FormWindow *fw ) formWindow = fw; if ( !formWindow || !formWindow->mainContainer() || - !formWindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + !formWindow->mainContainer()->inherits( "TQMainWindow" ) ) { setEnabled( false ); } else { setEnabled( true ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( a->parent() && a->parent()->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( a->parent() && a->parent()->inherits( "TQAction" ) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { insertChildActions( i ); } } @@ -219,14 +219,14 @@ void ActionEditor::insertChildActions( ActionItem *i ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; TQAction *a = (TQAction*)o; ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a ); i->setOpen( true ); i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + if ( a->inherits( "TQActionGroup" ) ) insertChildActions( i2 ); } } @@ -257,7 +257,7 @@ void ActionEditor::updateActionIcon( TQAction *a ) void ActionEditor::connectionsClicked() { - ConnectionEditor editor( formWindow->mainWindow(), TQT_TQOBJECT(currentAction), TQT_TQOBJECT(formWindow), formWindow ); + ConnectionEditor editor( formWindow->mainWindow(), currentAction, formWindow, formWindow ); editor.exec(); } #include "actioneditorimpl.moc" diff --git a/kommander/editor/actioneditorimpl.h b/kommander/editor/actioneditorimpl.h index ff6f001d..38b543f4 100644 --- a/kommander/editor/actioneditorimpl.h +++ b/kommander/editor/actioneditorimpl.h @@ -31,7 +31,7 @@ class ActionItem; class ActionEditor : public ActionEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 80d4d94c..ab7517f7 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -30,14 +30,14 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) header()->setStretchEnabled( true ); setRootIsDecorated( true ); setSorting( -1 ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) : TQListViewItem( lv ), a( 0 ), g( 0 ) { - if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + if ( ac->inherits( "TQActionGroup" ) ) g = (QDesignerActionGroup*)ac; else a = (QDesignerAction*)ac; @@ -47,7 +47,7 @@ ActionItem::ActionItem( TQListView *lv, TQAction *ac ) ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) : TQListViewItem( i ), a( 0 ), g( 0 ) { - if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + if ( ac->inherits( "TQActionGroup" ) ) g = (QDesignerActionGroup*)ac; else a = (QDesignerAction*)ac; diff --git a/kommander/editor/actionlistview.h b/kommander/editor/actionlistview.h index c65e6658..fa13b2d2 100644 --- a/kommander/editor/actionlistview.h +++ b/kommander/editor/actionlistview.h @@ -52,7 +52,7 @@ private: class ActionListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/asciivalidator.h b/kommander/editor/asciivalidator.h index 676208eb..2faac155 100644 --- a/kommander/editor/asciivalidator.h +++ b/kommander/editor/asciivalidator.h @@ -27,7 +27,7 @@ class AsciiValidator: public TQValidator { - Q_OBJECT + TQ_OBJECT public: AsciiValidator( TQObject * parent, const char *name = 0 ); diff --git a/kommander/editor/assistproc.cpp b/kommander/editor/assistproc.cpp index 8fbf61f3..580b2b2d 100644 --- a/kommander/editor/assistproc.cpp +++ b/kommander/editor/assistproc.cpp @@ -23,14 +23,14 @@ AssistProc::AssistProc( TQObject *parent, const char *name, const TQString &path : TQProcess( parent, name ) { assistantPath = path; - connect( this, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(processOutput()) ); - connect( this, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(processErrOutput()) ); + connect( this, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(processOutput()) ); + connect( this, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(processErrOutput()) ); } AssistProc::~AssistProc() { tryTerminate(); - TQTimer::singleShot( 5000, this, TQT_SLOT(kill())); // If busy, kill in 5 sec... + TQTimer::singleShot( 5000, this, TQ_SLOT(kill())); // If busy, kill in 5 sec... } bool AssistProc::run( const TQString &path ) diff --git a/kommander/editor/assistproc.h b/kommander/editor/assistproc.h index 8e579bda..c7097787 100644 --- a/kommander/editor/assistproc.h +++ b/kommander/editor/assistproc.h @@ -27,7 +27,7 @@ class AssistProc : public TQProcess { - Q_OBJECT + TQ_OBJECT public: AssistProc( TQObject *parent=0, const char * name = 0, const TQString &path = TQString() ); diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui index 558964c1..a43e524b 100644 --- a/kommander/editor/assoctexteditor.ui +++ b/kommander/editor/assoctexteditor.ui @@ -215,8 +215,11 @@ <slot>AssocTextEditorBase_destroyed(TQObject*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>AssocTextEditorBase_destroyed(TQObject*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 1c1b7bbe..93e33b17 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -89,7 +89,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, break; } - doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document"); + doc = KTextEditor::createDocument ("libkatepart", a_parent, "KTextEditor::Document"); TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1); view = doc->createView(editorFrame); layout->addWidget(view, 1,1); @@ -138,7 +138,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction = view->actionCollection()->action("tools_toggle_write_lock"); popup->insertSeparator(); highlightPopup = new TDEPopupMenu(popup); - connect(highlightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotHighlightingChanged(int))); + connect(highlightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotHighlightingChanged(int))); popup->insertItem(i18n("&Highlighting"), highlightPopup); @@ -151,13 +151,13 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction->activate(); setWidget(a_widget); - connect(doc, TQT_SIGNAL(textChanged()), TQT_SLOT(textEditChanged())); - connect(widgetsComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(widgetChanged(int))); - connect(stateComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(stateChanged(int))); - connect(filePushButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFile())); - connect(functionButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFunction())); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(insertWidgetName(int))); - connect(treeWidgetButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectWidget())); + connect(doc, TQ_SIGNAL(textChanged()), TQ_SLOT(textEditChanged())); + connect(widgetsComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(widgetChanged(int))); + connect(stateComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(stateChanged(int))); + connect(filePushButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFile())); + connect(functionButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFunction())); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(insertWidgetName(int))); + connect(treeWidgetButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectWidget())); view->setFocus(); } @@ -270,21 +270,21 @@ void AssocTextEditor::save() const { TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name()); SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, - TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(), + m_widget, m_propertyEditor, "associations", atw->associatedText(), associatedText(), TQString(), TQString(), false); cmd->execute(); m_formWindow->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "associations", true); + MetaDataBase::setPropertyChanged(m_widget, "associations", true); } if (atw->populationText() != populationText()) { TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name()); - SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget), + SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, m_widget, m_propertyEditor, "populationText", atw->populationText(), populationText(), TQString(), TQString(), false); cmd->execute(); m_formWindow->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "populationText", true); + MetaDataBase::setPropertyChanged(m_widget, "populationText", true); } } @@ -305,7 +305,7 @@ TQString AssocTextEditor::populationText() const TQStringList AssocTextEditor::buildWidgetList() { TQStringList widgetList; - TQObject* thisObject = TQT_TQOBJECT(m_formWindow->mainContainer()); + TQObject* thisObject = m_formWindow->mainContainer(); TQObjectList *objectList = thisObject->queryList(); objectList->prepend(thisObject); diff --git a/kommander/editor/assoctexteditorimpl.h b/kommander/editor/assoctexteditorimpl.h index 2a63942e..2b12f766 100644 --- a/kommander/editor/assoctexteditorimpl.h +++ b/kommander/editor/assoctexteditorimpl.h @@ -48,7 +48,7 @@ class TDEPopupMenu; class AssocTextEditor : public AssocTextEditorBase { - Q_OBJECT + TQ_OBJECT public: AssocTextEditor(TQWidget*, FormWindow*, PropertyEditor*, KParts::PartManager *partManager, TQWidget*, const char* = 0, bool = true); diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index 60b4ff69..210703ee 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -54,9 +54,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -71,9 +68,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -144,7 +138,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index 62f545a0..f399b8b5 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -32,8 +32,8 @@ ChooseWidget::ChooseWidget(TQWidget* a_parent, const char* a_name, bool a_modal) : ChooseWidgetBase(a_parent, a_name, a_modal) { - connect( nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( widgetView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(selectedItem(TQListViewItem*))); + connect( nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( widgetView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(selectedItem(TQListViewItem*))); widgetView->setFullWidth(true); widgetView->addColumn(i18n("Widgets")); widgetView->setRootIsDecorated(true); diff --git a/kommander/editor/choosewidgetimpl.h b/kommander/editor/choosewidgetimpl.h index 5fd8a2b8..e3655e2b 100644 --- a/kommander/editor/choosewidgetimpl.h +++ b/kommander/editor/choosewidgetimpl.h @@ -21,7 +21,7 @@ class ChooseWidget : public ChooseWidgetBase { - Q_OBJECT + TQ_OBJECT public: ChooseWidget(TQWidget*, const char* = 0, bool=true); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 63343b35..8d15c885 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -235,7 +235,7 @@ void ResizeCommand::execute() { widget->setGeometry( newRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -244,7 +244,7 @@ void ResizeCommand::unexecute() { widget->setGeometry( oldRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -271,14 +271,14 @@ void InsertCommand::execute() widget->show(); formWindow()->widgets()->insert( widget, widget ); formWindow()->clearSelection( false ); - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + formWindow()->selectWidget( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( widget ); } void InsertCommand::unexecute() { widget->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(widget), false ); + formWindow()->selectWidget( widget, false ); formWindow()->widgets()->remove( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget ); } @@ -318,7 +318,7 @@ void MoveCommand::execute() w->reparent( newParent, pos, true ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -326,7 +326,7 @@ void MoveCommand::execute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -339,7 +339,7 @@ void MoveCommand::unexecute() w->reparent( oldParent, pos, true ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -347,7 +347,7 @@ void MoveCommand::unexecute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -368,14 +368,14 @@ void DeleteCommand::execute() w->hide(); TQString s = w->name(); s.prepend( "qt_dead_widget_" ); - w->setName( s ); - formWindow()->selectWidget( TQT_TQOBJECT(w), false ); + w->setName( s.utf8() ); + formWindow()->selectWidget( w, false ); formWindow()->widgets()->remove( w ); - TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) ); + TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( formWindow(), w ); connections.insert( w, conns ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::removeConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } @@ -393,13 +393,13 @@ void DeleteCommand::unexecute() w->show(); TQString s = w->name(); s.remove( 0, TQString( "qt_dead_widget_" ).length() ); - w->setName( s ); + w->setName( s.utf8() ); formWindow()->widgets()->insert( w, w ); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::addConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } @@ -430,7 +430,7 @@ void SetPropertyCommand::execute() if ( isResetCommand ) { MetaDataBase::setPropertyChanged( widget, propName, false ); if ( WidgetFactory::resetProperty( widget, propName ) ) { - if ( !formWindow()->isWidgetSelected( widget ) && TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(formWindow()) ) + if ( !formWindow()->isWidgetSelected( widget ) && widget != formWindow() ) formWindow()->selectWidget( widget ); if ( editor->widget() != widget ) editor->setWidget( widget, formWindow() ); @@ -438,7 +438,7 @@ void SetPropertyCommand::execute() PropertyItem *i = (PropertyItem*)editor->propertyList()->currentItem(); if ( !i ) return; - i->setValue( widget->property( propName ) ); + i->setValue( widget->property( propName.latin1() ) ); i->setChanged( false ); editor->refetchData(); editor->emitWidgetChanged(); @@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c ) { SetPropertyCommand *cmd = (SetPropertyCommand*)c; const TQMetaProperty *p = - widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName.latin1(), true ), true ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return true; @@ -532,19 +532,19 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName.latin1(), true ), true ); if ( !p ) { if ( propName == "hAlign" ) { p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); int align = widget->property( "alignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); - align |= p->keyToValue( currentItemText ); + align |= p->keyToValue( currentItemText.utf8() ); widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); int align = widget->property( "alignment" ).toInt(); align &= ~( AlignVertical_Mask ); - align |= p->keyToValue( currentItemText ); + align |= p->keyToValue( currentItemText.utf8() ); widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "wordwrap" ) { int align = widget->property( "alignment" ).toInt(); @@ -553,9 +553,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ align |= WordBreak; widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "layoutSpacing" ) { - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( static_cast<TQWidget*>( editor->widget() ) ), v.toInt() ); } else if ( propName == "layoutMargin" ) { - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( static_cast<TQWidget*>( editor->widget() ) ), v.toInt() ); } else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); } else if ( editor->widget()->inherits( "CustomWidget" ) ) { @@ -577,19 +577,19 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( p->isSetType() ) { ; } else if ( p->isEnumType() ) { - widget->setProperty( propName, p->keyToValue( currentItemText ) ); + widget->setProperty( propName.latin1(), p->keyToValue( currentItemText.utf8() ) ); } else { TQVariant ov; if ( propName == "name" || propName == "itemName" ) - ov = widget->property( propName ); + ov = widget->property( propName.latin1() ); int oldSerNum = -1; if ( v.type() == TQVariant::Pixmap ) oldSerNum = v.toPixmap().serialNumber(); - widget->setProperty( propName, v ); - if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() ) - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()), - widget->property( propName ).toPixmap().serialNumber(), - MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) ); + widget->setProperty( propName.latin1(), v ); + if ( oldSerNum != -1 && oldSerNum != widget->property( propName.latin1() ).toPixmap().serialNumber() ) + MetaDataBase::setPixmapKey( formWindow(), + widget->property( propName.latin1() ).toPixmap().serialNumber(), + MetaDataBase::pixmapKey( formWindow(), oldSerNum ) ); if ( propName == "cursor" ) MetaDataBase::setCursor( (TQWidget*)widget, v.toCursor() ); if ( propName == "name" && widget->isWidgetType() ) { @@ -597,14 +597,14 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( formWindow()->isMainContainer( widget ) ) formWindow()->setName( v.toCString() ); } - if ( propName == "name" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( propName == "name" && widget->inherits( "TQAction" ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)widget ); } - if ( propName == "iconSet" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( propName == "iconSet" && widget->inherits( "TQAction" ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)widget ); } if ( propName == "caption" ) { @@ -747,13 +747,13 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, : Command( n, fw ), lb( layoutBase ), widgets( wl ) { WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); - spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); - margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); + spacing = MetaDataBase::spacing( layoutBase ); + margin = MetaDataBase::margin( layoutBase ); layout = 0; if ( lay == WidgetFactory::HBox ) - layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); else if ( lay == WidgetFactory::VBox ) - layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); else if ( lay == WidgetFactory::Grid ) layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false ); } @@ -776,8 +776,8 @@ void BreakLayoutCommand::unexecute() formWindow()->clearSelection( false ); layout->doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing ); - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( lb ), spacing ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( lb ), margin ); } // ------------------------------------------------------------ @@ -809,7 +809,7 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw, tabPage = new QDesignerWidget( formWindow(), tabWidget, "tab" ); tabPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) ); + MetaDataBase::addEntry( tabPage ); } void AddTabPageCommand::execute() @@ -818,7 +818,7 @@ void AddTabPageCommand::execute() index = ( (QDesignerTabWidget*)tabWidget )->count(); tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -826,7 +826,7 @@ void AddTabPageCommand::unexecute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -840,7 +840,7 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw, page = new QDesignerWidget( formWindow(), toolBox, "tab" ); page->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(page) ); + MetaDataBase::addEntry( page ); } void AddToolBoxPageCommand::execute() @@ -849,7 +849,7 @@ void AddToolBoxPageCommand::execute() index = ( (EditorToolBox*)toolBox)->count(); toolBox->insertItem(index, page, label); toolBox->setCurrentItem( page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -857,7 +857,7 @@ void AddToolBoxPageCommand::unexecute() { toolBox->removeItem( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -876,7 +876,7 @@ void MoveTabPageCommand::execute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -885,7 +885,7 @@ void MoveTabPageCommand::unexecute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -903,7 +903,7 @@ void DeleteTabPageCommand::execute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -911,7 +911,7 @@ void DeleteTabPageCommand::unexecute() { tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -929,7 +929,7 @@ void DeleteToolBoxPageCommand::execute() { toolBox->removeItem( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -937,7 +937,7 @@ void DeleteToolBoxPageCommand::unexecute() { toolBox->insertItem(index, page, label); toolBox->setCurrentItem( page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -951,7 +951,7 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw, page->hide(); index = i; show = s; - MetaDataBase::addEntry( TQT_TQOBJECT(page) ); + MetaDataBase::addEntry( page ); } void AddWizardPageCommand::execute() @@ -961,7 +961,7 @@ void AddWizardPageCommand::execute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -969,7 +969,7 @@ void AddWizardPageCommand::unexecute() { wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -988,7 +988,7 @@ void DeleteWizardPageCommand::execute() pageLabel = wizard->title( page ); wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -997,7 +997,7 @@ void DeleteWizardPageCommand::unexecute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1017,7 +1017,7 @@ void RenameWizardPageCommand::execute() wizard->setTitle( page, label ); label = oldLabel; - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); } void RenameWizardPageCommand::unexecute() @@ -1042,7 +1042,7 @@ void SwapWizardPagesCommand::execute() wizard->removePage( page2 ); wizard->insertPage( page1, page1Label, index2 ); wizard->insertPage( page2, page2Label, index1 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1061,7 +1061,7 @@ AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw void AddConnectionCommand::execute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1074,7 +1074,7 @@ void AddConnectionCommand::execute() void AddConnectionCommand::unexecute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1095,7 +1095,7 @@ RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWind void RemoveConnectionCommand::execute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1108,7 +1108,7 @@ void RemoveConnectionCommand::execute() void RemoveConnectionCommand::unexecute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1131,7 +1131,7 @@ AddSlotCommand::AddSlotCommand( const TQString &name, FormWindow *fw, const TQCS void AddSlotCommand::execute() { - MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1141,7 +1141,7 @@ void AddSlotCommand::execute() void AddSlotCommand::unexecute() { - MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1160,7 +1160,7 @@ RemoveSlotCommand::RemoveSlotCommand( const TQString &name, FormWindow *fw, cons void RemoveSlotCommand::execute() { - MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1170,7 +1170,7 @@ void RemoveSlotCommand::execute() void RemoveSlotCommand::unexecute() { - MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1238,7 +1238,7 @@ void PasteCommand::execute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->show(); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); formWindow()->widgets()->insert( w, w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -1248,7 +1248,7 @@ void PasteCommand::unexecute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(w), false ); + formWindow()->selectWidget( w, false ); formWindow()->widgets()->remove( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); } @@ -1490,21 +1490,21 @@ PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, F : Command( n, fw ), newText( txt ), mlined( mle ) { oldText = mlined->text(); - wasChanged = MetaDataBase::isPropertyChanged( TQT_TQOBJECT(mlined), "text" ); + wasChanged = MetaDataBase::isPropertyChanged( mlined, "text" ); } void PopulateMultiLineEditCommand::execute() { mlined->setText( newText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", true ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", true ); + formWindow()->emitUpdateProperties( mlined ); } void PopulateMultiLineEditCommand::unexecute() { mlined->setText( oldText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", wasChanged ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", wasChanged ); + formWindow()->emitUpdateProperties( mlined ); } // ------------------------------------------------------------ @@ -1516,7 +1516,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T { #ifndef TQT_NO_TABLE int i = 0; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table)); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { PopulateTableCommand::Column col; col.text = table->horizontalHeader()->label( i ); @@ -1546,7 +1546,7 @@ void PopulateTableCommand::execute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( newRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) @@ -1565,7 +1565,7 @@ void PopulateTableCommand::unexecute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( oldRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) @@ -1589,7 +1589,7 @@ void AddActionToToolBarCommand::execute() TQString s = ( (QDesignerAction*)action )->widget()->name(); if ( s.startsWith( "qt_dead_widget_" ) ) { s.remove( 0, TQString( "qt_dead_widget_" ).length() ); - ( (QDesignerAction*)action )->widget()->setName( s ); + ( (QDesignerAction*)action )->widget()->setName( s.utf8() ); } } @@ -1605,13 +1605,13 @@ void AddActionToToolBarCommand::execute() toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action ); ( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar ); } - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { if ( index == -1 ) toolBar->appendAction( action ); else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { TQObjectList clo = action->childrenListObject(); if (!clo.isEmpty()) { @@ -1620,7 +1620,7 @@ void AddActionToToolBarCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; // ### fix it for nested actiongroups if ( o->inherits( "QDesignerAction" ) ) { @@ -1635,7 +1635,7 @@ void AddActionToToolBarCommand::execute() } } toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } @@ -1644,13 +1644,13 @@ void AddActionToToolBarCommand::unexecute() if ( action->inherits( "QDesignerAction" ) ) { TQString s = ( (QDesignerAction*)action )->widget()->name(); s.prepend( "qt_dead_widget_" ); - ( (QDesignerAction*)action )->widget()->setName( s ); + ( (QDesignerAction*)action )->widget()->setName( s.utf8() ); } toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { TQObjectList clo = action->childrenListObject(); @@ -1659,7 +1659,7 @@ void AddActionToToolBarCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( toolBar ); @@ -1680,7 +1680,7 @@ AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow void AddActionToPopupCommand::execute() { - if ( action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( action->inherits( "TQActionGroup" ) ) { if ( ( (TQActionGroup*)action )->usesDropDown() ) { action->addTo( popup ); popup->insertAction( index, action ); @@ -1693,7 +1693,7 @@ void AddActionToPopupCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; QDesignerAction *ac = (QDesignerAction*)o; popup->insertAction( index + (i++), ac ); @@ -1701,13 +1701,13 @@ void AddActionToPopupCommand::execute() } } popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } else { if ( !action->inherits( "QDesignerAction" ) || ( (QDesignerAction*)action )->supportsMenu() ) { action->addTo( popup ); popup->insertAction( index, action ); popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } } } @@ -1716,8 +1716,8 @@ void AddActionToPopupCommand::unexecute() { action->removeFrom( popup ); popup->removeAction( action ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( popup ); } else { TQObjectList clo = action->childrenListObject(); @@ -1726,7 +1726,7 @@ void AddActionToPopupCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( popup ); @@ -1749,10 +1749,10 @@ void AddMenuCommand::execute() if ( !popup ) { TQString n = "PopupMenu"; popup = new QDesignerPopupMenu( mainWindow ); - formWindow()->unify( TQT_TQOBJECT(popup), n, true ); - popup->setName( n ); + formWindow()->unify( popup, n, true ); + popup->setName( n.utf8() ); } - if ( !mainWindow->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) { + if ( !mainWindow->child( 0, "TQMenuBar" ) ) { menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow ); menuBar->setName( "menubar" ); } else { @@ -1762,7 +1762,7 @@ void AddMenuCommand::execute() id = mainWindow->menuBar()->insertItem( name, popup ); else id = mainWindow->menuBar()->insertItem( name, popup, id, index ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } void AddMenuCommand::unexecute() @@ -1770,7 +1770,7 @@ void AddMenuCommand::unexecute() if ( !popup || !menuBar ) return; menuBar->removeItem( id ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } // ------------------------------------------------------------ @@ -1784,13 +1784,13 @@ RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, QDesign void RenameMenuCommand::execute() { menuBar->changeItem( id, newName ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } void RenameMenuCommand::unexecute() { menuBar->changeItem( id, oldName ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } // ------------------------------------------------------------ @@ -1805,14 +1805,14 @@ void MoveMenuCommand::execute() { menuBar->removeItem( menuBar->idAt( fromIdx ) ); menuBar->insertItem( text, popup, -1, toIdx ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } void MoveMenuCommand::unexecute() { menuBar->removeItem( menuBar->idAt( toIdx ) ); menuBar->insertItem( text, popup, -1, fromIdx ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } // ------------------------------------------------------------ @@ -1827,8 +1827,8 @@ void AddToolBarCommand::execute() if ( !toolBar ) { toolBar = new QDesignerToolBar( mainWindow ); TQString n = "Toolbar"; - formWindow()->unify( TQT_TQOBJECT(toolBar), n, true ); - toolBar->setName( n ); + formWindow()->unify( toolBar, n, true ); + toolBar->setName( n.utf8() ); mainWindow->addToolBar( toolBar, n ); } else { toolBar->show(); diff --git a/kommander/editor/command.h b/kommander/editor/command.h index 0e9390be..c093b0af 100644 --- a/kommander/editor/command.h +++ b/kommander/editor/command.h @@ -122,7 +122,7 @@ private: class CommandHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 2f1683aa..0ff745f8 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -216,9 +216,6 @@ <property name="text"> <string>&Disconnect</string> </property> - <property name="accel"> - <string>Alt+D</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -253,9 +250,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -273,9 +267,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string>Alt+C</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -345,9 +336,6 @@ <property name="text"> <string>Co&nnect</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -390,7 +378,7 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addSlotClicked()</slot> @@ -402,17 +390,11 @@ <slot access="protected">signalChanged()</slot> <slot access="protected">Q_SLOTSChanged()</slot> <slot access="protected">cancelClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 2ca7934d..e9ae6738 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -92,10 +92,10 @@ static const char *const ignore_signals[] = { ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* rcvr, FormWindow* fw) : ConnectionEditorBase(parent, 0, true), m_formWindow(fw) { - if (!rcvr || TQT_BASE_OBJECT(rcvr) == TQT_BASE_OBJECT(m_formWindow)) - rcvr = TQT_TQOBJECT(m_formWindow->mainContainer()); - if (!sndr || TQT_BASE_OBJECT(sndr) == TQT_BASE_OBJECT(m_formWindow)) - sndr = TQT_TQOBJECT(m_formWindow->mainContainer()); + if (!rcvr || rcvr == m_formWindow) + rcvr = m_formWindow->mainContainer(); + if (!sndr || sndr == m_formWindow) + sndr = m_formWindow->mainContainer(); m_sender = sndr; m_receiver = rcvr; @@ -105,10 +105,10 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r for (TQPtrDictIterator<TQWidget> it(*m_formWindow->widgets()); it.current(); ++it) { if (it.current()->isVisibleTo(this) && - !it.current()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && + !it.current()->inherits("TQLayoutWidget") && !it.current()->inherits("Spacer") && qstrcmp(it.current()->name(), "central widget") && - !m_formWindow->isMainContainer(TQT_TQOBJECT(it.current())) && + !m_formWindow->isMainContainer(it.current()) && !lst.contains(it.current()->name())) lst << it.current()->name(); } @@ -128,16 +128,16 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r updateDisconnectButton(); // Connections - connect(comboSender, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(senderChanged(const TQString&))); - connect(comboReceiver, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(receiverChanged(const TQString&))); - connect(signalBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(slotBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(connectButton, TQT_SIGNAL(clicked()), TQT_SLOT(connectClicked())); - connect(disconnectButton, TQT_SIGNAL(clicked()), TQT_SLOT(disconnectClicked())); - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(okClicked())); - connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(cancelClicked())); - connect(signalBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); - connect(slotBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); + connect(comboSender, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(senderChanged(const TQString&))); + connect(comboReceiver, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(receiverChanged(const TQString&))); + connect(signalBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(slotBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(connectButton, TQ_SIGNAL(clicked()), TQ_SLOT(connectClicked())); + connect(disconnectButton, TQ_SIGNAL(clicked()), TQ_SLOT(disconnectClicked())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(okClicked())); + connect(cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(cancelClicked())); + connect(signalBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); + connect(slotBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); } ConnectionEditor::~ConnectionEditor() @@ -154,19 +154,19 @@ bool ConnectionEditor::isSignalIgnored(const char *signal) const bool ConnectionEditor::isSlotIgnored(const TQMetaData* md) { - if (md->tqt_mo_access != TQMetaData::Public && (md->tqt_mo_access != TQMetaData::Protected || - !m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)))) + if (md->access != TQMetaData::Public && (md->access != TQMetaData::Protected || + !m_formWindow->isMainContainer(m_receiver))) return true; for (int i = 0; ignore_slots[i]; i++) - if (!qstrcmp(md->tqt_mo_ci_name, ignore_slots[i])) + if (!qstrcmp(md->name, ignore_slots[i])) return true; - if (!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)) && !qstrcmp(md->tqt_mo_ci_name, "close()")) + if (!m_formWindow->isMainContainer(m_receiver) && !qstrcmp(md->name, "close()")) return true; - if (!qstrcmp(md->tqt_mo_ci_name, "setFocus()") && m_receiver->isWidgetType() && - ((TQWidget*)m_receiver)->focusPolicy() == TQ_NoFocus) + if (!qstrcmp(md->name, "setFocus()") && m_receiver->isWidgetType() && + ((TQWidget*)m_receiver)->focusPolicy() == TQWidget::NoFocus) return true; for (int i = 0; i<comboSender->count(); i++) - if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->tqt_mo_ci_name)) + if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->name)) return false; return true; } @@ -175,11 +175,11 @@ TQObject* ConnectionEditor::objectByName(const TQString& s) const { for (TQPtrDictIterator <TQWidget> it(*m_formWindow->widgets()); it.current(); ++it) if (TQString(it.current()->name()) == s) - return TQT_TQOBJECT(it.current()); + return it.current(); for (TQPtrListIterator<TQAction> it(m_formWindow->actionList()); it.current(); ++it) if (TQString(it.current()->name()) == s) - return TQT_TQOBJECT(it.current()); + return it.current(); return 0; } @@ -194,8 +194,8 @@ void ConnectionEditor::connectClicked() return; MetaDataBase::Connection conn; conn.sender = m_sender; - conn.signal = signalBox->currentText(); - conn.slot = slotBox->currentText(); + conn.signal = signalBox->currentText().utf8(); + conn.slot = slotBox->currentText().utf8(); conn.receiver = m_receiver; TDEListViewItem *i = new TDEListViewItem(connectionView, m_sender->name(), conn.signal, m_receiver->name(), conn.slot); @@ -279,8 +279,8 @@ void ConnectionEditor::senderChanged(const TQString& s) for (TQStrListIterator it(p_sigs); it.current(); ++it) if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch)) signalBox->insertItem(it.current()); - if (TQT_BASE_OBJECT(m_sender) == TQT_BASE_OBJECT(m_formWindow->mainContainer())) - signalBox->insertStringList(MetaDataBase::signalList(TQT_TQOBJECT(m_formWindow))); + if (m_sender == m_formWindow->mainContainer()) + signalBox->insertStringList(MetaDataBase::signalList(m_formWindow)); signalBox->sort(); signalBox->setCurrentItem(signalBox->firstItem()); // Update slots - some may (not) have their signal equivalents now. @@ -298,8 +298,8 @@ void ConnectionEditor::receiverChanged(const TQString& s) for (int i = 0; i < n; ++i) { const TQMetaData* md = m_receiver->metaObject()->slot(i, true); - if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch)) - slotBox->insertItem(md->tqt_mo_ci_name); + if (!isSlotIgnored(md) && !slotBox->findItem(md->name, TQt::ExactMatch)) + slotBox->insertItem(md->name); } slotBox->sort(); slotBox->setCurrentItem(slotBox->firstItem()); @@ -336,14 +336,14 @@ void ConnectionEditor::fillConnectionsList() { connectionView->clear(); m_connections.clear(); - m_oldConnections = MetaDataBase::connections(TQT_TQOBJECT(m_formWindow)); + m_oldConnections = MetaDataBase::connections(m_formWindow); if (!m_oldConnections.isEmpty()) { TQValueList <MetaDataBase::Connection>::Iterator it = m_oldConnections.begin(); for (; it != m_oldConnections.end(); ++it) { - if (m_formWindow->isMainContainer(TQT_TQOBJECT((*it).receiver)) && - !MetaDataBase::hasSlot(TQT_TQOBJECT(m_formWindow), MetaDataBase::normalizeSlot((*it).slot).latin1())) + if (m_formWindow->isMainContainer((*it).receiver) && + !MetaDataBase::hasSlot(m_formWindow, MetaDataBase::normalizeSlot((*it).slot).latin1())) continue; MetaDataBase::Connection conn = *it; TDEListViewItem *i = new TDEListViewItem(connectionView, conn.sender->name(), conn.signal, diff --git a/kommander/editor/connectioneditorimpl.h b/kommander/editor/connectioneditorimpl.h index f130e590..8ac3fdd3 100644 --- a/kommander/editor/connectioneditorimpl.h +++ b/kommander/editor/connectioneditorimpl.h @@ -31,7 +31,7 @@ class FormWindow; class ConnectionEditor : public ConnectionEditorBase { - Q_OBJECT + TQ_OBJECT public: ConnectionEditor(TQWidget* parent, TQObject* sender, TQObject* receiver, FormWindow* fw); diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index ac0aad5a..347eacf5 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -13,15 +13,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/kommander/editor/filechooser.h b/kommander/editor/filechooser.h index e87ee91e..f3384d15 100644 --- a/kommander/editor/filechooser.h +++ b/kommander/editor/filechooser.h @@ -8,7 +8,7 @@ class TQPushButton; class FileChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Mode ) diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp index c82e961d..874918d3 100644 --- a/kommander/editor/formfile.cpp +++ b/kommander/editor/formfile.cpp @@ -45,15 +45,15 @@ FormFile::FormFile(const TQString &fn, bool temp) : filename(fn), fileNameTemp(temp), fw(0) { - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } void FormFile::init() { - connect(this, TQT_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileAdded(FormFile*))); - connect(this, TQT_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileRemoved(FormFile*))); + connect(this, TQ_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileAdded(FormFile*))); + connect(this, TQ_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileRemoved(FormFile*))); emit addedFormFile(this); } diff --git a/kommander/editor/formfile.h b/kommander/editor/formfile.h index 35839427..51377e04 100644 --- a/kommander/editor/formfile.h +++ b/kommander/editor/formfile.h @@ -28,7 +28,7 @@ class FormWindow; class FormFile : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui index e6f7fc15..410d80b7 100644 --- a/kommander/editor/formsettings.ui +++ b/kommander/editor/formsettings.ui @@ -326,13 +326,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/formsettingsimpl.cpp b/kommander/editor/formsettingsimpl.cpp index ddfa8345..b65a9718 100644 --- a/kommander/editor/formsettingsimpl.cpp +++ b/kommander/editor/formsettingsimpl.cpp @@ -30,7 +30,7 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) : FormSettingsBase( parent, 0, true ), formwindow( fw ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(fw)); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(fw); editAuthor->setText(info.author); editVersion->setText(info.version); editLicense->setText(info.license); @@ -46,7 +46,7 @@ void FormSettings::okClicked() info.version = editVersion->text(); info.license = editLicense->text(); info.comment = editComment->text(); - MetaDataBase::setMetaInfo(TQT_TQOBJECT(formwindow), info); + MetaDataBase::setMetaInfo(formwindow, info); formwindow->commandHistory()->setModified(true); formwindow->setLayoutDefaultSpacing(spinSpacing->value()); diff --git a/kommander/editor/formsettingsimpl.h b/kommander/editor/formsettingsimpl.h index 1e1075d0..909999bb 100644 --- a/kommander/editor/formsettingsimpl.h +++ b/kommander/editor/formsettingsimpl.h @@ -27,7 +27,7 @@ class FormWindow; class FormSettings : public FormSettingsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 70796291..81489695 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -129,7 +129,7 @@ FormWindow::FormWindow(FormFile *f, TQWidget *parent, const char *name) void FormWindow::init() { - MetaDataBase::addEntry(TQT_TQOBJECT(this)); + MetaDataBase::addEntry(this); ff->setFormWindow(this); propertyWidget = 0; toolFixed = false; @@ -140,34 +140,34 @@ void FormWindow::init() unclippedPainter = 0; widgetPressed = false; drawRubber = false; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer(this, "checkSelectionsTimer"); - connect(checkSelectionsTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(invalidCheckedSelections())); + connect(checkSelectionsTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(invalidCheckedSelections())); updatePropertiesTimer = new TQTimer(this); - connect(updatePropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updatePropertiesTimerDone())); + connect(updatePropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updatePropertiesTimerDone())); showPropertiesTimer = new TQTimer(this); - connect(showPropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(showPropertiesTimerDone())); + connect(showPropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(showPropertiesTimerDone())); selectionChangedTimer = new TQTimer(this); - connect(selectionChangedTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(selectionChangedTimerDone())); + connect(selectionChangedTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(selectionChangedTimerDone())); insertParent = 0; - connect(&commands, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); + connect(&commands, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); propShowBlocked = false; setIcon(PixmapChooser::loadPixmap("form.xpm", PixmapChooser::Mini)); - connect(&commands, TQT_SIGNAL(modificationChanged(bool)), - this, TQT_SLOT(modificationChanged(bool))); + connect(&commands, TQ_SIGNAL(modificationChanged(bool)), + this, TQ_SLOT(modificationChanged(bool))); buffer = 0; - TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this); setMainContainer(w); - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; targetContainer = 0; hadOwnPalette = false; @@ -178,7 +178,7 @@ void FormWindow::init() void FormWindow::setMainWindow(MainWindow *w) { mainwindow = w; - MetaDataBase::addEntry(TQT_TQOBJECT(this)); + MetaDataBase::addEntry(this); initSlots(); } @@ -190,7 +190,7 @@ FormWindow::~FormWindow() { if (MainWindow::self->objectHierarchy()->formWindow() == this) MainWindow::self->objectHierarchy()->setFormWindow(0, 0); - MetaDataBase::clear(TQT_TQOBJECT(this)); + MetaDataBase::clear(this); if (ff) ff->setFormWindow(0); } @@ -295,15 +295,15 @@ void FormWindow::insertWidget() return; bool useSizeHint = !oldRectValid || (currRect.width() < 2 && currRect.height() < 2); - Qt::Orientation orient =Qt::Horizontal; + TQt::Orientation orient =TQt::Horizontal; TQString n = WidgetDatabase::className(currTool); - if (useSizeHint && (n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING)) { + if (useSizeHint && (n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar")) { TQPopupMenu m(mainWindow()); m.insertItem(i18n("&Horizontal")); int ver = m.insertItem(i18n("&Vertical")); int r = m.exec(TQCursor::pos()); if (r == ver) - orient =Qt::Vertical; + orient =TQt::Vertical; } TQWidget *w = WidgetFactory::create(currTool, insertParent, 0, true, &currRect, orient); @@ -312,7 +312,7 @@ void FormWindow::insertWidget() if (!savePixmapInline() && currTool == WidgetDatabase::idFromClassName("PixmapLabel")) ((TQLabel*)w)->setPixmap(PixmapChooser::loadPixmap("image.xpm")); - int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))); + int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)); if (WidgetDatabase::isCustomWidget(id)) { TQWhatsThis::add(w, i18n("<b>A %1 (custom widget)</b> " "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> " @@ -332,8 +332,8 @@ void FormWindow::insertWidget() } TQString s = w->name(); - unify(TQT_TQOBJECT(w), s, true); - w->setName(s); + unify(w, s, true); + w->setName(s.utf8()); insertWidget(w); TQRect r(currRect); if (!oldRectValid || (currRect.width() < 2 && currRect.height() < 2)) @@ -357,12 +357,12 @@ void FormWindow::insertWidget() const TQObjectList l = insertParent->childrenListObject(); TQObjectListIt it(l); TQWidgetList lst; - if (WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) + if (WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) for (; it.current();) { TQObject *o = it.current(); ++it; if (o->isWidgetType() && ((TQWidget*)o)->isVisibleTo(this) && - insertedWidgets.find((TQWidget*)o) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w)) + insertedWidgets.find((TQWidget*)o) && o != w) { TQRect r2(((TQWidget*)o)->pos(), ((TQWidget*)o)->size()); if (r.contains(r2)) @@ -414,12 +414,12 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName) { if (checkName) { TQString s = w->name(); - unify(TQT_TQOBJECT(w), s, true); - w->setName(s); + unify(w, s, true); + w->setName(s.utf8()); } - MetaDataBase::addEntry(TQT_TQOBJECT(w)); - int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))); + MetaDataBase::addEntry(w); + int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)); if (WidgetDatabase::isCustomWidget(id)) { TQWhatsThis::add(w, i18n("<b>A %1 (custom widget)</b> " @@ -446,7 +446,7 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName) void FormWindow::removeWidget(TQWidget *w) { - MetaDataBase::removeEntry(TQT_TQOBJECT(w)); + MetaDataBase::removeEntry(w); widgets()->take(w); } @@ -454,16 +454,16 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w) { switch (currTool) { case POINTER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget")) + if (!isMainContainer(w) && qstrcmp(w->name(), "central widget")) { // press on a child widget raiseChildSelections(w); // raise selections and select widget - selectWidget(TQT_TQOBJECT(w)); + selectWidget(w); // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w))) w = w->parentWidget(); - if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && + if (mainContainer()->inherits("TQMainWindow") && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget) { e->accept(); @@ -500,7 +500,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) switch (currTool) { case POINTER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0) + if (!isMainContainer(w) && qstrcmp(w->name(), "central widget") != 0) { // press on a child widget // if the clicked widget is not in a layout, raise it if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout) @@ -513,7 +513,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) break; } - bool sel = isWidgetSelected(TQT_TQOBJECT(w)); + bool sel = isWidgetSelected(w); if (!((e->state() & ControlButton) || (e->state() & ShiftButton))) { // control not pressed... if (!sel) // ...and widget no selectted: unselect all @@ -524,14 +524,14 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) // unselect its childs if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout) { - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); setPropertyShowingBlocked(true); for (TQObject *o = l->first(); o; o = l->next()) { if (!o->isWidgetType()) continue; if (insertedWidgets.find((TQWidget*)o)) - selectWidget(TQT_TQOBJECT(o), false); + selectWidget(o, false); } setPropertyShowingBlocked(false); delete l; @@ -540,14 +540,14 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) tqApp->processEvents(); } if (((e->state() & ControlButton) || (e->state() & ShiftButton)) && - sel && e->button() == Qt::LeftButton) + sel && e->button() == TQt::LeftButton) { // control pressed and selected, unselect widget - selectWidget(TQT_TQOBJECT(w), false); + selectWidget(w, false); break; } raiseChildSelections(w); // raise selections and select widget - selectWidget(TQT_TQOBJECT(w)); + selectWidget(w); // if widget is laid out, find the first non-laid out super-widget while (w->parentWidget() && @@ -555,7 +555,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) || !insertedWidgets.find(w))) w = w->parentWidget(); - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // left button: store original geometry and more as the widget might start moving widgetPressed = true; widgetGeom = TQRect(w->pos(), w->size()); @@ -563,8 +563,8 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) origPressPos = oldPressPos; checkedSelectionsForMove = false; moving.clear(); - if (w->parentWidget() && !isMainContainer(TQT_TQOBJECT(w->parentWidget())) && - !isCentralWidget(TQT_TQOBJECT(w->parentWidget()))) + if (w->parentWidget() && !isMainContainer(w->parentWidget()) && + !isCentralWidget(w->parentWidget())) { targetContainer = w->parentWidget(); hadOwnPalette = w->parentWidget()->ownPalette(); @@ -574,14 +574,14 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } else { // press was on the formwindow - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // left button: start rubber selection and show formwindow properties drawRubber = true; if (!((e->state() & ControlButton) || (e->state() & ShiftButton))) { clearSelection(false); TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget*)opw); } @@ -591,19 +591,19 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } break; case CONNECT_TOOL: - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) break; saveBackground(); mainWindow()->statusBar()->message(i18n("Connect '%1' with...").arg(w->name())); connectStartPos = mapFromGlobal(e->globalPos()); currentConnectPos = mapFromGlobal(e->globalPos()); - connectSender = TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w))); - connectReceiver = connectableObject(TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w))), connectReceiver); + connectSender = designerWidget(w); + connectReceiver = connectableObject(designerWidget(w), connectReceiver); beginUnclippedPainter(false); drawConnectLine(); break; case ORDER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w))) + if (!isMainContainer(w)) { // press on a child widget orderedWidgets.removeRef(w); orderedWidgets.append(w); @@ -625,18 +625,18 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } break; default: // any insert widget tool - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { insertParent = WidgetFactory::containerOfWidget(mainContainer()); // default parent for new widget is the formwindow - if (!isMainContainer(TQT_TQOBJECT(w))) + if (!isMainContainer(w)) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { - int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(wid))); + int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(wid)); if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) && - !wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + !wid->inherits("TQLayoutWidget") && !wid->inherits("TQSplitter")) { insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it break; @@ -659,7 +659,7 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *w) { switch (currTool) { case ORDER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w))) + if (!isMainContainer(w)) { // press on a child widget orderedWidgets.clear(); orderedWidgets.append(w); @@ -685,7 +685,7 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *w) void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) { - if ((e->state() & Qt::LeftButton) != Qt::LeftButton) + if ((e->state() & TQt::LeftButton) != TQt::LeftButton) return; TQWidget *newReceiver = (TQWidget*)connectReceiver, *oldReceiver = (TQWidget*)connectReceiver, *wid; @@ -724,10 +724,10 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) { // if we actually have to move if (!checkedSelectionsForMove) { // if not checked yet, check if the correct widget are selected... - if (!isWidgetSelected(TQT_TQOBJECT(w))) + if (!isWidgetSelected(w)) { // and unselect others. Only siblings can be moved at the same time setPropertyShowingBlocked(true); - selectWidget(TQT_TQOBJECT(w)); + selectWidget(w); setPropertyShowingBlocked(false); } checkSelectionsForMove(w); @@ -736,7 +736,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) // highlight the possible new parent container TQMapConstIterator<ulong, TQPoint> it = moving.begin(); TQWidget* wa = containerAt(e->globalPos(), ((TQWidget*)it.key())); - if (wa && !isMainContainer(TQT_TQOBJECT(wa)) && !isCentralWidget(TQT_TQOBJECT(wa))) + if (wa && !isMainContainer(wa) && !isCentralWidget(wa)) { wa = WidgetFactory::containerOfWidget(wa); // ok, looks like we moved onto a container @@ -792,17 +792,17 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) restoreConnectionLine(); wid = tqApp->widgetAt(e->globalPos(), true); if (wid) - wid = designerWidget(TQT_TQOBJECT(wid)); - if (wid && (isMainContainer(TQT_TQOBJECT(wid)) || insertedWidgets.find(wid)) && wid->isVisibleTo(this)) + wid = designerWidget(wid); + if (wid && (isMainContainer(wid) || insertedWidgets.find(wid)) && wid->isVisibleTo(this)) newReceiver = wid; - if (newReceiver && (newReceiver->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) + if (newReceiver && (newReceiver->inherits("TQLayoutWidget") || newReceiver->inherits("Spacer"))) newReceiver = (TQWidget*)connectReceiver; - drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver); + drawRecRect = newReceiver != connectReceiver; currentConnectPos = mapFromGlobal(e->globalPos()); - if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver)) - || insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver))) - connectReceiver = connectableObject(TQT_TQOBJECT(newReceiver), TQT_TQOBJECT(connectReceiver)); + if (newReceiver && (isMainContainer(newReceiver) + || insertedWidgets.find(newReceiver)) && !isCentralWidget(newReceiver)) + connectReceiver = connectableObject(newReceiver, connectReceiver); mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").arg(connectSender->name()). arg(connectReceiver->name())); tqApp->processEvents(); @@ -822,7 +822,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) { - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) return; switch (currTool) @@ -881,15 +881,15 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) for (TQMap < ulong, TQPoint >::Iterator it = moving.begin(); it != moving.end(); ++it) { TQWidget *i = (TQWidget *) it.key(); - if (!emitSelChanged && i->inherits(TQBUTTON_OBJECT_NAME_STRING)) + if (!emitSelChanged && i->inherits("TQButton")) { - if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) || - wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup") || + wa->inherits("TQButtonGroup")) emitSelChanged = true; - if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (!wa->inherits("TQButtonGroup")) { - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false); - if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + MetaDataBase::setPropertyChanged(i, "buttonGroupId", false); + if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup")) ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i); } } @@ -897,13 +897,13 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) i->reparent(wa, pos, true); raiseSelection(i); raiseChildSelections(i); - widgetChanged(TQT_TQOBJECT(i)); + widgetChanged(i); mainWindow()->objectHierarchy()->widgetRemoved(i); mainWindow()->objectHierarchy()->widgetInserted(i); } if (emitSelChanged) { - emit showProperties(TQT_TQOBJECT(wa)); + emit showProperties(wa); emit showProperties(propertyWidget); } newParent = wa; @@ -1061,10 +1061,10 @@ void FormWindow::handleKeyPress(TQKeyEvent * e, TQWidget * w) } if (!e->isAccepted()) { - TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); if (!l) return; - if (l->find(TQT_TQOBJECT(w)) != -1) + if (l->find(w) != -1) e->accept(); delete l; } @@ -1086,21 +1086,21 @@ void FormWindow::selectWidget(TQObject * o, bool select) TQWidget *w = (TQWidget *) o; - if (isMainContainer(TQT_TQOBJECT(w))) + if (isMainContainer(w)) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); emitShowProperties(propertyWidget); return; } - if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && + if (mainContainer()->inherits("TQMainWindow") && w == ((TQMainWindow *) mainContainer())->centralWidget()) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); emitShowProperties(propertyWidget); @@ -1113,7 +1113,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) if (select) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); if (!isPropertyShowingBlocked()) @@ -1148,9 +1148,9 @@ void FormWindow::selectWidget(TQObject * o, bool select) s->setWidget(0); TQObject *opw = propertyWidget; if (!usedSelections.isEmpty()) - propertyWidget = TQT_TQOBJECT(TQPtrDictIterator < WidgetSelection > (usedSelections).current()->widget()); + propertyWidget = TQPtrDictIterator < WidgetSelection > (usedSelections).current()->widget(); else - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); if (!isPropertyShowingBlocked()) @@ -1170,7 +1170,7 @@ void FormWindow::updateSelection(TQWidget * w) { WidgetSelection *s = usedSelections.find(w); if (!w->isVisibleTo(this)) - selectWidget(TQT_TQOBJECT(w), false); + selectWidget(w, false); else if (s) s->updateGeometry(); } @@ -1199,7 +1199,7 @@ void FormWindow::clearSelection(bool changePropertyDisplay) if (changePropertyDisplay) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); emitShowProperties(propertyWidget); @@ -1281,7 +1281,7 @@ void FormWindow::endRectDraw() void FormWindow::selectWidgets() { - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1292,7 +1292,7 @@ void FormWindow::selectWidgets() p = mapFromGlobal(p); TQRect r(p, ((TQWidget *) o)->size()); if (r.intersects(currRect) && !r.contains(currRect)) - selectWidget(TQT_TQOBJECT(o)); + selectWidget(o); } } delete l; @@ -1340,7 +1340,7 @@ void FormWindow::redo() void FormWindow::raiseChildSelections(TQWidget * w) { - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); if (!l || !l->first()) { delete l; @@ -1350,7 +1350,7 @@ void FormWindow::raiseChildSelections(TQWidget * w) TQPtrDictIterator < WidgetSelection > it(usedSelections); for (; it.current(); ++it) { - if (l->findRef(TQT_TQOBJECT(it.current()->widget())) != -1) + if (l->findRef(it.current()->widget()) != -1) it.current()->show(); } delete l; @@ -1358,7 +1358,7 @@ void FormWindow::raiseChildSelections(TQWidget * w) void FormWindow::updateChildSelections(TQWidget * w) { - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1374,7 +1374,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w) { checkedSelectionsForMove = true; - TQObjectList *l = w->parentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); + TQObjectList *l = w->parentWidget()->queryList("TQWidget", 0, false, false); moving.clear(); if (l) { @@ -1385,7 +1385,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w) if (it.current()->widget() == mainContainer()) continue; ++it; - if (l->find(TQT_TQOBJECT(sel->widget())) == -1) + if (l->find(sel->widget()) == -1) { if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) sel->setWidget(0); @@ -1411,7 +1411,7 @@ void FormWindow::deleteWidgets() for (; it.current(); ++it) { TQWidget *tb = 0; - if (!(tb = mainWindow()->isAToolBarChild(TQT_TQOBJECT(it.current()->widget())))) + if (!(tb = mainWindow()->isAToolBarChild(it.current()->widget()))) widgets.append(it.current()->widget()); else ((QDesignerToolBar *) tb)->removeWidget(it.current()->widget()); @@ -1500,7 +1500,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry(TQRect & r) { - if (TQT_TQRECT_OBJECT(rect()).contains(r)) + if (rect().contains(r)) return; if (r.left() < rect().left()) r.moveTopLeft(TQPoint(0, r.top())); @@ -1527,7 +1527,7 @@ void FormWindow::focusOutEvent(TQFocusEvent *) if (propertyWidget && !isMainContainer(propertyWidget) && !isWidgetSelected(propertyWidget)) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); } @@ -1552,7 +1552,7 @@ TQWidget *FormWindow::designerWidget(TQObject * o) const if (!o || !o->isWidgetType()) return 0; TQWidget *w = (TQWidget *) o; - while (w && !isMainContainer(TQT_TQOBJECT(w)) && !insertedWidgets[(void *) w] || isCentralWidget(TQT_TQOBJECT(w))) + while (w && !isMainContainer(w) && !insertedWidgets[(void *) w] || isCentralWidget(w)) w = (TQWidget *) w->parent(); return w; } @@ -1652,7 +1652,7 @@ void FormWindow::currentToolChanged() { case POINTER_TOOL: if (propertyWidget && !isMainContainer(propertyWidget) && !isWidgetSelected(propertyWidget)) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); restoreCursors(this, this); break; case ORDER_TOOL: @@ -1662,7 +1662,7 @@ void FormWindow::currentToolChanged() orderedWidgets.clear(); showOrderIndicators(); if (mainWindow()->formWindow() == this) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); setCursorToAll(ArrowCursor, this); } break; @@ -1670,14 +1670,14 @@ void FormWindow::currentToolChanged() mainWindow()->statusBar()->message(i18n("Drag a line to create a connection...")); setCursorToAll(CrossCursor, this); if (mainWindow()->formWindow() == this) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); break; default: mainWindow()->statusBar()->message(i18n("Click on the form to insert a %1..."). arg(WidgetDatabase::toolTip(currTool).lower())); setCursorToAll(CrossCursor, this); if (mainWindow()->formWindow() == this) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); break; } } @@ -1686,7 +1686,7 @@ void FormWindow::showOrderIndicators() { hideOrderIndicators(); orderIndicators.setAutoDelete(true); - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); stackedWidgets = MetaDataBase::tabOrder(this); if (l) { @@ -1695,7 +1695,7 @@ void FormWindow::showOrderIndicators() { TQWidget *w = (TQWidget *) o; if (w->isVisibleTo(w->parentWidget()) && - insertedWidgets[(void *) w] && w->focusPolicy() != TQ_NoFocus) + insertedWidgets[(void *) w] && w->focusPolicy() != TQWidget::NoFocus) { OrderIndicator *ind = new OrderIndicator(order++, w, this); orderIndicators.append(ind); @@ -1743,7 +1743,7 @@ bool FormWindow::checkCustomWidgets() { if (it.current()->isA("CustomWidget")) { - TQString className = WidgetFactory::classNameOf(TQT_TQOBJECT(it.current())); + TQString className = WidgetFactory::classNameOf(it.current()); if (!MetaDataBase::hasCustomWidget(className)) missingCustomWidgets << className; } @@ -1811,7 +1811,7 @@ static void find_accel(const TQString & txt, TQMap < TQChar, TQWidgetList > &acc void FormWindow::checkAccels() { TQMap < TQChar, TQWidgetList > accels; - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1849,7 +1849,7 @@ void FormWindow::checkAccels() { clearSelection(false); for (wid = (*it).first(); wid; wid = (*it).next()) - selectWidget(TQT_TQOBJECT(wid), true); + selectWidget(wid, true); } return; } @@ -1883,14 +1883,14 @@ void FormWindow::selectAll() { checkedSelectionsForMove = false; blockSignals(true); - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); if (l) { for (TQObject * o = l->first(); o; o = l->next()) { if (((TQWidget *) o)->isVisibleTo(this) && insertedWidgets[(void *) o]) { - selectWidget(TQT_TQOBJECT(o)); + selectWidget(o); } } delete l; @@ -2036,12 +2036,12 @@ void FormWindow::breakLayout(TQWidget * w) if (!w || w == this) break; if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout && - WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) + WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { Command *cmd = breakLayoutCommand(w); if (cmd) commands.insert(0, cmd); - if (!w->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + if (!w->inherits("TQLayoutWidget") && !w->inherits("TQSplitter")) break; } w = w->parentWidget(); @@ -2066,7 +2066,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand(TQWidget * w) for (TQObject * o = l.first(); o; o = l.next()) { if (o->isWidgetType() && - !mainWindow()->isAToolBarChild(TQT_TQOBJECT(o)) && + !mainWindow()->isAToolBarChild(o) && ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o)) widgets.append((TQWidget *) o); } @@ -2093,7 +2093,7 @@ bool FormWindow::hasInsertedChildren(TQWidget *w) const w = WidgetFactory::containerOfWidget(w); if (!w) return false; - TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); if (!l || !l->first()) { delete l; @@ -2116,7 +2116,7 @@ bool FormWindow::allowMove(TQWidget *w) w = w->parentWidget(); while (w) { - if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.find(w)) && WidgetFactory::layoutType(w) == + if ((isMainContainer(w) || insertedWidgets.find(w)) && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) return true; w = w->parentWidget(); @@ -2274,7 +2274,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) int num = 1; TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current();) - if (TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) && !qstrcmp(it.current()->name(), s.latin1())) + if (it.current() != w && !qstrcmp(it.current()->name(), s.latin1())) { found = true; if (!changeIt) @@ -2291,7 +2291,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) TQAction *a = 0; for (a = actions.first(); a; a = actions.next()) { - TQObjectList *l = a->queryList(TQACTION_OBJECT_NAME_STRING); + TQObjectList *l = a->queryList("TQAction"); al.append(a); for (TQObject *ao = l->first(); ao; ao = l->next()) al.append((TQAction*)ao); @@ -2310,11 +2310,11 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) } } - if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (mainContainer()->inherits("TQMainWindow")) { if (!found) { - TQObjectList *l = mainContainer()->queryList(TQDOCKWINDOW_OBJECT_NAME_STRING, 0, true); + TQObjectList *l = mainContainer()->queryList("TQDockWindow", 0, true); for (TQObject *o = l->first(); o; o = l->next()) if (o != w && !qstrcmp(o->name(), s.latin1())) { @@ -2351,7 +2351,7 @@ bool FormWindow::isCustomWidgetUsed(MetaDataBase::CustomWidget *w) { TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current(); ++it) - if (it.current()->isA("CustomWidget") && !qstrcmp(WidgetFactory::classNameOf(TQT_TQOBJECT(it.current())), + if (it.current()->isA("CustomWidget") && !qstrcmp(WidgetFactory::classNameOf(it.current()), w->className.utf8())) return true; return false; @@ -2361,7 +2361,7 @@ bool FormWindow::isDatabaseWidgetUsed() const { #ifndef TQT_NO_SQL TQStringList dbClasses; - dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here + dbClasses << "TQDataTable"; // add more here TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current(); ++it) { @@ -2388,7 +2388,7 @@ bool FormWindow::isDatabaseAware() const void FormWindow::visibilityChanged() { if (currTool != ORDER_TOOL) - emitUpdateProperties(TQT_TQOBJECT(currentWidget())); + emitUpdateProperties(currentWidget()); else { updateOrderIndicators(); @@ -2407,7 +2407,7 @@ TQPoint FormWindow::mapToForm(const TQWidget* w, const TQPoint& pos) const { TQPoint p = pos; const TQWidget* i = w; - while (i && !i->isTopLevel() && !isMainContainer(TQT_TQOBJECT(const_cast<TQWidget*>(i)))) + while (i && !i->isTopLevel() && !isMainContainer(const_cast<TQWidget*>(i))) { p = i->mapToParent(p); i = i->parentWidget(); @@ -2444,30 +2444,30 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(pos))) + if (rect().contains(mapFromGlobal(pos))) { container = mainContainer(); depth = widgetDepth(container); } for (; it.current(); ++it) { - if (it.current()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING)) + if (it.current()->inherits("TQLayoutWidget")) continue; - if (it.current()->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + if (it.current()->inherits("TQSplitter")) continue; if (!it.current()->isVisibleTo(this)) continue; if (selected.find(it.current()) != -1) continue; if (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName( - WidgetFactory::classNameOf(TQT_TQOBJECT(it.current())))) && it.current() != mainContainer()) + WidgetFactory::classNameOf(it.current()))) && it.current() != mainContainer()) continue; // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while (w && !w->isTopLevel()) { - if (!TQT_TQRECT_OBJECT(w->rect()).contains((w->mapFromGlobal(pos)))) + if (!w->rect().contains((w->mapFromGlobal(pos)))) break; w = w->parentWidget(); } @@ -2475,8 +2475,8 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) int wd = widgetDepth(it.current()); if (wd == depth && container && (it.current()->parentWidget()-> - childrenListObject()).find(TQT_TQOBJECT(it.current())) > - (container->parentWidget()->childrenListObject()).find(TQT_TQOBJECT(container))) + childrenListObject()).find(it.current()) > + (container->parentWidget()->childrenListObject()).find(container)) wd++; if (wd > depth && !isChildOf(it.current(), notParentOf)) { depth = wd; @@ -2489,7 +2489,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) bool FormWindow::isMainContainer(TQObject *w) const { - return w && w->isWidgetType() && (TQT_BASE_OBJECT(w) == this || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(mainContainer())); + return w && w->isWidgetType() && (w == this || w == mainContainer()); } void FormWindow::setMainContainer(TQWidget *w) @@ -2497,7 +2497,7 @@ void FormWindow::setMainContainer(TQWidget *w) bool resetPropertyWidget = isMainContainer(propertyWidget); if (mContainer) insertedWidgets.remove(mContainer); - if (TQT_BASE_OBJECT(propertyWidget) == TQT_BASE_OBJECT(mContainer)) + if (propertyWidget == mContainer) propertyWidget = 0; delete mContainer; mContainer = w; @@ -2508,7 +2508,7 @@ void FormWindow::setMainContainer(TQWidget *w) if (resetPropertyWidget) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mContainer); + propertyWidget = mContainer; if (opw && opw->isWidgetType()) repaintSelection((TQWidget*)opw); } @@ -2546,7 +2546,7 @@ TQAction *FormWindow::findAction(const TQString &name) { if (TQString(a->name()) == name) return a; - TQAction *ac = (TQAction*)a->child(name.latin1(), TQACTION_OBJECT_NAME_STRING); + TQAction *ac = (TQAction*)a->child(name.latin1(), "TQAction"); if (ac) return ac; } @@ -2555,7 +2555,7 @@ TQAction *FormWindow::findAction(const TQString &name) void FormWindow::killAccels(TQObject *top) { - TQObjectList *l = top->queryList(TQACCEL_OBJECT_NAME_STRING); + TQObjectList *l = top->queryList("TQAccel"); if (!l) return; for (TQObject *o = l->first(); o; o = l->next()) @@ -2565,9 +2565,9 @@ void FormWindow::killAccels(TQObject *top) bool FormWindow::isCentralWidget(TQObject *w) const { - if (!mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (!mainContainer()->inherits("TQMainWindow")) return false; - return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(((TQMainWindow*)mainContainer())->centralWidget()); + return w == ((TQMainWindow*)mainContainer())->centralWidget(); } TQObject *FormWindow::connectableObject(TQObject *w, TQObject *) @@ -2604,6 +2604,6 @@ void FormWindow::setFormFile(FormFile *f) { ff = f; if (ff) - connect(this, TQT_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQT_SLOT(formWindowChangedSomehow())); + connect(this, TQ_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQ_SLOT(formWindowChangedSomehow())); } #include "formwindow.moc" diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h index cb9a5c1c..8f834b15 100644 --- a/kommander/editor/formwindow.h +++ b/kommander/editor/formwindow.h @@ -57,7 +57,7 @@ class OrderIndicator; class FormWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index 005d2261..707e9921 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -544,9 +544,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -561,9 +558,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -696,27 +690,13 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ktextbrowser.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index 37ae23ab..88521a97 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -49,11 +49,11 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict<TQWidget>& a_w copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", TDEIcon::Toolbar)); groupComboBox->insertStringList(SpecialInformation::groups()); - connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(functionListBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(functionChanged(int))); - connect(copyButton, TQT_SIGNAL(clicked()), TQT_SLOT(copyText())); - connect(clearButton, TQT_SIGNAL(clicked()), insertedText, TQT_SLOT(clear())); + connect(groupComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(functionListBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(functionChanged(int))); + connect(copyButton, TQ_SIGNAL(clicked()), TQ_SLOT(copyText())); + connect(clearButton, TQ_SIGNAL(clicked()), insertedText, TQ_SLOT(clear())); // build widget name list for (TQDictIterator<TQWidget> It(m_widgetList); It.current(); ++It) @@ -279,7 +279,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (type == TQSTRING_OBJECT_NAME_STRING) + if (type == "TQString") { quotes[i]->setShown(i < argsCount); } @@ -336,7 +336,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) + if (m_function.argumentType(i) == "TQString") { quotes[i]->setShown(i < argsCount); } @@ -362,8 +362,8 @@ TQString FunctionsDialog::params() TQString s = edits[i]->text(); if (!s.isEmpty() || i < m_function.minArg()) { - if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) - || (slotsShown && labels[i]->text().startsWith(TQSTRING_OBJECT_NAME_STRING)) ) ) + if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == "TQString") + || (slotsShown && labels[i]->text().startsWith("TQString")) ) ) s = '"' + s + '"'; pars.append(s); } diff --git a/kommander/editor/functionsimpl.h b/kommander/editor/functionsimpl.h index 525a5081..e59ec6c2 100644 --- a/kommander/editor/functionsimpl.h +++ b/kommander/editor/functionsimpl.h @@ -25,7 +25,7 @@ class FunctionsDialog : public FunctionsDialogBase { - Q_OBJECT + TQ_OBJECT public: FunctionsDialog(TQWidget*, const TQDict<TQWidget>&, bool m_useInternalParser, char* = 0, bool = true); diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index df8beeb5..b6113d37 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -193,18 +193,18 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = true; setColumnWidthMode( 1, Manual ); @@ -250,21 +250,21 @@ void HierarchyList::objectClicked( TQListViewItem *i ) if ( formWindow == w ) { if ( deselect ) formWindow->clearSelection( false ); - formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) ); + formWindow->emitShowProperties( formWindow ); return; } if ( !formWindow->widgets()->find( w ) ) { - if ( w->parent() && w->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + if ( w->parent() && w->parent()->inherits( "TQWidgetStack" ) && w->parent()->parent() && - ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - w->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) { - if ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + ( w->parent()->parent()->inherits( "TQTabWidget" ) || + w->parent()->parent()->inherits( "TQWizard" ) ) ) { + if ( w->parent()->parent()->inherits( "TQTabWidget" ) ) ( (TQTabWidget*)w->parent()->parent() )->showPage( w ); else ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); w = (TQWidget*)w->parent()->parent(); - formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); + formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else { return; } @@ -273,7 +273,7 @@ void HierarchyList::objectClicked( TQListViewItem *i ) if ( deselect ) formWindow->clearSelection( false ); if ( w->isVisibleTo( formWindow ) ) - formWindow->selectWidget( TQT_TQOBJECT(w), true ); + formWindow->selectWidget( w, true ); } TQWidget *HierarchyList::findWidget( TQListViewItem *i ) @@ -345,7 +345,7 @@ void HierarchyList::setup() } #endif if ( w ) - insertObject( TQT_TQOBJECT(w), 0 ); + insertObject( w, 0 ); } void HierarchyList::setOpen( TQListViewItem *i, bool b ) @@ -356,8 +356,8 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b ) void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { bool fakeMainWindow = false; - if ( o && o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { - TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + if ( o && o->inherits( "TQMainWindow" ) ) { + TQObject *cw = ( (TQMainWindow*)o )->centralWidget(); if ( cw ) { o = cw; fakeMainWindow = true; @@ -365,7 +365,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) } TQListViewItem *item = 0; TQString className = WidgetFactory::classNameOf( o ); - if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) { + if ( o->inherits( "TQLayoutWidget" ) ) { switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) { case WidgetFactory::HBox: className = "HBox"; @@ -387,23 +387,23 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) #endif TQString name = o->name(); - if ( o->parent() && o->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + if ( o->parent() && o->parent()->inherits( "TQWidgetStack" ) && o->parent()->parent() ) { - if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( o->parent()->parent()->inherits( "TQTabWidget" ) ) name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); - else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + else if ( o->parent()->parent()->inherits( "TQWizard" ) ) name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } TQToolBox *tb; if ( o->parent() && o->parent()->parent() && - (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) + (tb = ::tqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); if ( fakeMainWindow ) { name = o->parent()->name(); - className = TQMAINWINDOW_OBJECT_NAME_STRING; + className = "TQMainWindow"; } if ( !parent ) @@ -412,7 +412,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) item = new HierarchyItem( HierarchyItem::Widget, parent, name, className, dbInfo ); if ( !parent ) item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) ); - else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) + else if ( o->inherits( "TQLayoutWidget") ) item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) ); else item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ). @@ -429,16 +429,16 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( it.current()->parent() && - ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && - it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { + ( it.current()->parent()->inherits( "TQTabWidget" ) || + it.current()->parent()->inherits( "TQWizard" ) ) && + it.current()->inherits( "TQWidgetStack" ) ) { TQObject *obj = it.current(); - TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false ); + TQObjectList *l2 = obj->queryList( "TQWidget", 0, true, false ); QDesignerTabWidget *tw = 0; QDesignerWizard *dw = 0; - if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( it.current()->parent()->inherits( "TQTabWidget" ) ) tw = (QDesignerTabWidget*)it.current()->parent(); - if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( it.current()->parent()->inherits( "TQWizard" ) ) dw = (QDesignerWizard*)it.current()->parent(); TQWidgetStack *stack = (TQWidgetStack*)obj; for ( obj = l2->last(); obj; obj = l2->prev() ) { @@ -449,12 +449,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) insertObject( obj, item ); } delete l2; - } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) { - if ( !::tqqt_cast<TQScrollView*>(it.current()) ) + } else if ( ::tqt_cast<TQToolBox*>(it.current()->parent()) ) { + if ( !::tqt_cast<TQScrollView*>(it.current()) ) continue; TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) - insertObject( TQT_TQOBJECT(tb->item( i )), item ); + insertObject( tb->item( i ), item ); } continue; } @@ -495,15 +495,15 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) return; if ( w->isVisibleTo( formWindow ) ) { - if ( !w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + if ( !w->inherits( "TQTabWidget" ) && !w->inherits( "TQWizard" ) ) { if ( !normalMenu ) normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this ); normalMenu->popup( p ); } else { if ( !tabWidgetMenu ) tabWidgetMenu = - formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQT_SLOT( addTabPage() ), - TQT_SLOT( removeTabPage() ) ); + formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } @@ -514,13 +514,13 @@ void HierarchyList::addTabPage() TQWidget *w = current(); if ( !w ) return; - if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQTabWidget" ) ) { TQTabWidget *tw = (TQTabWidget*)w; AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( tw->name() ), formWindow, tw, "Tab" ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQWizard" ) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow, wiz, "Page" ); @@ -534,7 +534,7 @@ void HierarchyList::removeTabPage() TQWidget *w = current(); if ( !w ) return; - if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQTabWidget" ) ) { TQTabWidget *tw = (TQTabWidget*)w; if ( tw->currentPage() ) { QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; @@ -544,7 +544,7 @@ void HierarchyList::removeTabPage() formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } - } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQWizard" ) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); if ( wiz->currentPage() ) { QDesignerWizard *dw = (QDesignerWizard*)wiz; @@ -677,7 +677,7 @@ void HierarchyView::widgetsRemoved( const TQWidgetList & ) void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & ) { TQWidget *w2 = w; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w2 = ( (TQMainWindow*)w )->centralWidget(); listview->changeNameOf( w2, w->name() ); } diff --git a/kommander/editor/hierarchyview.h b/kommander/editor/hierarchyview.h index 78fbe292..1ae2b866 100644 --- a/kommander/editor/hierarchyview.h +++ b/kommander/editor/hierarchyview.h @@ -79,7 +79,7 @@ private: class HierarchyList:public TQListView { - Q_OBJECT + TQ_OBJECT public: HierarchyList(TQWidget * parent, FormWindow * fw, bool doConnects = TRUE); @@ -123,7 +123,7 @@ protected: class HierarchyView : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp index 2fe8eed4..97c7514a 100644 --- a/kommander/editor/iconvieweditorimpl.cpp +++ b/kommander/editor/iconvieweditorimpl.cpp @@ -34,7 +34,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/iconvieweditorimpl.h b/kommander/editor/iconvieweditorimpl.h index b25c59cc..d1fc8ec9 100644 --- a/kommander/editor/iconvieweditorimpl.h +++ b/kommander/editor/iconvieweditorimpl.h @@ -27,7 +27,7 @@ class FormWindow; class IconViewEditor : public IconViewEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/kmdr-editor.desktop b/kommander/editor/kmdr-editor.desktop index 00362dfa..4ca38a13 100644 --- a/kommander/editor/kmdr-editor.desktop +++ b/kommander/editor/kmdr-editor.desktop @@ -1,129 +1,13 @@ [Desktop Entry] -GenericName=Dynamic Dialog Editor -GenericName[bg]=Редактор за диалогови прозорци -GenericName[ca]=Editor de diàlegs dinàmics -GenericName[cs]=Editor dynamických dialogů -GenericName[da]=Dynamisk dialog-editor -GenericName[de]=Editor für dynamische Dialoge -GenericName[el]=Επεξεργαστής δυναμικών διαλόγων -GenericName[en_GB]=Dynamic Dialogue Editor -GenericName[es]=Editor de cuadros de diálogo dinámicos -GenericName[et]=Dünaamiliste dialoogide redaktor -GenericName[eu]=Elkarrizketa editore dinamikoa -GenericName[fa]=ویرایشگر محاورۀ پویا -GenericName[fi]=Dynaamisten dialogien editori -GenericName[fr]=Éditeur dynamique de boîtes de dialogue -GenericName[gl]=Editor de diálogos dinámicos -GenericName[hi]=गतिशील संवाद संपादक -GenericName[hu]=Párbeszédablak-szerkesztő -GenericName[is]=Dynamic Dialog ritillinn -GenericName[it]=Editor per le maschere dinamiche -GenericName[ja]=動的ダイアログエディタ -GenericName[ka]=დინამიურ დიალოგთა რედაქტორი -GenericName[lt]=Dinaminė dialogų rengyklė -GenericName[ms]=Penyunting Dialog Dinamik -GenericName[nds]=Editor för dünaamsch Dialogen -GenericName[ne]=गतिशील संवाद सम्पादक -GenericName[nl]=Dynamische dialoog-editor -GenericName[pl]=Edytor do dynamicznych okien dialogowych -GenericName[pt]=Editor de Diálogos Dinâmicos -GenericName[pt_BR]=Editor de Diálogo Dinâmico -GenericName[ru]=Редактор диалогов -GenericName[sk]=Dynamický editor dialógov -GenericName[sl]=Urejevalnik dinamičnih pogovornih oken -GenericName[sr]=Уређивач динамичких дијалога -GenericName[sr@Latn]=Uređivač dinamičkih dijaloga -GenericName[sv]=Editor för dynamiska dialogrutor -GenericName[ta]=நிகழும் உரையாடல் திருத்தி -GenericName[tg]=Муҳаррири диалоги динамика -GenericName[tr]=Dinamik Diyalog Düzenleyicisi -GenericName[uk]=Динамічний редактор вікон -GenericName[zh_CN]=动态对话框编辑器 -GenericName[zh_HK]=動態對話盒編輯器 -GenericName[zh_TW]=動態對話盒編輯器 Name=Kommander Editor -Name[br]=Aozer Kommander -Name[ca]=Editor Kommander -Name[cs]=Editor Kommanderu -Name[da]=Kommander-editor -Name[de]=Kommander-Editor -Name[el]=Επεξεργαστής Kommander -Name[et]=Redaktor Kommander -Name[eu]=Kommander editorea -Name[fa]=ویرایشگر Kommander -Name[fi]=Komentoeditori -Name[fr]=Éditeur Kommander -Name[ga]=Eagarthóir Kommander -Name[hi]=कमांडर संपादक -Name[hu]=Kommander -Name[is]=Kommander ritillinn -Name[it]=Editor Kommander -Name[ja]=Kommander エディタ -Name[lt]=Kommander rengyklė -Name[ms]=Penyunting Kommander -Name[nds]=Kommander-Editor -Name[ne]=आदेश सम्पादक -Name[pa]=Kommander ਸੰਪਾਦਕ -Name[pl]=Edytor Kommander -Name[pt]=Editor do Kommander -Name[pt_BR]=Editor Kommander -Name[ru]=Редактор Kommander -Name[sl]=Urejevalnik Kommander -Name[sr]=Kommander уређивач -Name[sr@Latn]=Kommander uređivač -Name[sv]=Kommander editor -Name[ta]=Kகட்டளைத் திருத்தி -Name[tg]=Муҳаррири Kommander -Name[tr]=Kommander Düzenleyici -Name[uk]=Редактор Kommander -Name[zh_CN]=Kommander 编辑器 -Name[zh_HK]=Kommander 編輯器 -Name[zh_TW]=Kommander 編輯器 + +GenericName=Dynamic Dialog Editor + +Comment=Dynamic Dialog Editor + +Type=Application Exec=kmdr-editor %F Icon=kommander -Type=Application -Comment=Dynamic Dialog Editor -Comment[bg]=Редактор за диалогови прозорци -Comment[ca]=Editor de diàlegs dinàmics -Comment[cs]=Editor dynamických dialogů -Comment[da]=Dynamisk dialog-editor -Comment[de]=Editor für dynamische Dialoge -Comment[el]=Επεξεργαστής δυναμικών διαλόγων -Comment[en_GB]=Dynamic Dialogue Editor -Comment[es]=Editor de cuadros de diálogo dinámicos -Comment[et]=Dünaamiliste dialoogide redaktor -Comment[eu]=Elkarrizketa editore dinamikoa -Comment[fa]=ویرایشگر محاورۀ پویا -Comment[fi]=Dynaamisten dialogien editori -Comment[fr]=Éditeur dynamique de boîtes de dialogue -Comment[gl]=Editor de diálogos dinámicos -Comment[hi]=गतिशील संवाद संपादक -Comment[hu]=Párbeszédablak-szerkesztő -Comment[is]=Dynamic Dialog ritillinn -Comment[it]=Editor per le maschere dinamiche -Comment[ja]=動的ダイアログエディタ -Comment[ka]=დინამიურ დიალოგთა რედაქტორი -Comment[lt]=Dinaminė dialogų rengyklė -Comment[ms]=Penyunting Dialog Dinamik -Comment[nds]=Editor för dünaamsch Dialogen -Comment[ne]=गतिशील संवाद सम्पादक -Comment[nl]=Dynamische dialoog-editor -Comment[pl]=Edytor do dynamicznych okien dialogowych -Comment[pt]=Editor de diálogos dinâmicos -Comment[pt_BR]=Editor de Diálogo Dinâmico -Comment[ru]=Динамический редактор диалогов -Comment[sk]=Dynamický editor dialógov -Comment[sl]=Urejevalnik dinamičnih pogovornih oken -Comment[sr]=Уређивач динамичких дијалога -Comment[sr@Latn]=Uređivač dinamičkih dijaloga -Comment[sv]=Editor för dynamiska dialogrutor -Comment[ta]=நிகழும் உரையாடல் திருத்தி -Comment[tg]=Муҳаррири диалоги динамика -Comment[tr]=Dinamik Diyalog Düzenleyicisi -Comment[uk]=Динамічний редактор вікон -Comment[zh_CN]=动态对话框编辑器 -Comment[zh_HK]=動態對話盒編輯器 -Comment[zh_TW]=動態對話盒編輯器 MimeType=application/x-kommander; X-DocPath=kommander/index.html Categories=Qt;TDE;Development; diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 8c35f8e6..84e4dabb 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -116,7 +116,7 @@ void Layout::setup() // we leave here. if ( !lastList || ( lastList->count() < 2 && ( !layoutBase || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ) ) ) ) { widgets.clear(); @@ -134,8 +134,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); @@ -159,13 +159,13 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needReparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); + needReparent = needMove || layoutBase->inherits( "TQLayoutWidget" ) || layoutBase->inherits( "TQSplitter" ); if ( !layoutBase ) { if ( !useSplitter ) - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ), WidgetFactory::containerOfWidget( parent ) ); else - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); @@ -187,11 +187,11 @@ void Layout::finishLayout( bool needMove, TQLayout *layout ) layoutBase->show(); layout->activate(); formWindow->insertWidget( layoutBase ); - formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); + formWindow->selectWidget( layoutBase ); TQString n = layoutBase->name(); if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); - layoutBase->setName( n ); + layoutBase->setName( n.utf8() ); } } @@ -206,20 +206,20 @@ void Layout::undoLayout() it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } - formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false ); + formWindow->selectWidget( layoutBase, false ); WidgetFactory::deleteLayout( layoutBase ); - if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( parent != layoutBase && !layoutBase->inherits( "TQMainWindow" ) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); - layoutBase->setName( n ); + layoutBase->setName( n.utf8() ); } else { layoutBase->setGeometry( oldGeometry ); } if ( widgets.first() ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } void Layout::breakLayout() @@ -231,11 +231,11 @@ void Layout::breakLayout() rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || - qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && + bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || + qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); - bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; + bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent ) @@ -254,14 +254,14 @@ void Layout::breakLayout() parent = layoutBase->parentWidget(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); - layoutBase->setName( n ); + layoutBase->setName( n.utf8() ); } else { parent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } class HorizontalLayoutList : public TQWidgetList @@ -306,21 +306,21 @@ void HorizontalLayout::doLayout() TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); + if ( layoutBase->inherits( "TQSplitter" ) ) + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Horizontal ); finishLayout( needMove, layout ); } @@ -370,21 +370,21 @@ void VerticalLayout::doLayout() TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); + if ( layoutBase->inherits( "TQSplitter" ) ) + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Vertical ); finishLayout( needMove, layout ); } @@ -742,14 +742,14 @@ void GridLayout::doLayout() int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( rs * cs == 1 ) { layout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); } else { layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); } - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { @@ -803,7 +803,7 @@ void GridLayout::buildGrid() Spacer::Spacer( TQWidget *parent, const char *name ) : TQWidget( parent, name, WMouseNoMask ), - orient(Qt::Vertical ), interactive(true), sh( TQSize(20,20) ) + orient(TQt::Vertical ), interactive(true), sh( TQSize(20,20) ) { setSizeType( Expanding ); setAutoMask( true ); @@ -814,7 +814,7 @@ void Spacer::paintEvent( TQPaintEvent * ) TQPainter p( this ); p.setPen( TQt::blue ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int dist = 3; const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; @@ -853,7 +853,7 @@ void Spacer::resizeEvent( TQResizeEvent* e) void Spacer::updateMask() { TQRegion r( rect() ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; r = r.subtract( TQRect(1, 0, width() - 2, base - amplitude ) ); @@ -870,7 +870,7 @@ void Spacer::updateMask() void Spacer::setSizeType( SizeType t ) { TQSizePolicy sizeP; - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t ); else sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum ); @@ -880,14 +880,14 @@ void Spacer::setSizeType( SizeType t ) Spacer::SizeType Spacer::sizeType() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return (SizeType)sizePolicy().verData(); return (SizeType)sizePolicy().horData(); } int Spacer::alignment() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return AlignHCenter; return AlignVCenter; } @@ -901,7 +901,7 @@ TQSize Spacer::sizeHint() const { TQSize s = sh.expandedTo( TQSize(0,0) ); if ( sizeType() == Expanding ) - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) s.rheight() = 0; else s.rwidth() = 0; @@ -917,12 +917,12 @@ void Spacer::setSizeHint( const TQSize &s ) updateGeometry(); } -Qt::Orientation Spacer::orientation() const +TQt::Orientation Spacer::orientation() const { return orient; } -void Spacer::setOrientation( Qt::Orientation o ) +void Spacer::setOrientation( TQt::Orientation o ) { if ( orient == o ) return; diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h index ee266127..a630b601 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -33,7 +33,7 @@ class TQPaintEvent; class Layout : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -111,7 +111,7 @@ protected: class Spacer : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_OVERRIDE( TQCString name ) @@ -156,7 +156,7 @@ protected: class QDesignerGridLayout : public TQGridLayout { - Q_OBJECT + TQ_OBJECT public: QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp index 047bc4f8..32c94d95 100644 --- a/kommander/editor/listboxeditorimpl.cpp +++ b/kommander/editor/listboxeditorimpl.cpp @@ -35,7 +35,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, true ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/listboxeditorimpl.h b/kommander/editor/listboxeditorimpl.h index ec2376c0..677165ad 100644 --- a/kommander/editor/listboxeditorimpl.h +++ b/kommander/editor/listboxeditorimpl.h @@ -28,7 +28,7 @@ class FormWindow; class ListBoxEditor : public ListBoxEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui index fd37c1f8..636cfb86 100644 --- a/kommander/editor/listeditor.ui +++ b/kommander/editor/listeditor.ui @@ -133,7 +133,7 @@ <forwards> <forward>class TQStringList;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>setList( const TQStringList & l )</slot> <slot>addItem()</slot> @@ -141,7 +141,7 @@ <slot>removeItems()</slot> <slot returnType="TQStringList">items()</slot> <slot>renameItem()</slot> -</Q_SLOTS> +</slots> <pixmapinproject/> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp index 83422997..8021d242 100644 --- a/kommander/editor/listvieweditorimpl.cpp +++ b/kommander/editor/listvieweditorimpl.cpp @@ -40,7 +40,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( false ); itemChoosePixmap->setEnabled( false ); itemDeletePixmap->setEnabled( false ); diff --git a/kommander/editor/listvieweditorimpl.h b/kommander/editor/listvieweditorimpl.h index 15aecaf8..a64e7883 100644 --- a/kommander/editor/listvieweditorimpl.h +++ b/kommander/editor/listvieweditorimpl.h @@ -31,7 +31,7 @@ class FormWindow; class ListViewEditor : public ListViewEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 0abb7de2..fd5059ec 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -18,6 +18,14 @@ **********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef TQTDOCDIR +#define TQTDOCDIR "/usr/share/tqt3/doc/html" +#endif + #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> @@ -118,10 +126,10 @@ static TQString textNoAccel(const TQString& text) MainWindow::MainWindow(bool asClient) : KParts::DockMainWindow(0, "mainwindow", WType_TopLevel | WDestructiveClose | WGroupLeader), grd(10, 10), sGrid(true), snGrid(true), restoreConfig(true), splashScreen(true), - docPath("$TQTDIR/doc/html"), client(asClient), databaseAutoEdit(false), previewing(false) + docPath(TQTDOCDIR), client(asClient), databaseAutoEdit(false), previewing(false) { m_partManager = new KParts::PartManager(this); - //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); + //connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); init_colors(); inDebugMode = true; //debugging kommander @@ -169,7 +177,7 @@ MainWindow::MainWindow(bool asClient) as -= TQSize(30, 30); resize(TQSize(1200, 1000).boundedTo(as)); - connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); + connect(kapp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); clipboardChanged(); layoutChilds = false; layoutSelected = false; @@ -179,24 +187,24 @@ MainWindow::MainWindow(bool asClient) readConfig(); // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties) - TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQWIDGET_OBJECT_NAME_STRING), this, 0, false); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQWidget"), this, 0, false); delete w; w = WidgetFactory::create(WidgetDatabase::idFromClassName("Dialog"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQLABEL_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQLabel"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQTABWIDGET_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQTabWidget"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this, 0, false); delete w; - assistant = new AssistProc(TQT_TQOBJECT(this), "Internal Assistant", assistantPath()); + assistant = new AssistProc(this, "Internal Assistant", assistantPath()); statusBar()->setSizeGripEnabled(true); SpecialInformation::registerSpecials(); backupTimer = new TQTimer(this); - connect(backupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateBackups())); + connect(backupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateBackups())); backupTimer->start(1000*60*5); //fire it every five minutes //createGUI(0); @@ -227,8 +235,8 @@ void MainWindow::setupMDI() PixmapChooser::NoSize)); qworkspace->setPaletteBackgroundColor(TQColor(238, 238, 238)); qworkspace->setScrollBarsEnabled(true); - connect(qworkspace, TQT_SIGNAL(windowActivated(TQWidget *)), - this, TQT_SLOT(activeWindowChanged(TQWidget *))); + connect(qworkspace, TQ_SIGNAL(windowActivated(TQWidget *)), + this, TQ_SLOT(activeWindowChanged(TQWidget *))); lastActiveFormWindow = 0; qworkspace->setAcceptDrops(true); } @@ -286,7 +294,7 @@ void MainWindow::setupWorkspace() QCompletionEdit *edit = new QCompletionEdit(vbox); TQToolTip::add(edit, i18n("Start typing the buffer you want to switch to here (ALT+B)")); TQAccel *a = new TQAccel(this); - a->connectItem(a->insertItem(ALT + Key_B), edit, TQT_SLOT(setFocus())); + a->connectItem(a->insertItem(ALT + Key_B), edit, TQ_SLOT(setFocus())); wspace = new Workspace(vbox, this); wspace->setBufferEdit(edit); dw->setWidget(vbox); @@ -417,7 +425,7 @@ void MainWindow::runForm() while ((editor = it.current()) != 0L) { ++it; - static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save(); + static_cast<AssocTextEditor*>(editor)->save(); } delete editors; @@ -452,75 +460,11 @@ void MainWindow::runForm() TDEProcess* process = new TDEProcess; process->setUseShell(true); (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName()); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*))); - messageLog->clear(MessageLog::All); - previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); - } -} - - -void MainWindow::runForm4() -{ - if (previewing) - { - KMessageBox::information(this, i18n("There is a dialog already running."), i18n("Run")); - return; - } - FormWindow* form = activeForm(); - if (!form || !form->formFile()) - return; - - TQObjectList *editors = queryList("AssocTextEditor"); - TQObjectListIt it(*editors); - TQObject *editor; - - while ((editor = it.current()) != 0L) - { - ++it; - static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save(); - } - delete editors; - - if (form->formFile()->hasTempFileName()) - { - if (!form->formFile()->saveAs()) - return; - } - - m_fileName = form->formFile()->fileName(); - m_backupName = m_fileName + ".running"; - m_modified = form->formFile()->isModified(); - - bool readOnlyFile = !TQFileInfo(m_fileName).isWritable(); - struct stat statbuf; - ::stat(m_fileName.local8Bit(), &statbuf); - if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) - { - KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName)); - return; - } - form->formFile()->setFileName(m_fileName); - if (!readOnlyFile || m_modified) - form->formFile()->setModified(true); - if (form->formFile()->save(false)) - { - if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) - { - KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup")); - } - ::chmod(m_fileName.local8Bit(), S_IRWXU); - TDEProcess* process = new TDEProcess; - process->setUseShell(true); - (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName()); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStdout(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStderr(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(closeRunningForm(TDEProcess*))); messageLog->clear(MessageLog::All); previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } @@ -554,9 +498,9 @@ void MainWindow::showProperties(TQObject *o) } TQWidget *w = (TQWidget*)o; setupHierarchyView(); - FormWindow *fw = (FormWindow*)isAFormWindowChild(TQT_TQOBJECT(w)); + FormWindow *fw = (FormWindow*)isAFormWindowChild(w); if (fw) { - propertyEditor->setWidget(TQT_TQOBJECT(w), fw); + propertyEditor->setWidget(w, fw); hierarchyView->setFormWindow(fw, w); } else { propertyEditor->setWidget(0, 0); @@ -617,7 +561,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } break; case TQEvent::MouseButtonPress: - if (((TQMouseEvent*)e)->button() == Qt::MidButton && dynamic_cast<KommanderWidget *>(o)) + if (((TQMouseEvent*)e)->button() == TQt::MidButton && dynamic_cast<KommanderWidget *>(o)) { AssocTextEditor *editor = new AssocTextEditor((TQWidget*)o, formWindow(), propertyEditor, m_partManager, this, "AssocTextEditor", false); //deletes itself! @@ -630,28 +574,28 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") || o->inherits("QDesignerToolBar") || - (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) && + (o->inherits("TQComboBox") || o->inherits("TQToolButton") || o->inherits("QDesignerToolBarSeparator")) && o->parent() && o->parent()->inherits("QDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; - if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) + if (w->inherits("TQToolButton") || w->inherits("TQComboBox") || w->inherits("QDesignerToolBarSeparator")) w = w->parentWidget(); TQWidget *pw = w->parentWidget(); while (pw) { if (pw->inherits("FormWindow")) { - ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w)); + ((FormWindow*)pw)->emitShowProperties(w); if (!o->inherits("QDesignerToolBar")) - return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && - !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator"); + return !o->inherits("TQToolButton") && !o->inherits("TQMenuBar") && + !o->inherits("TQComboBox") && !o->inherits("QDesignerToolBarSeparator"); } pw = pw->parentWidget(); } } - if (o && (o->inherits("QDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) + if (o && (o->inherits("QDesignerToolBar") || o->inherits("TQDockWindowHandle")) && e->type() == TQEvent::ContextMenu) break; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) break; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) break; if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; @@ -669,7 +613,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } lastPressWidget = (TQWidget*)o; if (passiveInteractor) - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); if (currentTool() == CONNECT_TOOL) return true; return !passiveInteractor; @@ -677,7 +621,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) lastPressWidget = 0; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) break; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) break; if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; @@ -685,7 +629,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) ((FormWindow*)w)->handleMouseRelease((TQMouseEvent*)e, ((FormWindow*)w)->designerWidget(o)); if (passiveInteractor) { selectionChanged(); - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); } return !passiveInteractor; case TQEvent::MouseMove: @@ -694,10 +638,10 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) w = isAFormWindowChild(o); if (lastPressWidget != (TQWidget*)o && w && !o->inherits("SizeHandle") && !o->inherits("OrderIndicator") && - !o->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && - !o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + !o->inherits("TQPopupMenu") && !o->inherits("TQMenuBar") && + !o->inherits("TQSizeGrip")) return true; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) break; if (lastPressWidget != (TQWidget*)o || (!w || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))) @@ -718,8 +662,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; case TQEvent::MouseButtonDblClick: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) { - if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() && - o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) + if (o && o->inherits("TQToolButton") && ((TQToolButton*)o)->isOn() && + o->parent() && o->parent()->inherits("TQToolBar") && formWindow()) formWindow()->setToolFixed(); break; } @@ -740,8 +684,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Hide: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; - if (((FormWindow*)w)->isWidgetSelected(TQT_TQOBJECT(o))) - ((FormWindow*)w)->selectWidget(TQT_TQOBJECT(o), false); + if (((FormWindow*)w)->isWidgetSelected(o)) + ((FormWindow*)w)->selectWidget(o, false); break; case TQEvent::Enter: case TQEvent::Leave: @@ -761,25 +705,25 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Close: break; case TQEvent::DragEnter: - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { + if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { workspace()->contentsDragEnterEvent((TQDragEnterEvent*)e); return true; } break; case TQEvent::DragMove: - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { + if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { workspace()->contentsDragMoveEvent((TQDragMoveEvent*)e); return true; } break; case TQEvent::Drop: - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { + if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { workspace()->contentsDropEvent((TQDropEvent*)e); return true; } break; case TQEvent::Show: - if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) + if (o != this) break; if (((TQShowEvent*)e)->spontaneous()) break; @@ -808,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const { - if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (o->parent() && o->parent()->inherits("TQWizard") && !o->inherits("TQPushButton")) return 0; while (o) { if (o->inherits("FormWindow")) @@ -859,16 +803,16 @@ void MainWindow::insertFormWindow(FormWindow *fw) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.")); - connect(fw, TQT_SIGNAL(showProperties(TQObject *)), - this, TQT_SLOT(showProperties(TQObject *))); - connect(fw, TQT_SIGNAL(updateProperties(TQObject *)), - this, TQT_SLOT(updateProperties(TQObject *))); - connect(this, TQT_SIGNAL(currentToolChanged()), - fw, TQT_SLOT(currentToolChanged())); - connect(fw, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(selectionChanged())); - connect(fw, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); + connect(fw, TQ_SIGNAL(showProperties(TQObject *)), + this, TQ_SLOT(showProperties(TQObject *))); + connect(fw, TQ_SIGNAL(updateProperties(TQObject *)), + this, TQ_SLOT(updateProperties(TQObject *))); + connect(this, TQ_SIGNAL(currentToolChanged()), + fw, TQ_SLOT(currentToolChanged())); + connect(fw, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(selectionChanged())); + connect(fw, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); fw->show(); fw->currentToolChanged(); @@ -877,7 +821,7 @@ void MainWindow::insertFormWindow(FormWindow *fw) fw->mainContainer()->setCaption(fw->caption()); WidgetFactory::saveDefaultProperties(fw->mainContainer(), WidgetDatabase:: - idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(fw->mainContainer())))); + idFromClassName(WidgetFactory::classNameOf(fw->mainContainer()))); activeWindowChanged(fw); emit formWindowsChanged(); } @@ -1013,18 +957,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w) { const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true); - if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (text && qstrcmp(text->type(), "TQString") != 0) text = 0; const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); - if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (title && qstrcmp(title->type(), "TQString") != 0) title = 0; const TQMetaProperty* pagetitle = w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true); - if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (pagetitle && qstrcmp(pagetitle->type(), "TQString") != 0) pagetitle = 0; const TQMetaProperty* pixmap = w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true); - if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0) + if (pixmap && qstrcmp(pixmap->type(), "TQPixmap") != 0) pixmap = 0; if (text && text->designable(w) || @@ -1038,7 +982,7 @@ void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> ids << (id = rmbWidgets->insertItem(i18n("Choose Pixmap..."), -1, 0)); props.insert("pixmap", id); } - if (text && text->designable(w) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) { + if (text && text->designable(w) && !w->inherits("TQTextEdit")) { ids << (id = rmbWidgets->insertItem(i18n("Edit Text..."), -1, 0)); props.insert("text", id); } @@ -1068,7 +1012,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, commands.insert("assoc", id); } - if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { + if (w->inherits("TQTabWidget")) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); if (((QDesignerTabWidget*)w)->count() > 1) { @@ -1078,7 +1022,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0)); commands.insert("add", id); } - if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { + if (w->inherits("TQToolBox")) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); if (((TQToolBox*)w)->count() > 1) { @@ -1088,7 +1032,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0)); commands.insert("add", id); } - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); @@ -1113,7 +1057,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, commands.insert("assoc", id); } - if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { + if (fw->mainContainer()->inherits("TQWizard")) { if (ids.isEmpty()) ids << rmbFormWindow->insertSeparator(0); @@ -1131,7 +1075,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbFormWindow->insertItem(i18n("Edit Pages..."), -1, 0)); commands.insert("edit", id); - } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { + } else if (fw->mainContainer()->inherits("TQMainWindow")) { if (ids.isEmpty()) ids << rmbFormWindow->insertSeparator(0); ids << (id = rmbFormWindow->insertItem(i18n("Add Menu Item"), -1, 0)); @@ -1146,7 +1090,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg if (id == props[ "text" ]) { bool ok = false; TQString text; - if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { + if (w->inherits("TQTextView") || w->inherits("TQLabel")) { text = TextEditor::getText(this, w->property("text").toString()); ok = !text.isEmpty(); } else { @@ -1154,48 +1098,48 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg } if (ok) { TQString pn(i18n("Set the 'text' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "text", w->property("text"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true); + MetaDataBase::setPropertyChanged(w, "text", true); } } else if (id == props[ "title" ]) { bool ok = false; TQString title = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { TQString pn(i18n("Set the 'title' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "title", w->property("title"), title, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true); + MetaDataBase::setPropertyChanged(w, "title", true); } } else if (id == props[ "pagetitle" ]) { bool ok = false; TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), w->property("pageTitle").toString(), &ok, this); if (ok) { TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "pageTitle", w->property("pageTitle"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pageTitle", true); + MetaDataBase::setPropertyChanged(w, "pageTitle", true); } } else if (id == props[ "pixmap" ]) { TQPixmap oldPix = TQVariant(w->property("pixmap")).toPixmap(); TQPixmap pix = qChoosePixmap(this, formWindow(), oldPix); if (!pix.isNull()) { TQString pn(i18n("Set the 'pixmap' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "pixmap", w->property("pixmap"), pix, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pixmap", true); + MetaDataBase::setPropertyChanged(w, "pixmap", true); } } } @@ -1211,7 +1155,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands editor->show(); } - if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { + if (w->inherits("TQTabWidget")) { TQTabWidget *tw = (TQTabWidget*)w; if (id == commands[ "add" ]) { AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), @@ -1229,7 +1173,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } } } - if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { + if (w->inherits("TQToolBox")) { TQToolBox *tw = (TQToolBox*)w; if (id == commands[ "add" ]) { AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), @@ -1247,9 +1191,9 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } } } - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { if (id == commands[ "edit" ]) - WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow()); + WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow()); } } @@ -1264,7 +1208,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } - if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { + if (fw->mainContainer()->inherits("TQWizard")) { TQWizard *wiz = (TQWizard*)fw->mainContainer(); if (id == commands[ "add" ]) { AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(), @@ -1297,7 +1241,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands cmd->execute(); } } - } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { + } else if (fw->mainContainer()->inherits("TQMainWindow")) { TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if (id == commands[ "add_toolbar" ]) { AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw); @@ -1374,7 +1318,7 @@ void MainWindow::selectionChanged() breakLayout = laidout > 0; } else if (selectedWidgets == 1) { TQWidget *w = widgets.first(); - bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))) || + bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w))) || w == formWindow()->mainContainer(); actionEditAdjustSize->setEnabled(!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout); @@ -1384,7 +1328,7 @@ void MainWindow::selectionChanged() actionEditVLayout->setEnabled(false); actionEditGridLayout->setEnabled(false); if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { - actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); + actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); breakLayout = true; } else { actionEditBreakLayout->setEnabled(false); @@ -1404,14 +1348,14 @@ void MainWindow::selectionChanged() layoutChilds = true; } if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { - actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); + actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); breakLayout = true; } } else { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); actionEditGridLayout->setEnabled(false); - actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); + actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); breakLayout = true; } } @@ -1620,9 +1564,9 @@ ActionEditor *MainWindow::actioneditor() const bool MainWindow::openEditor(TQWidget* w, FormWindow*) { - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { statusBar()->message(i18n("Edit %1...").arg(w->className())); - WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow()); + WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow()); statusBar()->clear(); return true; } @@ -1632,7 +1576,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) if (text && text->designable(w)) { bool ok = false; TQString text; - if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { + if (w->inherits("TQTextView") || w->inherits("TQLabel")) { text = TextEditor::getText(this, w->property("text").toString()); ok = !text.isEmpty(); } else { @@ -1640,12 +1584,12 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) } if (ok) { TQString pn(i18n("Set the 'text' of '%2'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "text", w->property("text"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true); + MetaDataBase::setPropertyChanged(w, "text", true); } return true; } @@ -1655,12 +1599,12 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) text = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { TQString pn(i18n("Set the 'title' of '%2'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "title", w->property("title"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true); + MetaDataBase::setPropertyChanged(w, "title", true); } return true; } diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h index 69f06c5f..1136faa2 100644 --- a/kommander/editor/mainwindow.h +++ b/kommander/editor/mainwindow.h @@ -67,7 +67,7 @@ namespace KParts { class MainWindow : public KParts::DockMainWindow { - Q_OBJECT + TQ_OBJECT public: @@ -192,7 +192,6 @@ public slots: void configureEditor(); void runForm(); - void runForm4(); private slots: void activeWindowChanged( TQWidget *w ); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 0c9d4643..d10c0c2f 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -19,10 +19,6 @@ #include "mainwindow.h" -#ifdef TQT_NO_SQL -#define TQT_NO_SQL -#endif // TQT_NO_SQL - #include <tqapplication.h> #include <tqclipboard.h> #include <tqfileinfo.h> @@ -96,77 +92,77 @@ int forms = 0; void MainWindow::setupEditActions() { - actionEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), actionCollection()); + actionEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); actionEditUndo->setText(i18n("&Undo: Not Available")); actionEditUndo->setToolTip(i18n("Undoes the last action")); actionEditUndo->setWhatsThis(whatsThisFrom("Edit|Undo")); actionEditUndo->setEnabled(false); - actionEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), actionCollection()); + actionEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); actionEditRedo->setText(i18n("&Redo: Not Available")); actionEditRedo->setToolTip(i18n("Redoes the last undone operation")); actionEditRedo->setWhatsThis(whatsThisFrom("Edit|Redo")); actionEditRedo->setEnabled(false); - actionEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), actionCollection()); + actionEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection()); actionEditCut->setToolTip(i18n("Cuts the selected widgets and puts them on the clipboard")); actionEditCut->setWhatsThis(whatsThisFrom("Edit|Cut")); actionEditCut->setEnabled(false); - actionEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), actionCollection()); + actionEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); actionEditCopy->setToolTip(i18n("Copies the selected widgets to the clipboard")); actionEditCopy->setWhatsThis(whatsThisFrom("Edit|Copy")); actionEditCopy->setEnabled(false); - actionEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), actionCollection()); + actionEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection()); actionEditPaste->setToolTip(i18n("Pastes the clipboard's contents")); actionEditPaste->setWhatsThis(whatsThisFrom("Edit|Paste")); actionEditPaste->setEnabled(false); - actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(editDelete()), + actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete"); actionEditDelete->setToolTip(i18n("Deletes the selected widgets")); actionEditDelete->setWhatsThis(whatsThisFrom("Edit|Delete")); actionEditDelete->setEnabled(false); - actionEditSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(editSelectAll()), actionCollection()); + actionEditSelectAll = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection()); actionEditSelectAll->setToolTip(i18n("Selects all widgets")); actionEditSelectAll->setWhatsThis(whatsThisFrom("Edit|Select All")); actionEditRaise = new TDEAction(i18n("Bring to Front"), createIconSet("editraise.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editRaise()), actionCollection(), "edit_raise"); + TDEShortcut::null(), this, TQ_SLOT(editRaise()), actionCollection(), "edit_raise"); actionEditRaise->setToolTip(i18n("Raises the selected widgets")); actionEditRaise->setEnabled(false); actionEditLower = new TDEAction(i18n("Send to Back"), createIconSet("editlower.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLower()), actionCollection(), "edit_lower"); + TDEShortcut::null(), this, TQ_SLOT(editLower()), actionCollection(), "edit_lower"); actionEditLower->setToolTip(i18n("Lowers the selected widgets")); actionEditLower->setWhatsThis(i18n("Lowers the selected widgets")); actionEditLower->setEnabled(false); - actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, TQT_TQOBJECT(this), TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); + actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQ_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); actionEditFindGlobal->setToolTip(i18n("Search for a text in the whole form.")); actionEditFindGlobal->setWhatsThis(whatsThisFrom("Edit|Find in Form")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQ_SLOT(setEnabled(bool))); - actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT(editAccels()), + actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_check_accel"); actionEditAccels->setToolTip(i18n("Checks if the accelerators used in the form are unique")); actionEditAccels->setWhatsThis(whatsThisFrom("Edit|Check Accelerator")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQ_SLOT(setEnabled(bool))); actionEditConnections = new TDEAction(i18n("Connections"), createIconSet("connecttool.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editConnections()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections"); actionEditConnections->setToolTip(i18n("Opens a dialog for editing connections")); actionEditConnections->setWhatsThis(whatsThisFrom("Edit|Connections")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQ_SLOT(setEnabled(bool))); actionEditFormSettings = new TDEAction(i18n("Form Settings..."), TDEShortcut::null(), - TQT_TQOBJECT(this), TQT_SLOT(editFormSettings()), actionCollection(), "edit_form"); + this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_form"); actionEditFormSettings->setToolTip(i18n("Opens a dialog to change the form's settings")); actionEditFormSettings->setWhatsThis(whatsThisFrom("Edit|Form Settings")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQ_SLOT(setEnabled(bool))); TDEToolBar *tb = new TDEToolBar(this, "Edit"); tb->setFullSize(false); @@ -202,50 +198,50 @@ void MainWindow::setupEditActions() void MainWindow::setupLayoutActions() { actionEditAdjustSize = new TDEAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"), - CTRL + Key_J, TQT_TQOBJECT(this), TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); + CTRL + Key_J, this, TQ_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); actionEditAdjustSize->setToolTip(i18n("Adjusts the size of the selected widget")); actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size")); actionEditAdjustSize->setEnabled(false); actionEditHLayout = new TDEAction(i18n("Lay Out Horizontally"), createIconSet("edithlayout.xpm"), - CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); + CTRL + Key_H, this, TQ_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally")); actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally")); actionEditHLayout->setEnabled(false); actionEditVLayout = new TDEAction(i18n("Lay Out Vertically"), createIconSet("editvlayout.xpm"), - CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); + CTRL + Key_L, this, TQ_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically")); actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically")); actionEditVLayout->setEnabled(false); actionEditGridLayout = new TDEAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"), - CTRL + Key_G, TQT_TQOBJECT(this), TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); + CTRL + Key_G, this, TQ_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); actionEditGridLayout->setToolTip(i18n("Lays out the selected widgets in a grid")); actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid")); actionEditGridLayout->setEnabled(false); actionEditSplitHorizontal = new TDEAction(i18n("Lay Out Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutHorizontalSplit()), actionCollection(), "edit_split_h"); actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter")); actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally in Splitter")); actionEditSplitHorizontal->setEnabled(false); actionEditSplitVertical = new TDEAction(i18n("Lay Out Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutVerticalSplit()), actionCollection(), "edit_split_v"); actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter")); actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically (in Splitter)")); actionEditSplitVertical->setEnabled(false); actionEditBreakLayout = new TDEAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"), - CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); + CTRL + Key_B, this, TQ_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout")); actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout")); int id = WidgetDatabase::idFromClassName("Spacer"); - TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), + TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(id).latin1()); a->setExclusiveGroup("tool"); a->setText(i18n("Add ") + WidgetDatabase::className(id)); @@ -284,21 +280,21 @@ void MainWindow::setupLayoutActions() void MainWindow::setupToolActions() { actionPointerTool = new TDEToggleAction(i18n("Pointer"), "arrow", Key_F2, - TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(POINTER_TOOL).latin1()); actionPointerTool->setToolTip(i18n("Selects the pointer tool")); actionPointerTool->setWhatsThis(whatsThisFrom("Tools|Pointer")); actionPointerTool->setExclusiveGroup("tool"); actionConnectTool = new TDEToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"), - Key_F3, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), + Key_F3, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(CONNECT_TOOL).latin1()); actionConnectTool->setToolTip(i18n("Selects the connection tool")); actionConnectTool->setWhatsThis(whatsThisFrom("Tools|Connect Signals and Slots")); actionConnectTool->setExclusiveGroup("tool"); actionOrderTool = new TDEToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"), - Key_F4, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), + Key_F4, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(ORDER_TOOL).latin1()); actionOrderTool->setToolTip(i18n("Selects the tab order tool")); actionOrderTool->setWhatsThis(whatsThisFrom("Tools|Tab Order")); @@ -348,7 +344,7 @@ void MainWindow::setupToolActions() if (WidgetDatabase::group(i) != grp) continue; // only widgets, i.e. not forms and temp stuff TDEToggleAction *a = new TDEToggleAction(WidgetDatabase::className(i), TDEShortcut::null(), - TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); a->setExclusiveGroup("tool"); TQString atext = WidgetDatabase::className(i); if (atext[0] == 'Q') @@ -394,7 +390,7 @@ void MainWindow::setupToolActions() continue; TQString name = fi->baseName(); name = name.replace("_", " "); - editMenu->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count()); + editMenu->insertItem(name, this, TQ_SLOT(editExternalTool(int)), 0, m_editorTools.count()); m_editorTools.append(fi->filePath()); } } @@ -414,54 +410,54 @@ void MainWindow::setupFileActions() fileMenu = new TQPopupMenu(this, "File"); menuBar()->insertItem(i18n("&File"), fileMenu); - TDEAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); + TDEAction *a = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); a->setToolTip(i18n("Creates a new dialog")); a->setWhatsThis(whatsThisFrom("File|New")); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + a = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); a->setToolTip(i18n("Opens an existing dialog")); a->setWhatsThis(whatsThisFrom("File|Open")); a->plug(fileTb); a->plug(fileMenu); - actionRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(fileOpenRecent(const KURL&)), actionCollection()); + actionRecent = KStdAction::openRecent(this, TQ_SLOT(fileOpenRecent(const KURL&)), actionCollection()); actionRecent->setToolTip(i18n("Opens recently open file")); actionRecent->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(fileClose()), actionCollection()); + a = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); a->setToolTip(i18n("Closes the current dialog")); a->setWhatsThis(whatsThisFrom("File|Close")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); + a = KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); a->setToolTip(i18n("Saves the current dialog")); a->setWhatsThis(whatsThisFrom("File|Save")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); + a = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); a->setToolTip(i18n("Saves the current dialog with a new filename")); a->setWhatsThis(whatsThisFrom("File|Save As")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); - a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(fileSaveAll()), + a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQ_SLOT(fileSaveAll()), actionCollection(), "file_close_all"); a->setToolTip(i18n("Saves all open dialogs")); a->setWhatsThis(whatsThisFrom("File|Save All")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection()); + a = KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs")); a->setWhatsThis(whatsThisFrom("File|Exit")); a->plug(fileMenu); @@ -474,20 +470,12 @@ void MainWindow::setupRunActions() menuBar()->insertItem(i18n("&Run"), menu); TDEAction* a = new TDEAction(i18n("Run Dialog"), "system-run", CTRL + Key_R, - TQT_TQOBJECT(this), TQT_SLOT(runForm()), actionCollection(), "run"); + this, TQ_SLOT(runForm()), actionCollection(), "run"); a->setToolTip(i18n("Executes dialog")); a->setWhatsThis(whatsThisFrom("Run|Run dialog")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(menu); - // add KDE4 executor - - TDEAction* b = new TDEAction(i18n("Run Dialog K4"), "launch", CTRL + SHIFT + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT(runForm4()), actionCollection(), "run4"); - b->setToolTip(i18n("Executes dialog in KDE4")); - b->setWhatsThis(whatsThisFrom("Run|Run dialog")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), b, TQT_SLOT(setEnabled(bool))); - b->plug(menu); } void MainWindow::setupWindowActions() @@ -497,39 +485,39 @@ void MainWindow::setupWindowActions() { windowActionsSetup = true; - TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), TQT_SLOT(tile()), + TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace, TQ_SLOT(tile()), actionCollection(), "window_tile"); actionWindowTile->setToolTip(i18n("Tiles the windows so that they are all visible")); actionWindowTile->setWhatsThis(whatsThisFrom("Window|Tile")); - TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), TQT_SLOT(cascade()), + TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(cascade()), actionCollection(), "window_cascade"); actionWindowCascade->setToolTip(i18n("Cascades the windows so that all their title bars are visible")); actionWindowCascade->setWhatsThis(whatsThisFrom("Window|Cascade")); - TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), TQT_SLOT(closeActiveWindow()), + TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(closeActiveWindow()), actionCollection(), "window_close"); actionWindowClose->setToolTip(i18n("Closes the active window")); actionWindowClose->setWhatsThis(whatsThisFrom("Window|Close")); - TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), - TQT_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); + TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), qworkspace, + TQ_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); actionWindowCloseAll->setToolTip(i18n("Closes all form windows")); actionWindowCloseAll->setWhatsThis(whatsThisFrom("Window|Close All")); - TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, TQT_TQOBJECT(qworkspace), - TQT_SLOT(activateNextWindow()), actionCollection(), "window_next"); + TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, qworkspace, + TQ_SLOT(activateNextWindow()), actionCollection(), "window_next"); actionWindowNext->setToolTip(i18n("Activates the next window")); actionWindowNext->setWhatsThis(whatsThisFrom("Window|Next")); - TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(qworkspace), - TQT_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); + TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, qworkspace, + TQ_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); actionWindowPrevious->setToolTip(i18n("Activates the previous window")); actionWindowPrevious->setWhatsThis(whatsThisFrom("Window|Previous")); windowMenu = new TDEPopupMenu(this, "Window"); menuBar()->insertItem(i18n("&Window"), windowMenu); - connect(windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(setupWindowActions())); + connect(windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(setupWindowActions())); actionWindowClose->plug(windowMenu); actionWindowCloseAll->plug(windowMenu); @@ -566,7 +554,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem(itemText, TQT_TQOBJECT(this), TQT_SLOT(windowsMenuActivated(int))); + int id = windowMenu->insertItem(itemText, this, TQ_SLOT(windowsMenuActivated(int))); windowMenu->setItemParameter(id, i); windowMenu->setItemChecked(id, qworkspace->activeWindow() == windows.at(i)); } @@ -576,21 +564,21 @@ void MainWindow::setupWindowActions() void MainWindow::setupSettingsActions() { TDEPopupMenu *settings = new TDEPopupMenu(this, "Settings"); - TDEAction* a = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editShortcuts()), actionCollection()); + TDEAction* a = KStdAction::keyBindings(this, TQ_SLOT(editShortcuts()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change shortcuts")); a->plug(settings); - a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editPlugins()), + a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQ_SLOT(editPlugins()), actionCollection(), "configure_plugins"); a->setToolTip(i18n("Opens a dialog to configure plugins")); a->plug(settings); - a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(configureEditor()), + a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQ_SLOT(configureEditor()), actionCollection(), "configure_editor"); a->setToolTip(i18n("Configure various aspects of this editor.")); a->plug(settings); - a = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(editPreferences()), actionCollection()); + a = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change preferences")); a->setWhatsThis(whatsThisFrom("Edit|Preferences")); a->plug(settings); @@ -785,20 +773,20 @@ void MainWindow::fileCreateTemplate() for (i = 0; i < WidgetDatabase::count(); ++i) { if (WidgetDatabase::isContainer(i) && !WidgetDatabase::isForm(i) && - WidgetDatabase::className(i) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::widgetGroup(i) != "Temp") + WidgetDatabase::className(i) != "TQTabWidget" && WidgetDatabase::widgetGroup(i) != "Temp") { dia.listClass->insertItem(WidgetDatabase::className(i)); } } dia.editName->setText(i18n("NewTemplate")); - connect(dia.buttonCreate, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(createNewTemplate())); + connect(dia.buttonCreate, TQ_SIGNAL(clicked()), this, TQ_SLOT(createNewTemplate())); dia.exec(); } void MainWindow::createNewTemplate() { - CreateTemplate *dia = (CreateTemplate *) TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent(); + CreateTemplate *dia = (CreateTemplate *) sender()->parent(); TQString fn = dia->editName->text(); TQString cn = dia->listClass->currentText(); if (fn.isEmpty() || cn.isEmpty()) @@ -895,7 +883,7 @@ void MainWindow::editPaste() w = l.first(); if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory:: - classNameOf(TQT_TQOBJECT(w)))) && w != formWindow()->mainContainer())) + classNameOf(w))) && w != formWindow()->mainContainer())) w = formWindow()->mainContainer(); } @@ -1102,7 +1090,7 @@ void MainWindow::editPreferences() statusBar()->message(i18n("Edit preferences...")); Preferences *dia = new Preferences(this, 0, true); prefDia = dia; - connect(dia->helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(dia->helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); dia->buttonColor->setEditor(StyledButton::ColorEditor); dia->buttonPixmap->setEditor(StyledButton::PixmapEditor); dia->checkBoxShowGrid->setChecked(sGrid); @@ -1123,7 +1111,7 @@ void MainWindow::editPreferences() dia->checkBoxSplash->setChecked(splashScreen); dia->editDocPath->setText(docPath); dia->checkAutoEdit->setChecked(!databaseAutoEdit); - connect(dia->buttonDocPath, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(chooseDocPath())); + connect(dia->buttonDocPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseDocPath())); if (dia->exec() == TQDialog::Accepted) { @@ -1177,8 +1165,8 @@ void MainWindow::editExternalTool(int id) { TDEProcess* process = new TDEProcess; (*process) << "kmdr-executor" << m_editorTools[id]; - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editToolExited(TDEProcess*))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(editToolOutput(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editToolExited(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(editToolOutput(TDEProcess*, char*, int))); m_toolOutput = '\0'; process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index e6d13a21..cf8bdd25 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -31,19 +31,19 @@ MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name) { m_popupMenu = new TDEPopupMenu(this); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine())); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQT_SLOT(copyContent())); - m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveToFile())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQ_SLOT(copyLine())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQ_SLOT(copyContent())); + m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveToFile())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clearContent())); + m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clearContent())); for (int i = 0; i < m_listCount; i++) { m_lists[i] = new TDEListBox(this); addTab(m_lists[i], m_listNames[i]); m_seenEOL[i] = false; - connect(m_lists[i], TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + connect(m_lists[i], TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); } } diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h index ea1c2aa0..b1d3e66c 100644 --- a/kommander/editor/messagelog.h +++ b/kommander/editor/messagelog.h @@ -28,7 +28,7 @@ class TQListBoxItem; class MessageLog : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: enum InfoType {Stdout, Stderr, All}; diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index c84e1159..5c2d6681 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -280,9 +280,9 @@ int MetaDataBase::spacing( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); - MetaDataBaseRecord *r = db->find( TQT_TQOBJECT(o) ); + if ( o->inherits( "TQMainWindow" ) ) + o = ( (TQMainWindow*)o )->centralWidget(); + MetaDataBaseRecord *r = db->find( o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -318,8 +318,8 @@ int MetaDataBase::margin( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + if ( o->inherits( "TQMainWindow" ) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -477,7 +477,7 @@ void MetaDataBase::doConnections( TQObject *o ) slotList.find( conn.slot ) == -1 ) continue; - TQObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s.utf8(), receiver, s2.utf8() ); } } @@ -652,7 +652,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom return true; if ( o->inherits( "FormWindow" ) ) { - o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); + o = ( (FormWindow*)o )->mainContainer(); slotList = o->metaObject()->slotNames( true ); if ( slotList.find( slot ) != -1 ) return true; @@ -1019,7 +1019,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true ); - if ( slotList.find( normalizeSlot( slot ) ) != -1 ) + if ( slotList.find( normalizeSlot(slot).utf8() ) != -1 ) return true; for ( TQValueList<MetaDataBase::Slot>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 2dab19a1..158f5d9e 100644 --- a/kommander/editor/multilineeditorimpl.cpp +++ b/kommander/editor/multilineeditorimpl.cpp @@ -31,7 +31,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : MultiLineEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); mlined = (TQMultiLineEdit*)editWidget; // #### complete list of properties here preview->setAlignment( mlined->alignment() ); diff --git a/kommander/editor/multilineeditorimpl.h b/kommander/editor/multilineeditorimpl.h index 3931cf90..c5c07366 100644 --- a/kommander/editor/multilineeditorimpl.h +++ b/kommander/editor/multilineeditorimpl.h @@ -28,7 +28,7 @@ class TQMultiLineEdit; class MultiLineEditor : public MultiLineEditorBase { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ private: class TextEditor : public MultiLineEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui index 7b5a0938..4c2d3fa9 100644 --- a/kommander/editor/newform.ui +++ b/kommander/editor/newform.ui @@ -202,9 +202,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">itemChanged( TQIconViewItem * )</slot> <slot access="protected">projectChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 7b8e330b..17e37001 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -56,8 +56,8 @@ void FormItem::insert() TQString n = "Form" + TQString::number(++_forms); FormWindow *fw = 0; FormFile *ff = new FormFile(FormFile::createUnnamedFileName(), true); - fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n); - MetaDataBase::addEntry(TQT_TQOBJECT(fw)); + fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n.utf8()); + MetaDataBase::addEntry(fw); TQWidget *w = 0L; if (fType == Dialog) { @@ -72,7 +72,7 @@ void FormItem::insert() if (w) { w->setProperty("useInternalParser", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "useInternalParser", true); + MetaDataBase::setPropertyChanged(w, "useInternalParser", true); } fw->setCaption(n); fw->resize(600, 480); @@ -81,7 +81,7 @@ void FormItem::insert() // the wizard might have changed a lot, lets update everything MainWindow::self->actioneditor()->setFormWindow(fw); MainWindow::self->objectHierarchy()->setFormWindow(fw, fw); - fw->killAccels(TQT_TQOBJECT(fw)); + fw->killAccels(fw); fw->setFocus(); } @@ -107,7 +107,7 @@ static void unifyFormName(FormWindow *fw, TQWorkspace *qworkspace) int i = 1; while (lst.findIndex(n) != -1) n = origName + TQString::number(i++); - fw->setName(n); + fw->setName(n.utf8()); fw->setCaption(n); } @@ -138,7 +138,7 @@ void CustomFormItem::insert() NewForm::NewForm(TQWidget *parent, const TQString &templatePath) : NewFormBase(parent, 0, true) { - connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); TQIconViewItem *cur = 0; FormItem *fi = new FormItem(templateView, i18n("Dialog")); diff --git a/kommander/editor/newformimpl.h b/kommander/editor/newformimpl.h index e875a858..ed8e19a0 100644 --- a/kommander/editor/newformimpl.h +++ b/kommander/editor/newformimpl.h @@ -60,7 +60,7 @@ private: class NewForm : public NewFormBase { - Q_OBJECT + TQ_OBJECT public: NewForm( TQWidget *parent, const TQString &templatePath ); diff --git a/kommander/editor/orderindicator.h b/kommander/editor/orderindicator.h index cb75151b..08281c9c 100644 --- a/kommander/editor/orderindicator.h +++ b/kommander/editor/orderindicator.h @@ -27,7 +27,7 @@ class FormWindow; class OrderIndicator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui index cadcb3f5..a77c277b 100644 --- a/kommander/editor/paletteeditor.ui +++ b/kommander/editor/paletteeditor.ui @@ -501,18 +501,17 @@ <tabstop>paletteCombo</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">onTune()</slot> <slot access="protected">onChoose2ndMainColor()</slot> <slot access="protected">onChooseMainColor()</slot> <slot access="protected">paletteSelected(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> - <includehint>previewframe.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">previewframe.h</include> + <include location="global" impldecl="in implementation">styledbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui index 78fcb222..02d5e4d2 100644 --- a/kommander/editor/paletteeditoradvanced.ui +++ b/kommander/editor/paletteeditoradvanced.ui @@ -743,7 +743,7 @@ <tabstop>buttonEffect</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">onToggleBuildDisabled(bool)</slot> @@ -756,11 +756,9 @@ <slot access="protected">onToggleBuildInactive(bool)</slot> <slot access="protected">paletteSelected(int)</slot> <slot>showHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">styledbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index e7880b19..eb93c28d 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -63,7 +63,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/kommander/editor/paletteeditoradvancedimpl.h b/kommander/editor/paletteeditoradvancedimpl.h index a4b591cd..65ef641a 100644 --- a/kommander/editor/paletteeditoradvancedimpl.h +++ b/kommander/editor/paletteeditoradvancedimpl.h @@ -27,7 +27,7 @@ class FormWindow; class PaletteEditorAdvanced : public PaletteEditorAdvancedBase { - Q_OBJECT + TQ_OBJECT public: PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, diff --git a/kommander/editor/paletteeditorimpl.cpp b/kommander/editor/paletteeditorimpl.cpp index bf68fe16..dd12de19 100644 --- a/kommander/editor/paletteeditorimpl.cpp +++ b/kommander/editor/paletteeditorimpl.cpp @@ -33,7 +33,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/kommander/editor/paletteeditorimpl.h b/kommander/editor/paletteeditorimpl.h index 8bc18bce..680c960c 100644 --- a/kommander/editor/paletteeditorimpl.h +++ b/kommander/editor/paletteeditorimpl.h @@ -27,7 +27,7 @@ class FormWindow; class PaletteEditor : public PaletteEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/pics/CMakeLists.txt b/kommander/editor/pics/CMakeLists.txt new file mode 100644 index 00000000..04f2e9ba --- /dev/null +++ b/kommander/editor/pics/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES kommandersplash.png toolbox.png tdefontcombo.png + DESTINATION ${DATA_INSTALL_DIR}/kommander/pics +) diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index 224bbe72..71fe357c 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -966,7 +966,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T TQPixmap pix( fd.selectedFile() ); if ( fn ) *fn = fd.selectedFile(); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), fd.selectedFile() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), fd.selectedFile() ); return pix; } } @@ -985,13 +985,13 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T #endif else { PixmapFunction dia( parent, 0, true ); - TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); - dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) ); + dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); if ( dia.exec() == TQDialog::Accepted ) { TQPixmap pix( PixmapChooser::loadPixmap( "image.xpm" ) ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dia.editArguments->text() ); return pix; } } @@ -1004,7 +1004,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) + : TQFileIconProvider( parent, name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) { fmts = TQImage::inputFormats(); } @@ -1016,7 +1016,7 @@ ImageIconProvider::~ImageIconProvider() const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi ) { TQString ext = fi.extension().upper(); - if ( fmts.contains( ext ) ) { + if ( fmts.contains( ext.utf8() ) ) { return &imagepm; } else { return TQFileIconProvider::pixmap( fi ); diff --git a/kommander/editor/pixmapchooser.h b/kommander/editor/pixmapchooser.h index 6d8e761a..bfdf476c 100644 --- a/kommander/editor/pixmapchooser.h +++ b/kommander/editor/pixmapchooser.h @@ -31,7 +31,7 @@ class FormWindow; class PixmapView : public TQScrollView, public TQFilePreview { - Q_OBJECT + TQ_OBJECT public: @@ -47,7 +47,7 @@ private: class ImageIconProvider : public TQFileIconProvider { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/previewframe.h b/kommander/editor/previewframe.h index eda444f5..ad89abe5 100644 --- a/kommander/editor/previewframe.h +++ b/kommander/editor/previewframe.h @@ -28,7 +28,7 @@ class PreviewWorkspace : public TQWorkspace { - Q_OBJECT + TQ_OBJECT public: PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) @@ -41,7 +41,7 @@ protected: class PreviewFrame : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp index 98cfd39c..2b08ee3a 100644 --- a/kommander/editor/previewwidgetimpl.cpp +++ b/kommander/editor/previewwidgetimpl.cpp @@ -25,13 +25,13 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) : PreviewWidgetBase( parent, name ) { // install event filter on child widgets - TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); TQObjectListIt it(*l); TQObject * obj; while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus); } } diff --git a/kommander/editor/previewwidgetimpl.h b/kommander/editor/previewwidgetimpl.h index 31e04253..92fbce42 100644 --- a/kommander/editor/previewwidgetimpl.h +++ b/kommander/editor/previewwidgetimpl.h @@ -25,7 +25,7 @@ class PreviewWidget : public PreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 40b4cafb..4b0c58e4 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -282,7 +282,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg, void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ) { p->save(); - TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg, + TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg, TQStyle::Style_Sunken, TQStyleOption(1,1) ); p->restore(); } @@ -401,8 +401,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), - listview, TQT_SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, i18n("Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, i18n("Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -539,7 +539,7 @@ void PropertyItem::setFocus( TQWidget *w ) { if ( !tqApp->focusWidget() || listview->propertyEditor()->formWindow() && - ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) && + ( !MainWindow::self->isAFormWindowChild( tqApp->focusWidget() ) && !tqApp->focusWidget()->inherits( "Editor" ) ) ) w->setFocus(); } @@ -582,30 +582,30 @@ TQLineEdit *PropertyTextItem::lined() if ( asciiOnly ) { if ( PropertyItem::name() == "name" ) - lin->setValidator( new AsciiValidator( TQT_TQOBJECT(lin), "ascii_validator" ) ); + lin->setValidator( new AsciiValidator( lin, "ascii_validator" ) ); else lin->setValidator( new AsciiValidator( TQString("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9" "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3" "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc" - "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) ); + "\xbd\xbe\xbf"), lin, "ascii_validator" ) ); } if ( !hasMultiLines ) { lin->hide(); } else { button = new TQPushButton( i18n("..."), box ); button->setFixedWidth( 20 ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( false ); } - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, TQT_SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - TQT_SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -762,12 +762,12 @@ TQLineEdit *PropertyDoubleItem::lined() if ( lin ) return lin; lin = new TQLineEdit( listview->viewport() ); - lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) ); + lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -842,12 +842,12 @@ TQDateEdit *PropertyDateItem::lined() if ( lin ) return lin; lin = new TQDateEdit( listview->viewport() ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -891,13 +891,13 @@ void PropertyDateItem::setValue( const TQVariant &v ) lined()->setDate( v.toDate() ); lined()->blockSignals( false ); } - setText( 1, v.toDate().toString( ::Qt::ISODate ) ); + setText( 1, v.toDate().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateItem::setValue() { - setText( 1, lined()->date().toString( ::Qt::ISODate ) ); + setText( 1, lined()->date().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->date(); PropertyItem::setValue( v ); @@ -917,9 +917,9 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), - this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -966,13 +966,13 @@ void PropertyTimeItem::setValue( const TQVariant &v ) lined()->setTime( v.toTime() ); lined()->blockSignals( false ); } - setText( 1, v.toTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyTimeItem::setValue() { - setText( 1, lined()->time().toString( ::Qt::ISODate ) ); + setText( 1, lined()->time().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->time(); PropertyItem::setValue( v ); @@ -992,9 +992,9 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), - this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -1041,13 +1041,13 @@ void PropertyDateTimeItem::setValue( const TQVariant &v ) lined()->setDateTime( v.toDateTime() ); lined()->blockSignals( false ); } - setText( 1, v.toDateTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toDateTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateTimeItem::setValue() { - setText( 1, lined()->dateTime().toString( ::Qt::ISODate ) ); + setText( 1, lined()->dateTime().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->dateTime(); PropertyItem::setValue( v ); @@ -1070,8 +1070,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( i18n("False" ) ); comb->insertItem( i18n("True" ) ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1163,12 +1163,12 @@ TQSpinBox *PropertyIntItem::spinBox() spinBx = new TQSpinBox( 0, INT_MAX, 1, listview->viewport() ); spinBx->hide(); spinBx->installEventFilter( listview ); - TQObjectList *ol = spinBx->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1252,11 +1252,11 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { - TQObjectList *ol = comb->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *ol = comb->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; @@ -1548,8 +1548,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() { @@ -1637,8 +1637,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1758,8 +1758,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2156,8 +2156,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2194,14 +2194,10 @@ void PropertyPaletteItem::getPalette() return; bool ok = false; TQWidget *w = (TQWidget*)listview->propertyEditor()->widget(); - if ( w->inherits( TQSCROLLVIEW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQScrollView" ) ) w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), -#if defined(TQT_NON_COMMERCIAL) - w->backgroundMode(), listview->topLevelWidget(), -#else w->backgroundMode(), listview, -#endif "choose_palette", listview->propertyEditor()->formWindow() ); if ( !ok ) return; @@ -2309,8 +2305,8 @@ TQComboBox *PropertyCursorItem::combo() cur.setMask( cur ); comb->insertItem( cur, i18n("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2401,16 +2397,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( i18n("Property" ) ); addColumn( i18n("Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( toggleSort() ) ); - connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -2500,7 +2496,7 @@ static TQVariant::Type type_to_variant( const TQString &s ) #ifndef TQT_NO_SQL static bool parent_is_data_aware( TQObject *o ) { - if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQWidget" ) ) return false; TQWidget *w = (TQWidget*)o; TQWidget *p = w->parentWidget(); @@ -2529,7 +2525,7 @@ void PropertyList::setupProperties() TQStringList valueSet; bool parentHasLayout = w->isWidgetType() && - !editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->parentWidget() && + !editor->formWindow()->isMainContainer( (TQWidget*)w ) && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = @@ -2559,7 +2555,7 @@ void PropertyList::setupProperties() } unique.insert( TQString::fromLatin1( it.current() ), true ); if ( editor->widget()->isWidgetType() && - editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)editor->widget()) ) ) { + editor->formWindow()->isMainContainer( (TQWidget*)editor->widget() ) ) { if ( qstrcmp( p->name(), "geometry" ) == 0 ) continue; } else { // hide some toplevel-only stuff @@ -2575,7 +2571,7 @@ void PropertyList::setupProperties() continue; if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 ) continue; - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) { + if ( w->inherits( "TQLayoutWidget" ) || w->inherits( "Spacer" ) ) { if ( qstrcmp( p->name(), "sizePolicy" ) == 0 ) continue; if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) @@ -2618,7 +2614,7 @@ void PropertyList::setupProperties() continue; } } - if ( w->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQActionGroup" ) ) { if ( qstrcmp( p->name(), "usesDropDown" ) == 0 ) continue; if ( qstrcmp( p->name(), "toggleAction" ) == 0 ) @@ -2635,7 +2631,7 @@ void PropertyList::setupProperties() if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || !editor->widget()->parent() || - !editor->widget()->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + !editor->widget()->parent()->inherits( "TQButtonGroup" ) ) continue; } @@ -2654,7 +2650,7 @@ void PropertyList::setupProperties() setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) ) item->setChanged( true, false ); - if ( !editor->widget()->inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) ) { + if ( !editor->widget()->inherits( "TQMultiLineEdit" ) ) { lst.clear(); lst << p->valueToKey( AlignTop ) << p->valueToKey( AlignVCenter ) @@ -2665,7 +2661,7 @@ void PropertyList::setupProperties() if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) ) item->setChanged( true, false ); item = new PropertyBoolItem( this, item, 0, "wordwrap" ); - if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQGroupBox" ) ) item->setVisible( false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) ) @@ -2702,7 +2698,7 @@ void PropertyList::setupProperties() } } - if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && + if ( !w->inherits( "TQSplitter" ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { item = new PropertyIntItem( this, item, 0, "layoutSpacing", true ); setPropertyValue( item ); @@ -2713,7 +2709,7 @@ void PropertyList::setupProperties() } - if ( !w->inherits( "Spacer" ) && !w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( !w->inherits( "Spacer" ) && !w->inherits( "TQLayoutWidget" ) && !w->inherits( "TQAction" ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) ) { item = new PropertyTextItem( this, item, 0, "toolTip", true, false ); setPropertyValue( item ); @@ -2726,15 +2722,15 @@ void PropertyList::setupProperties() } #ifndef TQT_NO_SQL - if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) && - !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) { + if ( !editor->widget()->inherits( "TQDataTable" ) && !editor->widget()->inherits( "TQDataBrowser" ) && + !editor->widget()->inherits( "TQDataView" ) && parent_is_data_aware( editor->widget() ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) item->setChanged( true, false ); } - if ( editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) ) { + if ( editor->widget()->inherits( "TQDataTable" ) || editor->widget()->inherits( "TQDataBrowser" ) || editor->widget()->inherits( "TQDataView" ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) @@ -2780,12 +2776,12 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, switch ( t ) { case TQVariant::String: item = new PropertyTextItem( this, item, 0, name, true, - editor->widget()->inherits( TQLABEL_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQTEXTVIEW_OBJECT_NAME_STRING ) ); + editor->widget()->inherits( "TQLabel" ) || editor->widget()->inherits( "TQTextView" ) ); break; case TQVariant::CString: item = new PropertyTextItem( this, item, 0, name, name == "name" && - TQT_BASE_OBJECT(editor->widget()) == TQT_BASE_OBJECT(editor->formWindow()->mainContainer()), + editor->widget() == editor->formWindow()->mainContainer(), false, true ); break; case TQVariant::Bool: @@ -2885,7 +2881,7 @@ void PropertyList::valueChanged( PropertyItem *i ) TQString pn( i18n("Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, - i->name(), WidgetFactory::property( editor->widget(), i->name() ), + i->name(), WidgetFactory::property( editor->widget(), i->name().latin1() ), i->value(), i->currentItem(), i->currentItemFromObject() ); cmd->execute(); editor->formWindow()->commandHistory()->addCommand( cmd, true ); @@ -2921,15 +2917,15 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return true; PropertyItem *i = (PropertyItem*)currentItem(); - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) &&e->type() == TQEvent::KeyPress ) { + if ( o != this &&e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) && - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(viewport()) ) && + ( o != this || o != viewport() ) && !( ke->state() & ControlButton ) ) { TQApplication::sendEvent( this, (TQKeyEvent*)e ); return true; - } else if ( ( !o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || - ( o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && ( (TQLineEdit*)o )->isReadOnly() ) ) && + } else if ( ( !o->inherits( "TQLineEdit" ) || + ( o->inherits( "TQLineEdit" ) && ( (TQLineEdit*)o )->isReadOnly() ) ) && i && i->hasSubItems() ) { if ( !i->isOpen() && ( ke->key() == Key_Plus || @@ -2939,14 +2935,14 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) ( ke->key() == Key_Minus || ke->key() == Key_Left ) ) i->setOpen( false ); - } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && o->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && o->inherits( "TQComboBox" ) ) { TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 ); TQApplication::sendEvent( o, &ke2 ); return true; } - } else if ( e->type() == TQEvent::FocusOut && o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { + } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) { + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); + } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; switch ( e->type() ) { @@ -2961,7 +2957,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) break; case TQEvent::MouseMove: me = (TQMouseEvent*)e; - if ( me && me->state() & Qt::LeftButton && mousePressed) { + if ( me && me->state() & TQt::LeftButton && mousePressed) { i = (PropertyListItem*) itemAt( me->pos() ); if( i && i == pressItem ) { @@ -2996,7 +2992,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) default: break; } - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) ) { + } else if ( o == header() ) { if ( e->type() == TQEvent::ContextMenu ) { ((TQContextMenuEvent *)e)->accept(); TQPopupMenu menu( 0 ); @@ -3062,7 +3058,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = editor->widget()->metaObject()-> - property( editor->widget()->metaObject()->findProperty( i->name(), true), true ); + property( editor->widget()->metaObject()->findProperty( i->name().latin1(), true), true ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "alignment" ).toInt(); @@ -3085,9 +3081,9 @@ void PropertyList::setPropertyValue( PropertyItem *i ) else i->setValue( TQVariant( false) ); } else if ( i->name() == "layoutSpacing" ) { - ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) ); + ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) ); } else if ( i->name() == "layoutMargin" ) { - ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) ); + ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) ); } else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) { i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) ); } else if ( editor->widget()->inherits( "CustomWidget" ) ) { @@ -3101,9 +3097,9 @@ void PropertyList::setPropertyValue( PropertyItem *i ) if ( p->isSetType() ) ; else if ( p->isEnumType() ) - ( (PropertyListItem*)i )->setCurrentItem( p->valueToKey( editor->widget()->property( i->name() ).toInt() ) ); + ( (PropertyListItem*)i )->setCurrentItem( p->valueToKey( editor->widget()->property( i->name().latin1() ).toInt() ) ); else - i->setValue( editor->widget()->property( i->name() ) ); + i->setValue( editor->widget()->property( i->name().latin1() ) ); } void PropertyList::setCurrentProperty( const TQString &n ) @@ -3284,8 +3280,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( true ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } void EventList::setup() diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h index 00718088..a63b8406 100644 --- a/kommander/editor/propertyeditor.h +++ b/kommander/editor/propertyeditor.h @@ -127,7 +127,7 @@ private: class PropertyTextItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -164,7 +164,7 @@ private: class PropertyBoolItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -189,7 +189,7 @@ private: class PropertyIntItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -215,7 +215,7 @@ private: class PropertyDoubleItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -239,7 +239,7 @@ private: class PropertyListItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -275,7 +275,7 @@ private: class PropertyFontItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -305,7 +305,7 @@ private: class PropertyCoordItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -335,7 +335,7 @@ private: class PropertyColorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -370,7 +370,7 @@ private: class PropertyPixmapItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -401,7 +401,7 @@ private: class PropertySizePolicyItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -428,7 +428,7 @@ private: class PropertyPaletteItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -457,7 +457,7 @@ private: class PropertyCursorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -483,7 +483,7 @@ private: class PropertyDatabaseItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -510,7 +510,7 @@ private: class PropertyList : public TQListView { - Q_OBJECT + TQ_OBJECT public: @@ -566,7 +566,7 @@ private: class PropertyEditor : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: @@ -616,7 +616,7 @@ private: class PropertyDateItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -640,7 +640,7 @@ private: class PropertyTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -664,7 +664,7 @@ private: class PropertyDateTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 6a7cb2a9..76c3e00a 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -19,8 +19,8 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } @@ -90,7 +90,7 @@ void QCompletionEdit::updateListBox() bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popup) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox->viewport()) ) { + if ( o == popup || o == listbox || o == listbox->viewport() ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Enter || ke->key() == Key_Return || ke->key() == Key_Tab ) { @@ -133,7 +133,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) emit chosen( text() ); return true; } - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + } else if ( o == this ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Up || diff --git a/kommander/editor/qcompletionedit.h b/kommander/editor/qcompletionedit.h index 6390bd13..b96de3a9 100644 --- a/kommander/editor/qcompletionedit.h +++ b/kommander/editor/qcompletionedit.h @@ -9,7 +9,7 @@ class TQVBox; class QCompletionEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd ) TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index e08d25c4..32b70e9d 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -166,7 +166,7 @@ bool Resource::load( FormFile *ff ) TQFile f( ff->absFileName() ); f.open( IO_ReadOnly ); - bool b = load( ff, TQT_TQIODEVICE(&f) ); + bool b = load( ff, &f ); f.close(); return b; @@ -195,7 +195,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) formwindow->setProject( MainWindow::self->currProject() ); #endif formwindow->setMainWindow( mainwindow ); - MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) ); + MetaDataBase::addEntry( formwindow ); #ifndef KOMMANDER if (!langIface) { @@ -303,17 +303,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( !customWidgets.isNull() ) loadCustomWidgets( customWidgets, this ); -#if defined (TQT_NON_COMMERCIAL) - bool previewMode = MainWindow::self->isPreviewing(); - TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self); - if ( !w ) - return false; - if ( previewMode ) - w->reparent( MainWindow::self, TQt::WType_TopLevel, w->pos(), true ); -#else if ( !createObject( widget, formwindow) ) return false; -#endif if ( !forwards.isNull() ) { for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) @@ -363,12 +354,12 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) slot.returnType = n.attribute( "returnType", "void" ); if ( slot.returnType.isEmpty() ) slot.returnType = "void"; - slot.slot = n.firstChild().toText().data(); - if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) - MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, + slot.slot = n.firstChild().toText().data().utf8(); + if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) ) + MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); else - MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot, + MetaDataBase::changeSlotAttributes( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); } @@ -386,11 +377,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) loadTabOrder( tabOrder ); if ( formwindow ) { - MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes ); - MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards ); - MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals ); - MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo ); - MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro ); + MetaDataBase::setIncludes( formwindow, metaIncludes ); + MetaDataBase::setForwards( formwindow, metaForwards ); + MetaDataBase::setSignalList( formwindow, metaSignals ); + MetaDataBase::setMetaInfo( formwindow, metaInfo ); + MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro ); } @@ -400,7 +391,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) } if ( formwindow ) { - formwindow->killAccels( TQT_TQOBJECT(formwindow) ); + formwindow->killAccels( formwindow ); if ( formwindow->layout() ) formwindow->layout()->activate(); if ( hadGeometry ) @@ -422,7 +413,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) TQFile f( filename ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) return false; - bool b = save( TQT_TQIODEVICE(&f) ); + bool b = save( &f ); f.close(); return b; } @@ -439,18 +430,18 @@ bool Resource::save( TQIODevice* dev ) ts << formwindow->mainContainer()->property("shebang").toString() << endl; ts << "<!DOCTYPE UI><UI version=\"3.0\" stdsetdef=\"1\">" << endl; saveMetaInfoBefore( ts, 0 ); - saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 ); - if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + saveObject( formwindow->mainContainer(), 0, ts, 0 ); + if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) { saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); - if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); - if ( !MetaDataBase::connections( TQT_TQOBJECT(formwindow) ).isEmpty() || !MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ).isEmpty() ) + if ( !MetaDataBase::connections( formwindow ).isEmpty() || !MetaDataBase::slotList( formwindow ).isEmpty() ) saveConnections( ts, 0 ); saveTabOrder( ts, 0 ); saveMetaInfoAfter( ts, 0 ); @@ -483,7 +474,7 @@ TQString Resource::copy() p = p->parentWidget(); } if ( save ) - saveObject( TQT_TQOBJECT(w), 0, ts, 0 ); + saveObject( w, 0, ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); @@ -545,9 +536,9 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? TQt::Vertical : TQt::Horizontal ); if ( !w ) continue; widgets.append( w ); @@ -559,7 +550,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } firstWidget = firstWidget.nextSibling().toElement(); } @@ -580,7 +571,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea const char* className = WidgetFactory::classNameOf( obj ); if ( obj->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) + if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; @@ -615,9 +606,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea return; } - if ( obj->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQTabWidget" ) ) { TQTabWidget* tw = (TQTabWidget*) obj; - TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING ); + TQObjectList* tmpl = tw->queryList( "TQWidgetStack" ); TQWidgetStack *ws = (TQWidgetStack*)tmpl->first(); TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); for ( int i = 0; i < tb->count(); ++i ) { @@ -627,7 +618,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = ws->widget( t->identifier() ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -642,19 +633,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( t->text() ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } delete tmpl; } else - if ( ::tqqt_cast<TQToolBox*>(obj) ) { + if ( ::tqt_cast<TQToolBox*>(obj) ) { TQToolBox* tb = (TQToolBox*)obj; for ( int i = 0; i < tb->count(); ++i ) { TQWidget *w = tb->item( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -665,7 +656,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<property name=\"backgroundMode\">" << endl; indent++; - saveEnumProperty( TQT_TQOBJECT(w), "backgroundMode", TQVariant::Invalid, ts, indent ); + saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent ); indent--; ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<attribute name=\"label\">" << endl; @@ -673,17 +664,17 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( tb->itemLabel( tb->indexOf(w) ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } } - else if ( obj->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + else if ( obj->inherits( "TQWizard" ) ) { TQWizard* wiz = (TQWizard*)obj; for ( int i = 0; i < wiz->pageCount(); ++i ) { TQWidget *w = wiz->page( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -698,12 +689,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( wiz->title( w ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } - } else if ( obj->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { - saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent ); + } else if ( obj->inherits( "TQMainWindow" ) ) { + saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent ); } else { saveChildrenOf( obj, ts, indent ); } @@ -714,9 +705,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) { - if ( obj->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || obj->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQListBox" ) || obj->inherits( "TQComboBox" ) ) { TQListBox *lb = 0; - if ( obj->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( obj->inherits( "TQListBox" ) ) lb = (TQListBox*)obj; else lb = ( (TQComboBox*)obj )->listBox(); @@ -734,7 +725,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( obj->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQIconView" ) ) { TQIconView *iv = (TQIconView*)obj; TQIconViewItem *i = iv->firstItem(); @@ -750,7 +741,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( obj->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQListView" ) ) { TQListView *lv = (TQListView*)obj; int i; for ( i = 0; i < lv->header()->count(); ++i ) { @@ -779,11 +770,11 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) saveItem( lv->firstChild(), ts, indent - 1 ); } #ifndef TQT_NO_TABLE - else if ( obj->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( obj->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)obj; int i; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); - bool isDataTable = table->inherits( TQDATATABLE_OBJECT_NAME_STRING ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); + bool isDataTable = table->inherits( "TQDataTable" ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { if ( !table->horizontalHeader()->label( i ).isNull() && table->horizontalHeader()->label( i ).toInt() != i + 1 || @@ -798,7 +789,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) if ( table->horizontalHeader()->iconSet( i ) ) pix.append( new TQPixmap( table->horizontalHeader()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); - if ( table->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !columnFields.isEmpty() ) { + if ( table->inherits( "TQDataTable" ) && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; @@ -865,11 +856,11 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons ts << makeIndent( indent ) << "<" + tagname + ">" << saveInCollection( p ) << "</" + tagname + ">" << endl; #ifndef KOMMANDER else if ( formwindow && formwindow->savePixmapInProject() ) - ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapKey( formwindow, p.serialNumber() ) << "</" + tagname + ">" << endl; #endif else - ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() ) << "</" + tagname + ">" << endl; } @@ -881,7 +872,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* TQImage img = loadFromCollection( arg ); TQPixmap pix; pix.convertFromImage( img ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } #ifndef KOMMANDER @@ -895,11 +886,11 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* { TQPixmap pix; pix = PixmapChooser::loadPixmap( "image.xpm" ); - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg ); return pix; } TQPixmap pix = PixmapChooser::loadPixmap( "image.xpm" ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } @@ -937,7 +928,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer TQLayout *layout = 0; QDesignerGridLayout* grid = 0; - if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && + if ( !obj->inherits( "TQSplitter" ) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { @@ -965,7 +956,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // save properties of layout if ( lay != WidgetFactory::NoLayout ) - saveObjectProperties( TQT_TQOBJECT(layout), ts, indent ); + saveObjectProperties( layout, ts, indent ); } @@ -989,11 +980,11 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) if ( !changed.contains( "geometry" ) ) changed << "geometry"; } - } else if ( w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { // #### should be cleaner (RS) + } else if ( w->inherits( "TQLayout" ) ) { // #### should be cleaner (RS) changed << "margin" << "spacing"; } - if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { + if ( w == formwindow->mainContainer() ) { if ( changed.findIndex( "geometry" ) == -1 ) changed << "geometry"; if ( changed.findIndex( "caption" ) == -1 ) @@ -1003,7 +994,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) if ( changed.isEmpty() ) return; - bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && + bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) ); @@ -1017,7 +1008,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) property( w->metaObject()->findProperty( it.current(), true ), true ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; - if ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 && + if ( w->inherits( "TQLabel" ) && qstrcmp( p->name(), "pixmap" ) == 0 && ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) ) continue; if ( w->inherits( "QDesignerMenuBar" ) && @@ -1066,8 +1057,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); - TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name.latin1(), true ), true ); + TQStrList l( p->valueToKeys( w->property( name.latin1() ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { v += l.at( i ); @@ -1079,8 +1070,8 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); - ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name.latin1(), true ), true ); + ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name.latin1() ).toInt() ) << "</enum>" << endl; } void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent ) @@ -1106,11 +1097,11 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; case TQVariant::Int: num = value.toInt(); - if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { + if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; break; @@ -1124,11 +1115,11 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; case TQVariant::UInt: unum = value.toUInt(); - if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { + if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::spacing( WidgetFactory::layoutParent( (TQLayout*)w ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::margin( WidgetFactory::layoutParent( (TQLayout*)w ) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl; break; @@ -1332,10 +1323,10 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( colspan < 1 ) colspan = 1; - TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); + TQString className = e.attribute( "class", "TQWidget" ); if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false )); + obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false ); if ( !obj ) return 0; if ( !mainContainerSet ) { @@ -1344,7 +1335,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay mainContainerSet = true; } w = (TQWidget*)obj; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch ( WidgetFactory::layoutType( layout ) ) { @@ -1368,10 +1359,10 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay layout = 0; if ( w && formwindow ) { - if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + if ( !parent || ( !parent->inherits( "TQToolBox" ) && !parent->inherits( "TQTabWidget" ) && !parent->inherits( "TQWizard" ) ) ) formwindow->insertWidget( w, pasting ); - else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + else if ( parent && ( parent->inherits( "TQToolBox" ) || parent->inherits( "TQTabWidget" ) || parent->inherits( "TQWizard" ) ) ) + MetaDataBase::addEntry( w ); if (w->inherits("Dialog")) dynamic_cast<Dialog*>(w)->setUseInternalParser(false); } @@ -1379,22 +1370,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, w, layout, Qt::Horizontal ); + createSpacer( n, w, layout, TQt::Horizontal ); } else if ( n.tagName() == "widget" ) { createObject( n, w, layout ); } else if ( n.tagName() == "hbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "grid" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "vbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "property" && obj ) { @@ -1402,14 +1393,14 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); } else - if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, v.toString() ); - } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, v.toString() ); } @@ -1428,7 +1419,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay n = n.nextSibling().toElement(); } - return TQT_TQOBJECT(w); + return w; } void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) @@ -1436,7 +1427,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) if ( !widget ) return; - if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { + if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -1470,7 +1461,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) lv->header()->setResizeEnabled( resizeable, i ); } #ifndef TQT_NO_TABLE - else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( widget->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)widget; bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1483,7 +1474,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) bool hasPixmap = false; TQString txt; TQString field; - TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( table ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -1508,7 +1499,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) h->setLabel( i, txt ); if ( !isRow && !field.isEmpty() ) fieldMap.insert( txt, field ); - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), fieldMap ); + MetaDataBase::setColumnFields( table, fieldMap ); } #endif } @@ -1534,17 +1525,17 @@ void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bo void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ) + if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ) return; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQListBox" ) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -1553,7 +1544,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } else { new TQListBoxText( lb, txt ); } - } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQIconView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; @@ -1562,7 +1553,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt TQIconView *iv = (TQIconView*)widget; new TQIconViewItem( iv, txt, pix ); - } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQListView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -1605,7 +1596,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, TQt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -1623,14 +1614,14 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay spacer->setInteraciveMode( false ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) - setObjectProperty( TQT_TQOBJECT(spacer), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( spacer, n.attribute( "name" ), n.firstChild().toElement() ); n = n.nextSibling().toElement(); } spacer->setInteraciveMode( true ); if ( formwindow ) formwindow->insertWidget( spacer, pasting ); if ( layout ) { - if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); else ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, @@ -1644,9 +1635,9 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop.latin1(), true ), true ); - if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) + if ( !obj->inherits( "TQLayout" ) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget(); if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) @@ -1688,7 +1679,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( !p ) { MetaDataBase::setFakeProperty( obj, prop, v ); if ( obj->isWidgetType() ) { - if ( prop == "database" && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(toplevel) ) { + if ( prop == "database" && obj != toplevel ) { TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList(); if ( lst.count() > 2 ) dbControls.insert( obj->name(), lst[ 2 ] ); @@ -1720,13 +1711,13 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD v = TQPalette( p ); } else if ( e.tagName() == "enum" && p && p->isEnumType() ) { TQString key( v.toString() ); - v = TQVariant( p->keyToValue( key ) ); + v = TQVariant( p->keyToValue( key.utf8() ) ); } else if ( e.tagName() == "set" && p && p->isSetType() ) { TQString keys( v.toString() ); TQStringList lst = TQStringList::split( '|', keys ); TQStrList l; for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) - l.append( *it ); + l.append( (*it).utf8() ); v = TQVariant( p->keysToValue( l ) ); } @@ -1743,24 +1734,24 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD } if ( prop == "geometry" ) { - if ( TQT_BASE_OBJECT(obj) == toplevel ) { + if ( obj == toplevel ) { hadGeometry = true; toplevel->resize( v.toRect().size() ); return; - } else if ( TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) { + } else if ( obj == formwindow->mainContainer() ) { hadGeometry = true; formwindow->resize( v.toRect().size() ); return; } } - if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQLayout" ) ) { if ( prop == "spacing" ) { - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); return; } if ( prop == "margin" ) { - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); return; } } @@ -1768,10 +1759,10 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( prop == "name" ) { if ( pasting ) { TQString s = v.toString(); - formwindow->unify( TQT_TQOBJECT(obj), s, true ); - obj->setName( s ); + formwindow->unify( obj, s, true ); + obj->setName( s.utf8() ); return; - } else if ( formwindow && TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) { + } else if ( formwindow && obj == formwindow->mainContainer() ) { formwindow->setName( v.toCString() ); } } @@ -1781,7 +1772,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD sp.setHeightForWidth( ( (TQWidget*)obj )->sizePolicy().hasHeightForWidth() ); } - obj->setProperty( prop, v ); + obj->setProperty( prop.latin1(), v ); } @@ -1876,7 +1867,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ::uncompress( (uchar*) baunzip.data(), &len, (uchar*) ba, data.length()/2 ); img.loadFromData( (const uchar*)baunzip.data(), len, "XPM" ); } else { - img.loadFromData( (const uchar*)ba, data.length() / 2, format ); + img.loadFromData( (const uchar*)ba, data.length() / 2, format.utf8() ); } delete [] ba; @@ -1916,7 +1907,7 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) { ts << makeIndent( indent ) << "<connections>" << endl; indent++; - TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow ); TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; @@ -1925,8 +1916,8 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; - if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) && - !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeSlot( (*it).slot ).latin1() ) ) + if ( formwindow->isMainContainer( (*it).receiver ) && + !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeSlot( (*it).slot ).latin1() ) ) continue; if ( conn.sender->inherits( "CustomWidget" ) ) { @@ -1955,7 +1946,7 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) TQString lang = formwindow->project()->language(); LanguageInterface *iface = langIface; if ( iface && MetaDataBase::hasEvents( lang ) ) { - TQObjectList *l = formwindow->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = formwindow->queryList( "TQWidget" ); l->append( formwindow ); TQPtrList<TQAction> lst = formwindow->actionList(); for ( TQAction *a = lst.first(); a; a = lst.next() ) @@ -1994,12 +1985,12 @@ void Resource::loadConnections( const TQDomElement &e ) if ( n2.tagName() == "sender" ) { conn.sender = 0; TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.sender = TQT_TQOBJECT(toplevel); + if ( name == "this" || toplevel->name() == name ) { + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -2009,13 +2000,13 @@ void Resource::loadConnections( const TQDomElement &e ) conn.sender = formwindow->findAction( name ); } } else if ( n2.tagName() == "signal" ) { - conn.signal = n2.firstChild().toText().data(); + conn.signal = n2.firstChild().toText().data().utf8(); } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.receiver = TQT_TQOBJECT(toplevel); + if ( name == "this" || toplevel->name() == name ) { + conn.receiver = toplevel; } else { - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -2023,15 +2014,15 @@ void Resource::loadConnections( const TQDomElement &e ) } } } else if ( n2.tagName() == "slot" ) { - conn.slot = n2.firstChild().toText().data(); + conn.slot = n2.firstChild().toText().data().utf8(); } n2 = n2.nextSibling().toElement(); } if ( formwindow ) { - if ( TQT_BASE_OBJECT(conn.sender) == TQT_BASE_OBJECT(formwindow) ) - conn.sender = TQT_TQOBJECT(formwindow->mainContainer()); - if ( TQT_BASE_OBJECT(conn.receiver) == TQT_BASE_OBJECT(formwindow) ) - conn.receiver = TQT_TQOBJECT(formwindow->mainContainer()); + if ( conn.sender == formwindow ) + conn.sender = formwindow->mainContainer(); + if ( conn.receiver == formwindow ) + conn.receiver = formwindow->mainContainer(); } if ( conn.sender && conn.receiver ) { #ifndef KOMMANDER @@ -2044,7 +2035,7 @@ void Resource::loadConnections( const TQDomElement &e ) TQStringList::split( ',', conn.slot ), false ); } #else - MetaDataBase::addConnection( formwindow ? TQT_TQOBJECT(formwindow) : TQT_TQOBJECT(toplevel), + MetaDataBase::addConnection( formwindow ? formwindow : toplevel, conn.sender, conn.signal, conn.receiver, conn.slot ); #endif } @@ -2060,12 +2051,12 @@ void Resource::loadConnections( const TQDomElement &e ) slot.returnType = n.attribute( "returnType", "void" ); if ( slot.returnType.isEmpty() ) slot.returnType = "void"; - slot.slot = n.firstChild().toText().data(); - if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) - MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, + slot.slot = n.firstChild().toText().data().utf8(); + if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) ) + MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); else - MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot, + MetaDataBase::changeSlotAttributes( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); } @@ -2233,7 +2224,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) TQString name = n.firstChild().toText().data(); if ( name.isEmpty() ) continue; - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) { TQWidget *w = (TQWidget*)l->first(); @@ -2254,7 +2245,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(formwindow)); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(formwindow); TQString cn = formwindow->name(); ts << makeIndent(indent) << "<class>" << entitize(cn) << "</class>" << endl; if (!info.comment.isEmpty()) @@ -2269,8 +2260,8 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) ); - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow ); TQString extensionInclude; bool needExtensionInclude = false; if ( !includes.isEmpty() || needExtensionInclude ) { @@ -2291,7 +2282,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</includes>" << endl; } - TQStringList forwards = MetaDataBase::forwards( TQT_TQOBJECT(formwindow) ); + TQStringList forwards = MetaDataBase::forwards( formwindow ); if ( !forwards.isEmpty() ) { ts << makeIndent( indent ) << "<forwards>" << endl; indent++; @@ -2300,7 +2291,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</forwards>" << endl; } - TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) ); + TQStringList sigs = MetaDataBase::signalList( formwindow ); if ( !sigs.isEmpty() ) { ts << makeIndent( indent ) << "<signals>" << endl; indent++; @@ -2309,7 +2300,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</signals>" << endl; - TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( formwindow ); if ( !slotList.isEmpty() ) { ts << makeIndent( indent ) << "<slots>" << endl; indent++; @@ -2339,7 +2330,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ; else ts << makeIndent( indent ) << "<pixmapfunction>" << formwindow->pixmapLoaderFunction() << "</pixmapfunction>" << endl; - if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() ) + if ( !( exportMacro = MetaDataBase::exportMacro( formwindow->mainContainer() ) ).isEmpty() ) ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl; if ( formwindow ) ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing() @@ -2374,10 +2365,10 @@ void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; TQAction *ac = (TQAction*)o; - bool isGroup = ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ); + bool isGroup = ac->inherits( "TQActionGroup" ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2406,7 +2397,7 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts TQPtrListIterator<TQAction> it( actions ); while ( it.current() ) { TQAction *a = it.current(); - bool isGroup = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ); + bool isGroup = a->inherits( "TQActionGroup" ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2450,7 +2441,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new QDesignerActionGroup( parent ); @@ -2472,7 +2463,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) formwindow->actionList().append( a ); } } @@ -2482,9 +2473,9 @@ void Resource::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } n = n.nextSibling().toElement(); } @@ -2505,7 +2496,7 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) continue; ts << makeIndent( indent ) << "<toolbar dock=\"" << i << "\">" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(tb), ts, indent ); + saveObjectProperties( tb, ts, indent ); TQPtrList<TQAction> actionList = ( (QDesignerToolBar*)tb )->insertedActions(); for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( a->inherits( "QSeparatorAction" ) ) { @@ -2514,14 +2505,14 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) if ( a->inherits( "QDesignerAction" ) && !( (QDesignerAction*)a )->supportsMenu() ) { TQWidget *w = ( (QDesignerAction*)a )->widget(); ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl; + << WidgetFactory::classNameOf( w ) << "\">" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(w), ts, indent ); - const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + saveObjectProperties( w, ts, indent ); + const char *className = WidgetFactory::classNameOf( w ); if ( w->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) - saveItems( TQT_TQOBJECT(w), ts, indent ); + if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) + saveItems( w, ts, indent ); indent--; ts << makeIndent( indent ) << "</widget>" << endl; } else { @@ -2539,11 +2530,11 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) { - if ( !mw->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) + if ( !mw->child( 0, "TQMenuBar" ) ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(mw->menuBar()), ts, indent ); + saveObjectProperties( mw->menuBar(), ts, indent ); for ( int i = 0; i < (int)mw->menuBar()->count(); ++i ) { ts << makeIndent( indent ) << "<item text=\"" << entitize( mw->menuBar()->text( mw->menuBar()->idAt( i ) ) ) @@ -2589,12 +2580,12 @@ void Resource::loadToolBars( const TQDomElement &e ) tb->addAction( a ); } else if ( n2.tagName() == "widget" ) { TQWidget *w = (TQWidget*)createObject( n2, tb ); - QDesignerAction *a = new QDesignerAction( w, TQT_TQOBJECT(tb) ); + QDesignerAction *a = new QDesignerAction( w, tb ); a->addTo( tb ); tb->addAction( a ); tb->installEventFilters( w ); } else if ( n2.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setObjectProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -2611,7 +2602,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "item" ) { QDesignerPopupMenu *popup = new QDesignerPopupMenu( mw ); - popup->setName( n.attribute( "name" ) ); + popup->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -2629,7 +2620,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) } mb->insertItem( n.attribute( "text" ), popup ); } else if ( n.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } n = n.nextSibling().toElement(); } @@ -2672,7 +2663,7 @@ void Resource::saveFormCode() LanguageInterface::Function func; func.name = slot.slot; func.body = *it; - func.comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), func.name ); + func.comments = MetaDataBase::functionComments( formwindow, func.name ); func.returnType = slot.returnType; funcs.append( func ); } @@ -2725,7 +2716,7 @@ void Resource::loadFunctions( const TQDomElement &e ) } n = n.nextSibling().toElement(); } - MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() ); + MetaDataBase::setFunctionBodies( formwindow, bodies, TQString(), TQString() ); if ( !bodies.isEmpty() ) { LanguageInterface *iface = langIface; if ( !iface ) @@ -2740,7 +2731,7 @@ void Resource::loadFunctions( const TQDomElement &e ) #endif continue; TQString sl( (*it).slot ); - TQString comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), sl ); + TQString comments = MetaDataBase::functionComments( formwindow, sl ); if ( !comments.isEmpty() ) code += comments + "\n"; code += iface->createFunctionStart( formwindow->name(), make_function_pretty( sl ), @@ -2821,25 +2812,25 @@ void Resource::loadExtraSource() for ( TQValueList<LanguageInterface::Function>::Iterator fit = functions.begin(); fit != functions.end(); ++fit ) { - if ( MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1() ) ) - MetaDataBase::changeSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), (*fit).name.latin1() ); + if ( MetaDataBase::hasSlot( formwindow, (*fit).name.latin1() ) ) + MetaDataBase::changeSlot( formwindow, (*fit).name.latin1(), (*fit).name.latin1() ); else - MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType ); - MetaDataBase::setFunctionComments( TQT_TQOBJECT(formwindow), (*fit).name, (*fit).comments ); + MetaDataBase::addSlot( formwindow, (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType ); + MetaDataBase::setFunctionComments( formwindow, (*fit).name, (*fit).comments ); bodies.insert( MetaDataBase::normalizeSlot( (*fit).name ), (*fit).body ); } - MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() ); + MetaDataBase::setFunctionBodies( formwindow, bodies, TQString(), TQString() ); TQStringList v = MetaDataBase::variables( formwindow ); TQStringList::Iterator vit; for ( vit = vars.begin(); vit != vars.end(); ++vit ) v << *vit; - MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), v ); + MetaDataBase::setVariables( formwindow, v ); TQStringList f = MetaDataBase::forwards( formwindow ); for ( vit = forwards.begin(); vit != forwards.end(); ++vit ) f << *vit; - MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), f ); + MetaDataBase::setForwards( formwindow, f ); TQValueList<MetaDataBase::Include> incls = MetaDataBase::includes( formwindow ); for ( vit = includesImpl.begin(); vit != includesImpl.end(); ++vit ) { @@ -2854,6 +2845,6 @@ void Resource::loadExtraSource() inc.location = "in declaration"; incls << inc; } - MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), incls ); + MetaDataBase::setIncludes( formwindow, incls ); } #endif diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index 8aa6fdc7..4f6773dc 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -102,7 +102,7 @@ void SizeHandle::paintEvent( TQPaintEvent * ) void SizeHandle::mousePressEvent( TQMouseEvent *e ) { - if ( !widget || e->button() != Qt::LeftButton || !active ) + if ( !widget || e->button() != TQt::LeftButton || !active ) return; oldPressPos = e->pos(); geom = origGeom = TQRect( widget->pos(), widget->size() ); @@ -110,7 +110,7 @@ void SizeHandle::mousePressEvent( TQMouseEvent *e ) void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) { - if ( !widget || ( e->state() & Qt::LeftButton ) != Qt::LeftButton || !active ) + if ( !widget || ( e->state() & TQt::LeftButton ) != TQt::LeftButton || !active ) return; TQPoint rp = mapFromGlobal( e->globalPos() ); TQPoint d = oldPressPos - rp; @@ -222,7 +222,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton || !active ) + if ( e->button() != TQt::LeftButton || !active ) return; formWindow->sizePreview()->hide(); @@ -231,7 +231,7 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) formWindow, widget, origGeom, widget->geometry() ) ); - formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow->emitUpdateProperties( widget ); } void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height ) diff --git a/kommander/editor/sizehandle.h b/kommander/editor/sizehandle.h index 28d18063..394788ed 100644 --- a/kommander/editor/sizehandle.h +++ b/kommander/editor/sizehandle.h @@ -32,7 +32,7 @@ class TQPaintEvent; class SizeHandle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index 55c8945f..c35ce642 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -38,7 +38,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( true ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } @@ -145,12 +145,12 @@ void StyledButton::resizeEvent( TQResizeEvent* e ) void StyledButton::drawButton( TQPainter *paint ) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), + style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised); drawButtonLabel(paint); if (hasFocus()) - style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, + style().drawPrimitive(TQStyle::PE_FocusRect, paint, style().subRect(TQStyle::SR_PushButtonFocusRect, this), colorGroup(), TQStyle::Style_Default); } diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h index a090b8b5..1c46472c 100644 --- a/kommander/editor/styledbutton.h +++ b/kommander/editor/styledbutton.h @@ -30,7 +30,7 @@ class FormWindow; class StyledButton : public TQButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor color READ color WRITE setColor ) diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 25883793..137934d9 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -28,19 +28,19 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); - if ( !editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( !editTable->inherits( "TQDataTable" ) ) { labelFields->hide(); comboFields->hide(); labelTable->hide(); labelTableValue->hide(); } #ifndef TQT_NO_SQL - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { // ## why does this behave weird? // TabWidget->removePage( rows_tab ); // rows_tab->hide(); @@ -48,7 +48,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f TabWidget->setTabEnabled( rows_tab, false ); } - if ( formWindow->project() && editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( formWindow->project() && editTable->inherits( "TQDataTable" ) ) { TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList(); if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) { TQStringList fields; @@ -131,7 +131,7 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) editColumnText->blockSignals( false ); #ifndef TQT_NO_TABLE - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); @@ -215,7 +215,7 @@ void TableEditor::newColumnClicked() TQListBoxItem *item = listColumns->item( listColumns->count() - 1 ); listColumns->setCurrentItem( item ); listColumns->setSelected( item, true ); - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { comboFields->setFocus(); } else { editColumnText->setFocus(); @@ -381,7 +381,7 @@ void TableEditor::readFromTable() #ifndef TQT_NO_TABLE TQHeader *cols = editTable->horizontalHeader(); table->setNumCols( cols->count() ); - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(editTable) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable ); for ( int i = 0; i < cols->count(); ++i ) { if ( editTable->horizontalHeader()->iconSet( i ) ) { table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ), diff --git a/kommander/editor/tableeditorimpl.h b/kommander/editor/tableeditorimpl.h index 0342ed60..70b61763 100644 --- a/kommander/editor/tableeditorimpl.h +++ b/kommander/editor/tableeditorimpl.h @@ -10,7 +10,7 @@ class FormWindow; class TableEditor : public TableEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp index 850e7eb2..7782fff3 100644 --- a/kommander/editor/timestamp.cpp +++ b/kommander/editor/timestamp.cpp @@ -28,7 +28,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( false ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/kommander/editor/timestamp.h b/kommander/editor/timestamp.h index cc867ad8..bbf11cff 100644 --- a/kommander/editor/timestamp.h +++ b/kommander/editor/timestamp.h @@ -27,7 +27,7 @@ class TimeStamp : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp index e3ab6de0..a57c74f1 100644 --- a/kommander/editor/widgetdatabase.cpp +++ b/kommander/editor/widgetdatabase.cpp @@ -134,35 +134,35 @@ void WidgetDatabase::setupDataBase( int id ) /* Designer widgets */ r = new WidgetDatabaseRecord; r->iconName = "pushbutton.xpm"; - r->name = TQPUSHBUTTON_OBJECT_NAME_STRING; + r->name = "TQPushButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Push Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "toolbutton.xpm"; - r->name = TQTOOLBUTTON_OBJECT_NAME_STRING; + r->name = "TQToolButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Tool Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "radiobutton.xpm"; - r->name = TQRADIOBUTTON_OBJECT_NAME_STRING; + r->name = "TQRadioButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Radio Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "checkbox.xpm"; - r->name = TQCHECKBOX_OBJECT_NAME_STRING; + r->name = "TQCheckBox"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Check Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "groupbox.xpm"; - r->name = TQGROUPBOX_OBJECT_NAME_STRING; + r->name = "TQGroupBox"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Group Box"); r->isContainer = true; @@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "buttongroup.xpm"; - r->name = TQBUTTONGROUP_OBJECT_NAME_STRING; + r->name = "TQButtonGroup"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Button Group"); r->isContainer = true; @@ -178,7 +178,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "frame.xpm"; - r->name = TQFRAME_OBJECT_NAME_STRING; + r->name = "TQFrame"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Frame"); r->isContainer = true; @@ -186,7 +186,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "tabwidget.xpm"; - r->name = TQTABWIDGET_OBJECT_NAME_STRING; + r->name = "TQTabWidget"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Tabwidget"); r->isContainer = true; @@ -194,14 +194,14 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "listbox.xpm"; - r->name = TQLISTBOX_OBJECT_NAME_STRING; + r->name = "TQListBox"; r->group = widgetGroup("Views"); r->toolTip = i18n("List Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "listview.xpm"; - r->name = TQLISTVIEW_OBJECT_NAME_STRING; + r->name = "TQListView"; r->group = widgetGroup("Views"); r->toolTip = i18n("List View"); append(r); @@ -209,7 +209,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconName = "iconview.xpm"; - r->name = TQICONVIEW_OBJECT_NAME_STRING; + r->name = "TQIconView"; r->group = widgetGroup("Views"); r->toolTip = i18n("Icon View"); append(r); @@ -218,7 +218,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconName = "table.xpm"; - r->name = TQTABLE_OBJECT_NAME_STRING; + r->name = "TQTable"; r->group = widgetGroup("Views"); r->toolTip = i18n("Table"); append(r); @@ -228,7 +228,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "datatable.xpm"; r->includeFile = "tqdatatable.h"; - r->name = TQDATATABLE_OBJECT_NAME_STRING; + r->name = "TQDataTable"; r->group = widgetGroup("Database"); r->toolTip = i18n("Data Table"); append(r); @@ -236,21 +236,21 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "lineedit.xpm"; - r->name = TQLINEEDIT_OBJECT_NAME_STRING; + r->name = "TQLineEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Line Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "spinbox.xpm"; - r->name = TQSPINBOX_OBJECT_NAME_STRING; + r->name = "TQSpinBox"; r->group = widgetGroup("Input"); r->toolTip = i18n("Spin Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "dateedit.xpm"; - r->name = TQDATEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Date Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -258,7 +258,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "timeedit.xpm"; - r->name = TQTIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQTimeEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Time Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -266,7 +266,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "datetimeedit.xpm"; - r->name = TQDATETIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateTimeEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Date-Time Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -274,77 +274,77 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "multilineedit.xpm"; - r->name = TQMULTILINEEDIT_OBJECT_NAME_STRING; + r->name = "TQMultiLineEdit"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Multi Line Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "richtextedit.xpm"; - r->name = TQTEXTEDIT_OBJECT_NAME_STRING; + r->name = "TQTextEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Rich Text Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "combobox.xpm"; - r->name = TQCOMBOBOX_OBJECT_NAME_STRING; + r->name = "TQComboBox"; r->group = widgetGroup("Input"); r->toolTip = i18n("Combo Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "slider.xpm"; - r->name = TQSLIDER_OBJECT_NAME_STRING; + r->name = "TQSlider"; r->group = widgetGroup("Input"); r->toolTip = i18n("Slider"); append(r); r = new WidgetDatabaseRecord; r->iconName = "scrollbar.xpm"; - r->name = TQSCROLLBAR_OBJECT_NAME_STRING; + r->name = "TQScrollBar"; r->group = widgetGroup("Input"); r->toolTip = i18n("Scrollbar"); append(r); r = new WidgetDatabaseRecord; r->iconName = "dial.xpm"; - r->name = TQDIAL_OBJECT_NAME_STRING; + r->name = "TQDial"; r->group = widgetGroup("Input"); r->toolTip = i18n("Dial"); append(r); r = new WidgetDatabaseRecord; r->iconName = "label.xpm"; - r->name = TQLABEL_OBJECT_NAME_STRING; + r->name = "TQLabel"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Label"); append(r); r = new WidgetDatabaseRecord; r->iconName = "lcdnumber.xpm"; - r->name = TQLCDNUMBER_OBJECT_NAME_STRING; + r->name = "TQLCDNumber"; r->group = widgetGroup("Display"); r->toolTip = i18n("LCD Number"); append(r); r = new WidgetDatabaseRecord; r->iconName = "progress.xpm"; - r->name = TQPROGRESSBAR_OBJECT_NAME_STRING; + r->name = "TQProgressBar"; r->group = widgetGroup("Display"); r->toolTip = i18n("Progress Bar"); append(r); r = new WidgetDatabaseRecord; r->iconName = "textview.xpm"; - r->name = TQTEXTVIEW_OBJECT_NAME_STRING; + r->name = "TQTextView"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Text View"); append(r); r = new WidgetDatabaseRecord; r->iconName = "textbrowser.xpm"; - r->name = TQTEXTBROWSER_OBJECT_NAME_STRING; + r->name = "TQTextBrowser"; r->group = widgetGroup("Display"); r->toolTip = i18n("Text Browser"); append(r); @@ -359,19 +359,19 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQWIDGET_OBJECT_NAME_STRING; + r->name = "TQWidget"; r->isForm = true; r->group = widgetGroup("Forms"); append(r); r = new WidgetDatabaseRecord; - r->name = TQDIALOG_OBJECT_NAME_STRING; + r->name = "TQDialog"; r->group = widgetGroup("Forms"); r->isForm = true; append(r); r = new WidgetDatabaseRecord; - r->name = TQWIZARD_OBJECT_NAME_STRING; + r->name = "TQWizard"; r->group = widgetGroup("Forms"); r->isContainer = true; append(r); @@ -383,14 +383,14 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQLAYOUTWIDGET_OBJECT_NAME_STRING; + r->name = "TQLayoutWidget"; r->group = widgetGroup("Temp"); r->includeFile = ""; r->isContainer = true; append(r); r = new WidgetDatabaseRecord; - r->name = TQSPLITTER_OBJECT_NAME_STRING; + r->name = "TQSplitter"; r->group = widgetGroup("Temp"); r->includeFile = "tqsplitter.h"; r->isContainer = true; @@ -419,7 +419,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = ""; - r->name = TQMAINWINDOW_OBJECT_NAME_STRING; + r->name = "TQMainWindow"; r->includeFile = "tqmainwindow.h"; r->group = widgetGroup("Temp"); r->isContainer = true; @@ -427,7 +427,7 @@ void WidgetDatabase::setupDataBase( int id ) #ifndef TQT_NO_SQL r = new WidgetDatabaseRecord; - r->name = TQDATABROWSER_OBJECT_NAME_STRING; + r->name = "TQDataBrowser"; r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup("Database"); r->toolTip = "Data Browser"; @@ -436,7 +436,7 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQDATAVIEW_OBJECT_NAME_STRING; + r->name = "TQDataView"; r->includeFile = "tqdataview.h"; r->group = widgetGroup("Database"); r->toolTip = "Data View"; @@ -849,7 +849,7 @@ TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); TQString n = className( id ); - if ( n == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) + if ( n == "TQLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' ) n = n.mid( 1 ); @@ -871,7 +871,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) if ( i ) return *i; if ( name == "FormWindow" ) - return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ); + return idFromClassName( "TQLayoutWidget" ); #ifdef UIC setupDataBase( -2 ); i = className2Id->find( name ); @@ -916,8 +916,8 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->find( g ) == -1 ) - wGroups->append( g ); + if ( wGroups->find( g.utf8() ) == -1 ) + wGroups->append( g.utf8() ); return g; } @@ -957,7 +957,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->find( g ) == -1; + return invisibleGroups->find( g.utf8() ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 59085749..f4b7eaac 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -18,6 +18,10 @@ ** **********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tdelocale.h> #include <kommanderfactory.h> @@ -184,7 +188,7 @@ int QDesignerTabWidget::count() const bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return false; + if ( o != tabBar() ) return false; switch ( e->type() ) { case TQEvent::MouseButtonPress: { @@ -413,7 +417,7 @@ void WidgetFactory::saveDefaultProperties( TQWidget *w, int id ) static void saveChangedProperties( TQWidget *w, int id ) { - TQStringList l = MetaDataBase::changedProperties( TQT_TQOBJECT(w) ); + TQStringList l = MetaDataBase::changedProperties( w ); changedProperties->insert( id, l ); } @@ -464,7 +468,7 @@ int EditorTabWidget::count() const bool EditorTabWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return false; + if ( o != tabBar() ) return false; switch ( e->type() ) { case TQEvent::MouseButtonPress: { @@ -636,7 +640,7 @@ int EditorToolBox::count() const created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, TQt::Orientation orient ) { TQString n = WidgetDatabase::className(id); //tqDebug("Trying to create '%s'", n.latin1()); @@ -658,7 +662,7 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo w = createCustomWidget(parent, name ? name : s, MetaDataBase::customWidget(id)); if (!w) return 0; - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); if (!defaultProperties->contains(id)) saveDefaultProperties(w, id); @@ -677,55 +681,55 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; - if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && - ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || + if ( widget && !widget->inherits( "TQLayoutWidget" ) && + ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQToolBox" ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQMainWindow" ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); + MetaDataBase::addEntry( widget ); - if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); gb->layout()->setMargin( 0 ); gb->layout()->setSpacing( 0 ); TQLayout *l; switch ( type ) { case HBox: l = new TQHBoxLayout( gb->layout() ); - MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); + MetaDataBase::setMargin( gb, margin ); + MetaDataBase::setSpacing( gb, spacing ); l->setAlignment( AlignTop ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case VBox: l = new TQVBoxLayout( gb->layout(), spacing ); - MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); + MetaDataBase::setMargin( gb, margin ); + MetaDataBase::setSpacing( gb, spacing ); l->setAlignment( AlignTop ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case Grid: l = new QDesignerGridLayout( gb->layout() ); - MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); + MetaDataBase::setMargin( gb, margin ); + MetaDataBase::setSpacing( gb, spacing ); l->setAlignment( AlignTop ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; default: return 0; @@ -736,24 +740,24 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou switch ( type ) { case HBox: l = new TQHBoxLayout( layout ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case VBox: l = new TQVBoxLayout( layout ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case Grid: { l = new QDesignerGridLayout( layout ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; } default: @@ -764,39 +768,39 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou switch ( type ) { case HBox: l = new TQHBoxLayout( widget ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing ); + MetaDataBase::setMargin( widget, margin ); + MetaDataBase::setSpacing( widget, spacing ); } else { l->setMargin( margin ); l->setSpacing( margin ); } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case VBox: l = new TQVBoxLayout( widget ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing ); + MetaDataBase::setMargin( widget, margin ); + MetaDataBase::setSpacing( widget, spacing ); } else { l->setMargin( margin ); l->setSpacing( margin ); } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case Grid: { l = new QDesignerGridLayout( widget ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing ); + MetaDataBase::setMargin( widget, margin ); + MetaDataBase::setSpacing( widget, spacing ); } else { l->setMargin( margin ); l->setSpacing( margin ); } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; } default: @@ -811,13 +815,13 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) if ( !widget ) return; - if ( widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQMainWindow" ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); delete widget->layout(); } @@ -830,9 +834,9 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) */ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, - const TQRect *r, Qt::Orientation orient ) + const TQRect *r, TQt::Orientation orient ) { - if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) + if (className == "TQPushButton") { TQPushButton *b = 0; if (init) @@ -844,9 +848,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare b = new QDesignerPushButton(parent, name); } TQWidget *w = find_formwindow(b); - b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits(TQDIALOG_OBJECT_NAME_STRING)); + b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits("TQDialog")); return b; - } else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) + } else if (className == "TQToolButton") { if (init) { @@ -855,7 +859,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return tb; } return new QDesignerToolButton(parent, name); - } else if (className == TQCHECKBOX_OBJECT_NAME_STRING) + } else if (className == "TQCheckBox") { if (init) { @@ -864,7 +868,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return cb; } return new QDesignerCheckBox(parent, name); - } else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) + } else if (className == "TQRadioButton") { if (init) { @@ -873,17 +877,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return rb; } return new QDesignerRadioButton(parent, name); - } else if (className == TQGROUPBOX_OBJECT_NAME_STRING) + } else if (className == "TQGroupBox") { if (init) return new TQGroupBox(TQString::fromLatin1(name), parent, name); return new TQGroupBox(parent, name); - } else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) + } else if (className == "TQButtonGroup") { if (init) return new TQButtonGroup(TQString::fromLatin1(name), parent, name); return new TQButtonGroup(parent, name); - } else if (className == TQICONVIEW_OBJECT_NAME_STRING) + } else if (className == "TQIconView") { #if !defined(TQT_NO_ICONVIEW) TQIconView *iv = new TQIconView(parent, name); @@ -893,7 +897,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare #else return 0; #endif - } else if (className == TQTABLE_OBJECT_NAME_STRING) + } else if (className == "TQTable") { #if !defined(TQT_NO_TABLE) if (init) @@ -903,20 +907,20 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return 0; #endif #ifndef TQT_NO_SQL - } else if (className == TQDATATABLE_OBJECT_NAME_STRING) + } else if (className == "TQDataTable") { return new TQDataTable(parent, name); #endif //TQT_NO_SQL - } else if (className == TQDATEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQDateEdit") { return new TQDateEdit(parent, name); - } else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQTimeEdit") { return new TQTimeEdit(parent, name); - } else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQDateTimeEdit") { return new TQDateTimeEdit(parent, name); - } else if (className == TQLISTBOX_OBJECT_NAME_STRING) + } else if (className == "TQListBox") { TQListBox *lb = new TQListBox(parent, name); if (init) @@ -925,7 +929,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare lb->setCurrentItem(0); } return lb; - } else if (className == TQLISTVIEW_OBJECT_NAME_STRING) + } else if (className == "TQListView") { TQListView *lv = new TQListView(parent, name); lv->setSorting(-1); @@ -935,29 +939,29 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare lv->setCurrentItem(new TQListViewItem(lv, i18n("New Item"))); } return lv; - } else if (className == TQLINEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQLineEdit") return new TQLineEdit(parent, name); - else if (className == TQSPINBOX_OBJECT_NAME_STRING) + else if (className == "TQSpinBox") return new TQSpinBox(parent, name); - else if (className == TQSPLITTER_OBJECT_NAME_STRING) + else if (className == "TQSplitter") return new TQSplitter(parent, name); - else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQMultiLineEdit") return new TQMultiLineEdit(parent, name); - else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) + else if (className == "TQTextEdit") return new TQTextEdit(parent, name); - else if (className == TQLABEL_OBJECT_NAME_STRING) + else if (className == "TQLabel") { QDesignerLabel *l = new QDesignerLabel(parent, name); if (init) { l->setText(TQString::fromLatin1(name)); - MetaDataBase::addEntry(TQT_TQOBJECT(l)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "text", true); + MetaDataBase::addEntry(l); + MetaDataBase::setPropertyChanged(l, "text", true); } return l; - } else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) + } else if (className == "TQLayoutWidget") return new TQLayoutWidget(parent, name); - else if (className == TQTABWIDGET_OBJECT_NAME_STRING) + else if (className == "TQTabWidget") { TQTabWidget *tw = new QDesignerTabWidget(parent, name); if (init) @@ -965,32 +969,32 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 1")); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 2")); - MetaDataBase::addEntry(TQT_TQOBJECT(tw)); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(tw); + MetaDataBase::addEntry(w); } return tw; - } else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) + } else if (className == "TQComboBox") { return new TQComboBox(false, parent, name); - } else if (className == TQWIDGET_OBJECT_NAME_STRING) + } else if (className == "TQWidget") { if (parent && - (parent->inherits("FormWindow") || parent->inherits(TQWIZARD_OBJECT_NAME_STRING) - || parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || parent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))) + (parent->inherits("FormWindow") || parent->inherits("TQWizard") + || parent->inherits("TQTabWidget") || parent->inherits("TQToolBox") || parent->inherits("TQMainWindow"))) { FormWindow *fw = find_formwindow(parent); if (fw) { QDesignerWidget *dw = new QDesignerWidget(fw, parent, name); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); return dw; } } return new TQWidget(parent, name); - } else if (className == TQDIALOG_OBJECT_NAME_STRING) + } else if (className == "TQDialog") { TQDialog *dia = 0; if (parent && parent->inherits("FormWindow")) @@ -1000,7 +1004,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (parent && !parent->inherits("MainWindow")) dia->reparent(parent, TQPoint(0, 0), true); return dia; - } else if (className == TQWIZARD_OBJECT_NAME_STRING) + } else if (className == "TQWizard") { TQWizard *wiz = new QDesignerWizard(parent, name); if (parent && !parent->inherits("MainWindow")) @@ -1010,37 +1014,37 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init && parent && parent->inherits("FormWindow")) { QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } else if (className == "Spacer") { Spacer *s = new Spacer(parent, name); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "sizeType", true); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); + MetaDataBase::setPropertyChanged(s, "sizeType", true); if (!r) return s; if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() < r->height()) - s->setOrientation(Qt::Vertical); + s->setOrientation(TQt::Vertical); else - s->setOrientation(Qt::Horizontal); + s->setOrientation(TQt::Horizontal); return s; - } else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) + } else if (className == "TQLCDNumber") return new TQLCDNumber(parent, name); - else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) + else if (className == "TQProgressBar") return new TQProgressBar(parent, name); - else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) + else if (className == "TQTextView") return new TQTextView(parent, name); - else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) + else if (className == "TQTextBrowser") return new TQTextBrowser(parent, name); - else if (className == TQDIAL_OBJECT_NAME_STRING) + else if (className == "TQDial") return new TQDial(parent, name); - else if (className == TQSLIDER_OBJECT_NAME_STRING) + else if (className == "TQSlider") { TQSlider *s = new TQSlider(parent, name); if (!r) @@ -1048,11 +1052,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() > r->height()) - s->setOrientation(Qt::Horizontal); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); + s->setOrientation(TQt::Horizontal); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); return s; - } else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) + } else if (className == "TQScrollBar") { TQScrollBar *s = new TQScrollBar(parent, name); if (!r) @@ -1060,11 +1064,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() > r->height()) - s->setOrientation(Qt::Horizontal); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); + s->setOrientation(TQt::Horizontal); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); return s; - } else if (className == TQFRAME_OBJECT_NAME_STRING) + } else if (className == "TQFrame") { if (!init) return new TQFrame(parent, name); @@ -1074,37 +1078,37 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare } else if (className == "Line") { Line *l = new Line(parent, name); - MetaDataBase::addEntry(TQT_TQOBJECT(l)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "orientation", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "frameShadow", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "frameShape", true); + MetaDataBase::addEntry(l); + MetaDataBase::setPropertyChanged(l, "orientation", true); + MetaDataBase::setPropertyChanged(l, "frameShadow", true); + MetaDataBase::setPropertyChanged(l, "frameShape", true); if (!r) return l; if (!r->isValid() || r->width() < 2 && r->height() < 2) l->setOrientation(orient); else if (r->width() < r->height()) - l->setOrientation(Qt::Vertical); + l->setOrientation(TQt::Vertical); return l; - } else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) + } else if (className == "TQMainWindow") { TQMainWindow *mw = new KmdrMainWindow(parent, name, 0); mw->setDockEnabled(TQt::DockMinimized, false); QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, mw, "central widget"); mw->setDockMenuEnabled(false); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); mw->setCentralWidget(dw); (void) mw->statusBar(); dw->show(); return mw; } #ifndef TQT_NO_SQL - else if (className == TQDATABROWSER_OBJECT_NAME_STRING) + else if (className == "TQDataBrowser") { TQWidget *w = new QDesignerDataBrowser(parent, name); if (parent) w->reparent(parent, TQPoint(0, 0), true); return w; - } else if (className == TQDATAVIEW_OBJECT_NAME_STRING) + } else if (className == "TQDataView") { TQWidget *w = new QDesignerDataView(parent, name); if (parent) @@ -1152,10 +1156,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init && parent && parent->inherits("FormWindow")) { QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page 1")); wiz->addPage(dw, i18n("Page 2")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } @@ -1167,11 +1171,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 1")); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 2")); - MetaDataBase::addEntry(TQT_TQOBJECT(tw)); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(tw); + MetaDataBase::addEntry(w); } return tw; } else if (className == "ToolBox") @@ -1182,11 +1186,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox"); tw->addItem(w, i18n("Page 1")); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox"); tw->addItem(w, i18n("Page 2")); - MetaDataBase::addEntry(TQT_TQOBJECT(tw)); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(tw); + MetaDataBase::addEntry(w); } return tw; } @@ -1244,9 +1248,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() > r->height()) - s->setOrientation(Qt::Horizontal); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); + s->setOrientation(TQt::Horizontal); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); return s; } #endif @@ -1266,37 +1270,37 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay { layout = 0; - if ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQTabWidget" ) ) w = ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQToolBox" ) ) w = ((TQToolBox*)w)->currentItem(); - if ( w && w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQWizard" ) ) w = ((TQWizard*)w)->currentPage(); - if ( w && w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQMainWindow" ) ) w = ((TQMainWindow*)w)->centralWidget(); - if ( w && w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQWidgetStack" ) ) w = ((TQWidgetStack*)w)->visibleWidget(); - if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) - return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; + if ( w && w->inherits( "TQSplitter" ) ) + return ( (TQSplitter*)w )->orientation() ==TQt::Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; TQLayout *lay = w->layout(); - if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { - TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING ); + if ( w->inherits( "TQGroupBox" ) ) { + TQObjectList *l = lay->queryList( "TQLayout" ); if ( l && l->first() ) lay = (TQLayout*)l->first(); delete l; } layout = lay; - if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( lay->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( lay->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( lay->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( lay->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( lay->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } @@ -1306,11 +1310,11 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay */ WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout ) { - if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } @@ -1327,7 +1331,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) TQWidget *WidgetFactory::layoutParent( TQLayout *layout ) { - TQObject *o = TQT_TQOBJECT(layout); + TQObject *o = layout; while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; @@ -1349,15 +1353,15 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) { if ( !w ) return w; - if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQTabWidget" ) ) return ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQToolBox" ) ) return ((TQToolBox*)w)->currentItem(); - if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQWizard" ) ) return ((TQWizard*)w)->currentPage(); - if ( w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQWidgetStack" ) ) return ((TQWidgetStack*)w)->visibleWidget(); - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) return ((TQMainWindow*)w)->centralWidget(); return w; } @@ -1372,10 +1376,10 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) { - if ( w->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w->parentWidget() && w->parentWidget()->inherits( "TQWidgetStack" ) ) w = w->parentWidget(); while ( w ) { - if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) || + if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) || w && w->parentWidget() && w->parentWidget()->inherits( "FormWindow" ) ) return w; w = w->parentWidget(); @@ -1391,19 +1395,19 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return true; - if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) + if ( o->inherits( "TQTabBar" ) || ::tqt_cast<TQToolBox*>(o->parent()) ) return true; - else if ( o->inherits( TQSIZEGRIP_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQSizeGrip" ) ) return true; - else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->parent() && o->parent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQToolButton" ) && o->parent() && o->parent()->inherits( "TQTabBar" ) ) return true; - else if ( o->parent() && o->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( "TQWizard" ) && o->inherits( "TQPushButton" ) ) return true; - else if ( o->parent() && o->parent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( "TQMainWindow" ) && o->inherits( "TQMenuBar" ) ) return true; - else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQDockWindowHandle" ) ) return true; - else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQHideDock" ) ) return true; return false; @@ -1416,7 +1420,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) const char* WidgetFactory::classNameOf( TQObject* o ) { if (o->inherits("QDesignerTabWidget")) - return TQTABWIDGET_OBJECT_NAME_STRING; + return "TQTabWidget"; #ifdef KOMMANDER else if (o->inherits("EditorTabWidget")) return "TabWidget"; @@ -1424,34 +1428,34 @@ const char* WidgetFactory::classNameOf( TQObject* o ) return "ToolBox"; #endif else if (o->inherits("QDesignerDialog")) - return TQDIALOG_OBJECT_NAME_STRING; + return "TQDialog"; else if (o->inherits("QDesignerWidget")) - return TQWIDGET_OBJECT_NAME_STRING; + return "TQWidget"; else if (o->inherits("CustomWidget")) return ((CustomWidget *) o)->realClassName().latin1(); else if (o->inherits("QDesignerLabel")) - return TQLABEL_OBJECT_NAME_STRING; + return "TQLabel"; else if (o->inherits("QDesignerWizard")) - return TQWIZARD_OBJECT_NAME_STRING; + return "TQWizard"; else if (o->inherits("EditorWizard")) return "Wizard"; else if (o->inherits("QDesignerPushButton")) - return TQPUSHBUTTON_OBJECT_NAME_STRING; + return "TQPushButton"; else if (o->inherits("QDesignerToolButton")) - return TQTOOLBUTTON_OBJECT_NAME_STRING; + return "TQToolButton"; else if (o->inherits("QDesignerRadioButton")) - return TQRADIOBUTTON_OBJECT_NAME_STRING; + return "TQRadioButton"; else if (o->inherits("QDesignerCheckBox")) - return TQCHECKBOX_OBJECT_NAME_STRING; + return "TQCheckBox"; else if (o->inherits("QDesignerMenuBar")) - return TQMENUBAR_OBJECT_NAME_STRING; + return "TQMenuBar"; else if (o->inherits("QDesignerToolBar")) - return TQTOOLBAR_OBJECT_NAME_STRING; + return "TQToolBar"; #ifndef TQT_NO_SQL else if (o->inherits("QDesignerDataBrowser")) - return TQDATABROWSER_OBJECT_NAME_STRING; + return "TQDataBrowser"; else if (o->inherits("QDesignerDataView")) - return TQDATAVIEW_OBJECT_NAME_STRING; + return "TQDataView"; #endif else if (o->inherits("EditorDialog")) return "Dialog"; @@ -1469,23 +1473,23 @@ void WidgetFactory::initChangedProperties( TQObject *o ) if ( !o->inherits( "QDesignerToolBar" ) && !o->inherits( "QDesignerMenuBar" ) ) MetaDataBase::setPropertyChanged( o, "geometry", true ); - if ( o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || o->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || o->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) || o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) + if ( o->inherits( "TQPushButton" ) || o->inherits("TQRadioButton") || o->inherits( "TQCheckBox" ) || o->inherits( "TQToolButton" ) ) MetaDataBase::setPropertyChanged( o, "text", true ); - else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { + else if (::tqt_cast<TQToolButton*>(o) && ::tqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); MetaDataBase::setPropertyChanged( o, "textPosition", TRUE ); - } else if ( o->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) + } else if ( o->inherits( "TQGroupBox" ) ) MetaDataBase::setPropertyChanged( o, "title", true ); - else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + else if ( o->isA( "TQFrame" ) ) { MetaDataBase::setPropertyChanged( o, "frameShadow", true ); MetaDataBase::setPropertyChanged( o, "frameShape", true ); - } else if ( o->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || o->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQTabWidget" ) || o->inherits( "TQWizard" ) ) { MetaDataBase::setPropertyChanged( o, "pageTitle", true ); MetaDataBase::setPropertyChanged( o, "pageName", true ); #ifndef TQT_NO_TABLE - } else if ( o->inherits( TQTABLE_OBJECT_NAME_STRING ) && !o->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQTable" ) && !o->inherits( "TQDataTable" ) ) { MetaDataBase::setPropertyChanged( o, "numRows", true ); MetaDataBase::setPropertyChanged( o, "numCols", true ); TQTable *t = (TQTable*)o; @@ -1494,14 +1498,14 @@ void WidgetFactory::initChangedProperties( TQObject *o ) t->verticalHeader()->setLabel( i, TQString::number( i + 1 ) ); } #endif - } else if ( ::tqqt_cast<TQToolBox*>(o) ) { + } else if ( ::tqt_cast<TQToolBox*>(o) ) { MetaDataBase::setPropertyChanged( o, "currentIndex", true ); MetaDataBase::setPropertyChanged( o, "itemName", true ); MetaDataBase::setPropertyChanged( o, "itemLabel", true ); MetaDataBase::setPropertyChanged( o, "itemIconSet", true ); MetaDataBase::setPropertyChanged( o, "itemToolTip", true ); MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", true ); - } else if ( o->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQSplitter" ) ) { MetaDataBase::setPropertyChanged( o, "orientation", true ); } else if ( o->inherits( "QDesignerToolBar" ) ) { MetaDataBase::setPropertyChanged( o, "label", true ); @@ -1528,7 +1532,7 @@ bool WidgetFactory::hasSpecialEditor( int id ) return true; if (className.mid(1) == "IconView") return true; - if (className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + if (className == "TQTextEdit" || className == "TQMultiLineEdit") return true; if (className.contains("Table")) return true; @@ -1557,7 +1561,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, #ifdef KOMMANDER if (className == "ComboBox") { - if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQComboBox")) return; TQComboBox *cb = (TQComboBox *) editWidget; @@ -1579,7 +1583,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if (className == "TreeWidget") { - if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListView")) return; TQListView *lv = (TQListView *) editWidget; ListViewEditor *e = new ListViewEditor(parent, lv, fw); @@ -1589,7 +1593,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if (className == "ListBox") { - if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListBox")) return; ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); @@ -1599,7 +1603,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, #endif if (className.mid(1) == "ListBox") { - if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListBox")) return; ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); @@ -1609,7 +1613,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "ComboBox") { - if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQComboBox")) return; TQComboBox *cb = (TQComboBox *) editWidget; ListBoxEditor *e = new ListBoxEditor(parent, cb->listBox(), fw); @@ -1621,7 +1625,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "ListView") { - if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListView")) return; TQListView *lv = (TQListView *) editWidget; ListViewEditor *e = new ListViewEditor(parent, lv, fw); @@ -1632,7 +1636,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "IconView") { - if (!editWidget->inherits(TQICONVIEW_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQIconView")) return; IconViewEditor *e = new IconViewEditor(parent, editWidget, fw); e->exec(); @@ -1640,7 +1644,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, return; } - if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING) + if (className == "TQMultiLineEdit" || className == "TQTextEdit") { MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); @@ -1669,7 +1673,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->metaObject()->property( w->metaObject()-> - findProperty( propName, true ), true ); + findProperty( propName.latin1(), true ), true ); if (!p ) return false; return p->reset( w ); @@ -1687,7 +1691,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) } else if ( propName == "frameworkCode" ) { return TQVariant( true ); } else if ( propName == "layoutMargin" ) { - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) return TQVariant( 0 ); else if ( MainWindow::self->formWindow() ) return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() ); @@ -1702,7 +1706,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->metaObject()-> - property( w->metaObject()->findProperty( propName, true ), true ); + property( w->metaObject()->findProperty( propName.latin1(), true ), true ); if ( !p ) { int v = defaultValue( w, "alignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1751,7 +1755,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true ); + TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, false, true ); if ( !l || !l->first() ) { delete l; return; @@ -1825,15 +1829,15 @@ void TQLayoutWidget::updateSizePolicy() TQLayout *parentLayout = 0; if ( parent() && parent()->isWidgetType() ) { parentLayout = ((TQWidget *)parent())->layout(); - if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) + if ( parentLayout && parentLayout->mainWidget()->inherits("TQLayoutWidget") ) parentLayout = 0; } TQObjectListIt it( childrenListObject() ); TQObject *o; - if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( layout()->inherits("TQVBoxLayout") ) { + if ( parentLayout && parentLayout->inherits("TQHBoxLayout") ) vt = TQSizePolicy::Minimum; else vt = TQSizePolicy::Fixed; @@ -1853,8 +1857,8 @@ void TQLayoutWidget::updateSizePolicy() if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } - } else if ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + } else if ( layout()->inherits("TQHBoxLayout") ) { + if ( parentLayout && parentLayout->inherits("TQVBoxLayout") ) ht = TQSizePolicy::Minimum; else ht = TQSizePolicy::Fixed; @@ -1874,13 +1878,13 @@ void TQLayoutWidget::updateSizePolicy() if ( !w->sizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } - } else if ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + } else if ( layout()->inherits("TQGridLayout") ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; if ( parentLayout ) { - if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( parentLayout->inherits("TQVBoxLayout") ) ht = TQSizePolicy::Minimum; - else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + else if ( parentLayout->inherits("TQHBoxLayout") ) vt = TQSizePolicy::Minimum; } @@ -1900,17 +1904,10 @@ void TQLayoutWidget::updateSizePolicy() vt |= TQSizePolicy::Maximum; } } -#ifdef USE_QT4 - if ( layout()->expanding() & TQSizePolicy::Horizontally ) - ht = TQSizePolicy::Expanding; - if ( layout()->expanding() & TQSizePolicy::Vertically ) - vt = TQSizePolicy::Expanding; -#else // USE_QT4 if ( layout()->expanding() & TQSizePolicy::Horizontally ) ht = TQSizePolicy::Expanding; if ( layout()->expanding() & TQSizePolicy::Vertically ) vt = TQSizePolicy::Expanding; -#endif // USE_QT4 layout()->invalidate(); } diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 2341b676..0135878f 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -110,7 +110,7 @@ private: class QDesignerTabWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -140,7 +140,7 @@ private: class EditorTabWidget : public TabWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -168,9 +168,9 @@ private: bool mousePressed; }; -class EditorToolBox : public ToolBox +class TDE_EXPORT EditorToolBox : public ToolBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -190,7 +190,7 @@ public: class QDesignerWizard : public TQWizard { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -226,7 +226,7 @@ private: class TQLayoutWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -245,7 +245,7 @@ protected: class CustomWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -278,7 +278,7 @@ protected: class Line : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) @@ -305,7 +305,7 @@ public: class QDesignerLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) @@ -338,7 +338,7 @@ private: class QDesignerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -355,7 +355,7 @@ private: class QDesignerDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: @@ -372,7 +372,7 @@ private: class QDesignerToolButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -381,13 +381,13 @@ public: : TQToolButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -396,7 +396,7 @@ public: class QDesignerRadioButton : public TQRadioButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -405,13 +405,13 @@ public: : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -421,7 +421,7 @@ public: class QDesignerPushButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -430,13 +430,13 @@ public: : TQPushButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -446,7 +446,7 @@ public: class QDesignerCheckBox : public TQCheckBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -455,13 +455,13 @@ public: : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -471,7 +471,7 @@ public: class EditorDialog : public Dialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/widgetinterface.h b/kommander/editor/widgetinterface.h index 3eed33d7..2958b10c 100644 --- a/kommander/editor/widgetinterface.h +++ b/kommander/editor/widgetinterface.h @@ -24,6 +24,6 @@ #include <tqwidgetinterface_p.h> #define WidgetInterface TQWidgetFactoryInterface -#define IID_Widget IID_TQWidgetFactory +#define IID_Widget IID_QWidgetFactory #endif diff --git a/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui index 2f5c16e4..ec183bf2 100644 --- a/kommander/editor/wizardeditor.ui +++ b/kommander/editor/wizardeditor.ui @@ -302,7 +302,7 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">addClicked()</slot> @@ -315,6 +315,6 @@ <slot access="protected">okClicked()</slot> <slot access="protected">removeClicked()</slot> <slot access="protected">upClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp index 3dbdec9b..f362a360 100644 --- a/kommander/editor/wizardeditorimpl.cpp +++ b/kommander/editor/wizardeditorimpl.cpp @@ -34,7 +34,7 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); } diff --git a/kommander/editor/wizardeditorimpl.h b/kommander/editor/wizardeditorimpl.h index b3d7e896..c6bb84ed 100644 --- a/kommander/editor/wizardeditorimpl.h +++ b/kommander/editor/wizardeditorimpl.h @@ -31,7 +31,7 @@ class FormWindow; class WizardEditor : public WizardEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index a14eac60..59ed882c 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -136,7 +136,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -154,7 +154,7 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -355,12 +355,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) setPalette( p ); addColumn( i18n("Files" ) ); setAllColumnsShowFocus( true ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( true ); @@ -395,19 +395,19 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); - connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -583,7 +583,7 @@ void Workspace::itemDoubleClicked( TQListViewItem *i ) void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& ) { - if ( !i || button != Qt::LeftButton ) + if ( !i || button != TQt::LeftButton ) return; closeAutoOpenItems(); @@ -699,7 +699,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) break; #endif case OPEN_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; #ifndef KOMMANDER case REMOVE_FORM: // FIXME @@ -707,10 +707,10 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) break; #endif case OPEN_FORM: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; case OPEN_FORM_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; default: break; @@ -720,7 +720,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) bool Workspace::eventFilter( TQObject *o, TQEvent * e ) { // Reggie, on what type of events do we have to execute updateBufferEdit() - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(bufferEdit) && e->type() != TQEvent::ChildRemoved ) + if ( o == bufferEdit && e->type() != TQEvent::ChildRemoved ) updateBufferEdit(); return TQListView::eventFilter( o, e ); } @@ -728,8 +728,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), - this, TQT_SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } @@ -764,7 +764,7 @@ void Workspace::bufferChosen( const TQString &buffer ) TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (WorkspaceItem*)it.current())->checkCompletion( buffer ) ) { - itemClicked( Qt::LeftButton, it.current(), TQPoint() ); + itemClicked( TQt::LeftButton, it.current(), TQPoint() ); break; } ++it; diff --git a/kommander/editor/workspace.h b/kommander/editor/workspace.h index 330fd444..4ba4b2a3 100644 --- a/kommander/editor/workspace.h +++ b/kommander/editor/workspace.h @@ -93,7 +93,7 @@ private: class Workspace : public TQListView { - Q_OBJECT + TQ_OBJECT public: |