diff options
Diffstat (limited to 'kommander')
241 files changed, 2774 insertions, 2731 deletions
diff --git a/kommander/CMakeL10n.txt b/kommander/CMakeL10n.txt index 0efe7f6a..008a8578 100644 --- a/kommander/CMakeL10n.txt +++ b/kommander/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "kommander" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kommander-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kommander/CMakeLists.txt b/kommander/CMakeLists.txt new file mode 100644 index 00000000..711033df --- /dev/null +++ b/kommander/CMakeLists.txt @@ -0,0 +1,21 @@ +add_subdirectory( icons ) +add_subdirectory( pluginmanager ) +add_subdirectory( plugin ) +add_subdirectory( factory ) +add_subdirectory( widget ) +add_subdirectory( widgets ) +add_subdirectory( editor ) +add_subdirectory( executor ) +add_subdirectory( part ) +add_subdirectory( working ) +add_subdirectory( examples ) +add_subdirectory( kmdrtools ) + + +##### other data + +tde_create_translated_desktop( + SOURCE x-kommander.desktop + DESTINATION ${MIME_INSTALL_DIR}/application + PO_DIR kommander-desktops +) diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index 4207a210..27ec95f3 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -72,8 +72,8 @@ \NewEntry 1 Other <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif"> <p><span style="font-weight:600">Other GUI-related issues</span></p> -<ul type="disc"><li>cleanup Q_SLOTS/Q_SIGNALS/connections interface</li> -<li>find out why Q_SLOTS are shown only for current tab<br /></li></ul> +<ul type="disc"><li>cleanup slots/signals/connections interface</li> +<li>find out why slots are shown only for current tab<br /></li></ul> <p><span style="font-weight:600">KDE4 ideas:<br /></span></p> <ul type="disc"><li>create a KDevelop plugin for the editor</li> <li>use KFormDesigner or the new Qt Designer</li></ul> @@ -160,8 +160,8 @@ \NewEntry 1 Signals <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia"> -<p><span style="font-weight:600">New Q_SIGNALS for existing widgets</span></p> -<ul type="disc"><li>add Q_SIGNALS for D&D<br /><span style="font-style:italic">Requires dragContent and dragType, perhaps dragSource to be set.</span></li> +<p><span style="font-weight:600">New signals for existing widgets</span></p> +<ul type="disc"><li>add signals for D&D<br /><span style="font-style:italic">Requires dragContent and dragType, perhaps dragSource to be set.</span></li> <li></li></ul> </body></html> @@ -218,7 +218,7 @@ \NewEntry 1 Done <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif"> -<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking Q_SIGNALS and Q_SLOTS and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p> +<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking signals and slots and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p> <ul type="disc"><li>fixed dcop functions</li> <li>added indexed array functions</li> <li>made color slot work in TextEdit</li> 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: diff --git a/kommander/examples/CMakeLists.txt b/kommander/examples/CMakeLists.txt new file mode 100644 index 00000000..9af8ae8b --- /dev/null +++ b/kommander/examples/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory( current ) +add_subdirectory( old ) +add_subdirectory( tutorial ) diff --git a/kommander/examples/current/CMakeLists.txt b/kommander/examples/current/CMakeLists.txt new file mode 100644 index 00000000..cb28f2a2 --- /dev/null +++ b/kommander/examples/current/CMakeLists.txt @@ -0,0 +1,7 @@ +##### other data + +install( + FILES a1.kmdr b1.kmdr editor-poc.kmdr keyvaluecombo.kmdr + kpartmwframe.kmdr kpartpart.kmdr passvariables.kmdr tableselect.kmdr + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/current +) diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr index 3b81701d..6e069e9e 100644 --- a/kommander/examples/current/a1.kmdr +++ b/kommander/examples/current/a1.kmdr @@ -49,7 +49,7 @@ debug("pid="+pid)</string> <cstring>StatusBar8</cstring> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout37</cstring> </property> @@ -121,7 +121,7 @@ debug("pid="+pid)</string> <string>and again</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout83</cstring> </property> @@ -185,7 +185,7 @@ StatusBar8.setText("Returned: "+b)</string> </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout84</cstring> </property> diff --git a/kommander/examples/current/b1.kmdr b/kommander/examples/current/b1.kmdr index 09725243..4dd7ee30 100644 --- a/kommander/examples/current/b1.kmdr +++ b/kommander/examples/current/b1.kmdr @@ -121,7 +121,7 @@ endif <property name="associations" stdset="0"> <stringlist> <string>//message_info("parentPid = "+parentPid+"\npid = "+pid) -dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello") +dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(TQString,TQString)", "StatusBar8", "Hello") </string> </stringlist> </property> diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 3713cb84..676fde24 100644 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KEdemo</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>KEdemo</cstring> </property> @@ -303,9 +303,9 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1)) <stringlist> <string></string> <string>@Array.setValue(help, "Proof of concept", "&lt;center&gt;&lt;h2&gt;Kommander MainWindow frames!&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;As Kommander took on functionality an attempt was made to make a MainWindow Kommander widget. Sadly it was a huge time loss for two developers who both gave up after days of trying. The problem was with the editor. However you can use a Qt Designer generated UI file renamed to a *.kmdr file. Into this frame you can place your widgets and make a working application where nearly everything works.&lt;/p&gt;") -@Array.setValue(help, "Known limitations", "&lt;center&gt;&lt;h2&gt;Known limitations&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are Q_SIGNALS for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &lt;/p&gt;") +@Array.setValue(help, "Known limitations", "&lt;center&gt;&lt;h2&gt;Known limitations&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are signals for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &lt;/p&gt;") @Array.setValue(help, "Rolling your own", "&lt;center&gt;&lt;h2&gt;Rolling your own&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;It is our intention to have a template in the 1.3 release of a MainWindow, but if you have Qt Designer for Qt 3x you can easily start a window design, save it, rename to *.kmdr and open in Kommander. Remember not to add widgets in Designer as Kommander will not recognize them.&lt;/p&gt;") -@Array.setValue(help, "Using Actions", "&lt;center&gt;&lt;h2&gt;Using Actions&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with Q_SIGNALS and Q_SLOTS. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&lt;/p&gt; +@Array.setValue(help, "Using Actions", "&lt;center&gt;&lt;h2&gt;Using Actions&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with signals and slots. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&lt;/p&gt; ") @Array.setValue(help, "Link examples", "&lt;center&gt;&lt;h2&gt;Link examples&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;This demo shows examples of linking. Links will show in the TextEdit widget, but they don't do anything. In the TextBrowser they open web pages and email links, but of course you can't edit in the TextBrowser. If you don't mind writing some script you can set up your own link handling, which I've done here. Note that it will follow links anywhere in the editor. If the link is a widget name it assumes it to be a script and calls it. If not it looks to see if it is a web link and calls that&lt;/p&gt;&lt;p&gt;It would be easy to extend this script to accept link parameters and process emails. You could also make a reference to other text objects, tab widget tabs, pretty much anything you can think of.&lt;/p&gt;") @Array.setValue(help, "How this help works", "&lt;center&gt;&lt;h2&gt;How this help works&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;Do you wonder where this help came from? It is possible to use KDE help if you write DocBook, make it and install it. This quick help is fast and can contain &lt;i&gt;rich text&lt;/i&gt;. To look at the dialog copy the text in the hidden TextEdit (set to text mode so as not to muck things up with rich text interperting XML) and paste it to a text editor like KWrite. Save it as a Kommander file and open it in the Kommander Editor.&lt;/p&gt;") @@ -331,7 +331,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1)) <property name="spacing"> <number>6</number> </property> - <widget class=TQSPLITTER_OBJECT_NAME_STRING row="0" column="0" rowspan="2" colspan="2"> + <widget class="TQSplitter" row="0" column="0" rowspan="2" colspan="2"> <property name="name"> <cstring>Splitter5</cstring> </property> @@ -586,9 +586,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -603,9 +600,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -620,9 +614,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -634,9 +625,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -651,9 +639,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -665,9 +650,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -682,9 +664,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -699,9 +678,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -716,9 +692,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -733,9 +706,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -750,9 +720,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -767,9 +734,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -781,9 +745,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -795,9 +756,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -809,9 +767,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -840,9 +795,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -871,9 +823,6 @@ TextEdit5.setColor(color)</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kommander/examples/current/keyvaluecombo.kmdr b/kommander/examples/current/keyvaluecombo.kmdr index 489c4f6d..a318d185 100644 --- a/kommander/examples/current/keyvaluecombo.kmdr +++ b/kommander/examples/current/keyvaluecombo.kmdr @@ -63,7 +63,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout27</cstring> </property> @@ -100,7 +100,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout30</cstring> </property> @@ -122,7 +122,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) <string>Right click for menu</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> <cstring>Layout24</cstring> </property> @@ -164,7 +164,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout23</cstring> </property> @@ -227,7 +227,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout31</cstring> </property> diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index 7d15aecf..d723f0e2 100644 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KKPdemo</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>KKPdemo</cstring> </property> @@ -58,7 +58,7 @@ </sizepolicy> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -218,9 +218,6 @@ endif</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -235,9 +232,6 @@ endif</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -252,9 +246,6 @@ endif</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -266,9 +257,6 @@ endif</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -283,9 +271,6 @@ endif</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -297,9 +282,6 @@ endif</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -314,9 +296,6 @@ endif</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -331,9 +310,6 @@ endif</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -348,9 +324,6 @@ endif</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -365,9 +338,6 @@ endif</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -382,9 +352,6 @@ endif</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -399,9 +366,6 @@ endif</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -413,9 +377,6 @@ endif</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -427,9 +388,6 @@ endif</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -441,9 +399,6 @@ endif</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -472,9 +427,6 @@ endif</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -503,9 +455,6 @@ endif</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr index d6e83b95..c7fc0dbb 100644 --- a/kommander/examples/current/kpartpart.kmdr +++ b/kommander/examples/current/kpartpart.kmdr @@ -51,7 +51,7 @@ Because of all this and the fact that the Actions on the unsupported MainWindow This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout70</cstring> </property> diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr index 3d4b848d..96a83fdb 100644 --- a/kommander/examples/current/passvariables.kmdr +++ b/kommander/examples/current/passvariables.kmdr @@ -279,7 +279,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5) </size> </property> </spacer> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="7"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr index a7d84367..c227acf0 100644 --- a/kommander/examples/current/tableselect.kmdr +++ b/kommander/examples/current/tableselect.kmdr @@ -51,7 +51,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="3" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -99,7 +99,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string> </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/CMakeLists.txt b/kommander/examples/old/CMakeLists.txt new file mode 100644 index 00000000..8b860d42 --- /dev/null +++ b/kommander/examples/old/CMakeLists.txt @@ -0,0 +1,10 @@ +##### other data + +install( + FILES checkmail.kmdr execprogram.kmdr form1.kmdr form3.kmdr + form5.kmdr populate.kmdr selectedwidgettext.kmdr simplelist.kmdr + tidy.kmdr wizard.kmdr ex1.kmdr firstform.kmdr.kmdr form2.kmdr + form4.kmdr newfile.kmdr resize.kmdr settings.kmdr tar.kmdr + widgetgenerator.kmdr + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/old +) diff --git a/kommander/examples/old/execprogram.kmdr b/kommander/examples/old/execprogram.kmdr index ea7e9dad..67914305 100644 --- a/kommander/examples/old/execprogram.kmdr +++ b/kommander/examples/old/execprogram.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/old/firstform.kmdr.kmdr b/kommander/examples/old/firstform.kmdr.kmdr index df90066e..454c2a67 100644 --- a/kommander/examples/old/firstform.kmdr.kmdr +++ b/kommander/examples/old/firstform.kmdr.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form2.kmdr b/kommander/examples/old/form2.kmdr index 23e8e372..272c9b7e 100644 --- a/kommander/examples/old/form2.kmdr +++ b/kommander/examples/old/form2.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -73,7 +73,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form4.kmdr b/kommander/examples/old/form4.kmdr index 7a5abe1a..3bb039e2 100644 --- a/kommander/examples/old/form4.kmdr +++ b/kommander/examples/old/form4.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -79,9 +79,9 @@ <connections> <connection> <sender>TextEdit1</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>LineEdit1</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/kommander/examples/old/form5.kmdr b/kommander/examples/old/form5.kmdr index ceba4883..1f244567 100644 --- a/kommander/examples/old/form5.kmdr +++ b/kommander/examples/old/form5.kmdr @@ -64,7 +64,7 @@ <bool>true</bool> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -152,7 +152,7 @@ <bool>true</bool> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -331,15 +331,15 @@ Ha ha. We got it all with Kommander!</string> <connections> <connection> <sender>ExecButton9</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>usetext</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> <connection> <sender>ExecButton9_2</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>usetext</receiver> - <slot>setText(const QString&)</slot> + <slot>setText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/kommander/examples/old/newfile.kmdr b/kommander/examples/old/newfile.kmdr index d74528a0..8fd01660 100644 --- a/kommander/examples/old/newfile.kmdr +++ b/kommander/examples/old/newfile.kmdr @@ -15,7 +15,7 @@ <property name="caption"> <string>Quick Start</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -31,7 +31,7 @@ <string>Title:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/old/populate.kmdr b/kommander/examples/old/populate.kmdr index 644faadc..565ba3ee 100644 --- a/kommander/examples/old/populate.kmdr +++ b/kommander/examples/old/populate.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/resize.kmdr b/kommander/examples/old/resize.kmdr index 92f9806b..7ab76276 100644 --- a/kommander/examples/old/resize.kmdr +++ b/kommander/examples/old/resize.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -65,7 +65,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -73,7 +73,7 @@ <string>Source directory:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -83,7 +83,7 @@ </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -115,7 +115,7 @@ </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -152,7 +152,7 @@ </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/old/selectedwidgettext.kmdr b/kommander/examples/old/selectedwidgettext.kmdr index ddb6d0ba..c91629c9 100644 --- a/kommander/examples/old/selectedwidgettext.kmdr +++ b/kommander/examples/old/selectedwidgettext.kmdr @@ -50,7 +50,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr index b7037ea9..df796460 100644 --- a/kommander/examples/old/settings.kmdr +++ b/kommander/examples/old/settings.kmdr @@ -35,7 +35,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -49,7 +49,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -83,7 +83,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -158,7 +158,7 @@ Items") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -249,9 +249,9 @@ Items") </connection> <connection> <sender>ExecButton1</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>listBox</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> <connection> <sender>settingsDialog</sender> diff --git a/kommander/examples/old/simplelist.kmdr b/kommander/examples/old/simplelist.kmdr index 6435f181..f1123039 100644 --- a/kommander/examples/old/simplelist.kmdr +++ b/kommander/examples/old/simplelist.kmdr @@ -15,7 +15,7 @@ <property name="caption"> <string>Form1</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/old/tar.kmdr b/kommander/examples/old/tar.kmdr index 128f324d..840ac02c 100644 --- a/kommander/examples/old/tar.kmdr +++ b/kommander/examples/old/tar.kmdr @@ -131,7 +131,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -288,7 +288,7 @@ </size> </property> </spacer> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -329,7 +329,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -343,7 +343,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -358,7 +358,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -372,7 +372,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -390,7 +390,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr index 785b9dcf..acc47721 100644 --- a/kommander/examples/old/tidy.kmdr +++ b/kommander/examples/old/tidy.kmdr @@ -29,7 +29,7 @@ <property name="name"> <cstring>TabWidget1</cstring> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -51,7 +51,7 @@ <property name="title"> <string>Non Tidy Option</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -119,7 +119,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -356,7 +356,7 @@ instances of Quanta running.</string> </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -373,7 +373,7 @@ instances of Quanta running.</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -477,7 +477,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -541,7 +541,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -613,7 +613,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -889,7 +889,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -1150,9 +1150,9 @@ fi </connection> <connection> <sender>ExecButton2</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>GtidyPath</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr index 45f441fa..46f166e3 100644 --- a/kommander/examples/old/widgetgenerator.kmdr +++ b/kommander/examples/old/widgetgenerator.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -100,37 +100,37 @@ headerContent="/**************************************************************** /* OTHER INCLUDES */ #include <kommanderwidget.h> -class QWidget; +class TQWidget; class QShowEvent; class @className : public @inheritClassName, public KommanderWidget { - Q_OBJECT + TQ_OBJECT - TQ_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - @className(QWidget *a_parent, const char *a_name); + @className(TQWidget *a_parent, const char *a_name); ~@className(); - virtual QString widgetText() const; + virtual TQString widgetText() const; virtual bool isKommanderWidget() const; virtual void setAssociatedText(QStringList); virtual QStringList associatedText() const; - virtual QString currentState() const; + virtual TQString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(QString); + virtual TQString populationText() const; + virtual void setPopulationText(TQString); -public Q_SLOTS: - virtual void setWidgetText(const QString &); +public slots: + virtual void setWidgetText(const TQString &); virtual void populate(); -Q_SIGNALS: +signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); protected: void showEvent( QShowEvent *e ); private: @@ -169,7 +169,7 @@ cppContent="/******************************************************************* #include <kommanderwidget.h> #include \"$classNameLower.h\" -@className::@className(QWidget *a_parent, const char *a_name) +@className::@className(TQWidget *a_parent, const char *a_name) : @inheritClassName(a_parent, a_name), KommanderWidget(this) { QStringList states; @@ -182,9 +182,9 @@ cppContent="/******************************************************************* { } -QString @className::currentState() const +TQString @className::currentState() const { - return QString(\"default\"); + return TQString(\"default\"); } bool @className::isKommanderWidget() const @@ -204,30 +204,30 @@ void @className::setAssociatedText(QStringList a_at) void @className::populate() { - QString txt = KommanderWidget::evalAssociatedText( populationText() ); + TQString txt = KommanderWidget::evalAssociatedText( populationText() ); setWidgetText( txt ); } -QString @className::populationText() const +TQString @className::populationText() const { return KommanderWidget::populationText(); } -void @className::setPopulationText(QString a_text) +void @className::setPopulationText(TQString a_text) { KommanderWidget::setPopulationText(a_text); } -void @className::setWidgetText(const QString &a_text) +void @className::setWidgetText(const TQString &a_text) { //set the widget text of your widget here emit widgetTextChanged(a_text); } -QString @className::widgetText() const +TQString @className::widgetText() const { // implement your widget text here - return QString::null; + return TQString::null; } void @className::showEvent( QShowEvent *e ) @@ -274,7 +274,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout37</cstring> </property> @@ -288,7 +288,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -296,7 +296,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Author:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -304,7 +304,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Email:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -312,7 +312,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Description:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -320,7 +320,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Date started:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -328,7 +328,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Class name:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -336,7 +336,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Base class name:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -346,7 +346,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout36</cstring> </property> diff --git a/kommander/examples/old/wizard.kmdr b/kommander/examples/old/wizard.kmdr index ed07ab03..d7f57170 100644 --- a/kommander/examples/old/wizard.kmdr +++ b/kommander/examples/old/wizard.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>Wizard1</class> -<widget class=TQWIZARD_OBJECT_NAME_STRING> +<widget class="TQWizard"> <property name="name"> <cstring>Wizard1</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Demo Wizard</string> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -39,7 +39,7 @@ </property> <property name="associations" stdset="0"> <stringlist> - <string>@dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, @CheckBox1.checked) + <string>@dcop(@dcopid, KommanderIf, enableWidget(TQString,bool), next, @CheckBox1.checked) </string> </stringlist> @@ -132,7 +132,7 @@ </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -156,7 +156,7 @@ </property> <property name="associations" stdset="0"> <stringlist> - <string>@dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, @CheckBox1_2.checked) + <string>@dcop(@dcopid, KommanderIf, enableWidget(TQString,bool), next, @CheckBox1_2.checked) </string> </stringlist> @@ -189,7 +189,7 @@ </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -213,7 +213,7 @@ </property> <property name="associations" stdset="0"> <stringlist> - <string>@dcop(@dcopid, KommanderIf, enableWidget(QString,bool), finish, @CheckBox2.checked) + <string>@dcop(@dcopid, KommanderIf, enableWidget(TQString,bool), finish, @CheckBox2.checked) </string> </stringlist> @@ -262,15 +262,15 @@ </connection> <connection> <sender>Wizard1</sender> - <signal>selected(const QString&)</signal> + <signal>selected(const TQString&)</signal> <receiver>ScriptObject1_2</receiver> <slot>execute()</slot> </connection> <connection> <sender>Wizard1</sender> - <signal>selected(const QString&)</signal> + <signal>selected(const TQString&)</signal> <receiver>LineEdit6</receiver> - <slot>setText(const QString&)</slot> + <slot>setText(const TQString&)</slot> </connection> <connection> <sender>CheckBox2</sender> diff --git a/kommander/examples/tutorial/CMakeLists.txt b/kommander/examples/tutorial/CMakeLists.txt new file mode 100644 index 00000000..0d344518 --- /dev/null +++ b/kommander/examples/tutorial/CMakeLists.txt @@ -0,0 +1,10 @@ +##### other data + +install( + FILES append.kmdr calc.kmdr dcop.kmdr globals.kmdr loop.kmdr + progressbar.kmdr slots.kmdr strings.kmdr tree.kmdr arrays.kmdr + cmdline.kmdr dialogs.kmdr initialize.kmdr picview.kmdr + settings.kmdr statusbar.kmdr table.kmdr widgets.kmdr + README + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/tutorial +) diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr index d9c07451..b30c318c 100644 --- a/kommander/examples/tutorial/append.kmdr +++ b/kommander/examples/tutorial/append.kmdr @@ -40,7 +40,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr index d0ae1d5e..b4a0ec5d 100644 --- a/kommander/examples/tutorial/arrays.kmdr +++ b/kommander/examples/tutorial/arrays.kmdr @@ -36,7 +36,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -93,7 +93,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr index cfe7233f..3308b2e3 100644 --- a/kommander/examples/tutorial/calc.kmdr +++ b/kommander/examples/tutorial/calc.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -124,7 +124,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -138,7 +138,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -146,7 +146,7 @@ <string>Expression:</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr index a4fe69fc..0d591cf5 100644 --- a/kommander/examples/tutorial/dcop.kmdr +++ b/kommander/examples/tutorial/dcop.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/dialogs.kmdr b/kommander/examples/tutorial/dialogs.kmdr index cb3c81e2..fd5b678f 100644 --- a/kommander/examples/tutorial/dialogs.kmdr +++ b/kommander/examples/tutorial/dialogs.kmdr @@ -85,7 +85,7 @@ ListBox1.setText(a) </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/globals.kmdr b/kommander/examples/tutorial/globals.kmdr index 33d5dd40..d4d92d89 100644 --- a/kommander/examples/tutorial/globals.kmdr +++ b/kommander/examples/tutorial/globals.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr index 9dde0bfc..96239366 100644 --- a/kommander/examples/tutorial/initialize.kmdr +++ b/kommander/examples/tutorial/initialize.kmdr @@ -35,7 +35,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -98,7 +98,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" </spacer> </hbox> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>OpenLabel</cstring> </property> @@ -106,7 +106,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" <string>Opened:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>CloseLabel</cstring> </property> diff --git a/kommander/examples/tutorial/loop.kmdr b/kommander/examples/tutorial/loop.kmdr index a415a103..d5672338 100644 --- a/kommander/examples/tutorial/loop.kmdr +++ b/kommander/examples/tutorial/loop.kmdr @@ -79,7 +79,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -93,7 +93,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr index c01a10e9..4fdca299 100644 --- a/kommander/examples/tutorial/picview.kmdr +++ b/kommander/examples/tutorial/picview.kmdr @@ -52,7 +52,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -133,7 +133,7 @@ <connections> <connection> <sender>FileSelector1</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>ListBox1</receiver> <slot>populate()</slot> </connection> diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr index f4aaa0b1..d59d1bcf 100644 --- a/kommander/examples/tutorial/settings.kmdr +++ b/kommander/examples/tutorial/settings.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -69,7 +69,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr index 6bbf7d5f..ae0fec91 100644 --- a/kommander/examples/tutorial/slots.kmdr +++ b/kommander/examples/tutorial/slots.kmdr @@ -30,7 +30,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -44,7 +44,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -68,7 +68,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -82,7 +82,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -105,7 +105,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -185,7 +185,7 @@ fi <connections> <connection> <sender>FileSelector</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>FileListBox</receiver> <slot>populate()</slot> </connection> diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr index 0b4af608..53f3908f 100644 --- a/kommander/examples/tutorial/strings.kmdr +++ b/kommander/examples/tutorial/strings.kmdr @@ -81,7 +81,7 @@ fi </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -95,7 +95,7 @@ fi <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -121,7 +121,7 @@ fi </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr index ff8982d4..8b219269 100644 --- a/kommander/examples/tutorial/table.kmdr +++ b/kommander/examples/tutorial/table.kmdr @@ -77,7 +77,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -170,7 +170,7 @@ </spacer> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/tutorial/tree.kmdr b/kommander/examples/tutorial/tree.kmdr index 0e5d76df..72410f79 100644 --- a/kommander/examples/tutorial/tree.kmdr +++ b/kommander/examples/tutorial/tree.kmdr @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -109,7 +109,7 @@ </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -130,7 +130,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout3</cstring> </property> diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr index 5f283e49..03123265 100644 --- a/kommander/examples/tutorial/widgets.kmdr +++ b/kommander/examples/tutorial/widgets.kmdr @@ -82,7 +82,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -96,7 +96,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/executor/CMakeLists.txt b/kommander/executor/CMakeLists.txt new file mode 100644 index 00000000..f3095915 --- /dev/null +++ b/kommander/executor/CMakeLists.txt @@ -0,0 +1,63 @@ +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/factory + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### instance (static) + +tde_add_library( instance STATIC_PIC AUTOMOC + + SOURCES + instance.cpp + dcopkommanderif.skel + LINK + tdecore-shared + tdeui-shared + tdeio-shared + kommanderplugin-shared + kommanderwidget-shared +) + + +##### kmdr-executor (executable) + +tde_add_executable( kmdr-executor AUTOMOC + + SOURCES + main.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + instance-static + kommanderwidget-shared + kommanderwidgets-shared + kommanderfactory-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kmdr-executor.desktop + DESTINATION ${APPS_INSTALL_DIR}/.hidden + PO_DIR kommander-desktops +) diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 863b0153..b746ec97 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -106,7 +106,7 @@ bool Instance::build(const KURL& fname) { TQFile inputFile; inputFile.open(IO_ReadOnly, stdin); - m_instance = KommanderFactory::create(TQT_TQIODEVICE(&inputFile)); + m_instance = KommanderFactory::create(&inputFile); } // check if build was successful @@ -121,7 +121,7 @@ bool Instance::build(const KURL& fname) window->setFileName(fname.path().local8Bit()); // FIXME : Should verify that all of the widgets in the dialog derive from KommanderWidget - m_textInstance = kommanderWidget(TQT_TQOBJECT(m_instance)); + m_textInstance = kommanderWidget(m_instance); if (!m_textInstance) // Main dialog/window is not a Kommander widget - look for one { @@ -158,9 +158,9 @@ bool Instance::run() return false; // Handle both dialogs and main windows - if (m_instance->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (m_instance->inherits("TQDialog")) dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec(); - else if (m_instance->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + else if (m_instance->inherits("TQMainWindow")) { kapp->setMainWidget(m_instance); dynamic_cast<TQMainWindow*>((TQWidget*)m_instance)->show(); @@ -234,14 +234,14 @@ bool Instance::isFileValid(const KURL& fname) const void Instance::setEnabled(const TQString& widgetName, bool enable) { TQObject* child = stringToWidget(widgetName); - if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) ((TQWidget*)child)->setEnabled(enable); } void Instance::setVisible(const TQString& widgetName, bool visible) { TQObject* child = stringToWidget(widgetName); - if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) ((TQWidget*)child)->setShown(visible); } @@ -250,7 +250,7 @@ void Instance::setText(const TQString& widgetName, const TQString& text) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setText, text); - else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) { TQLabel* label = (TQLabel*)child; if (label->pixmap()) @@ -269,7 +269,7 @@ TQString Instance::text(const TQString& widgetName) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::text); - else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) return ((TQLabel*)child)->text(); return TQString(); } @@ -279,7 +279,7 @@ void Instance::setSelection(const TQString& widgetName, const TQString& text) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setSelection, text); - else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) ((TQLabel*)child)->setText(text); } @@ -426,7 +426,7 @@ TQStringList Instance::associatedText(const TQString &widgetName) TQString Instance::type(const TQString& widget) { TQObject* child = stringToWidget(widget); - if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) return child->className(); return TQString(); } @@ -437,10 +437,10 @@ TQStringList Instance::children(const TQString& parent, bool recursive) TQObject* child = stringToWidget(parent); TQObjectList* widgets; if (!child) - child = TQT_TQOBJECT(m_instance); - if (child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + child = m_instance; + if (child->inherits("TQWidget")) { - widgets = child->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, recursive); + widgets = child->queryList("TQWidget", 0, false, recursive); for (TQObject* w = widgets->first(); w; w = widgets->next()) if (w->name() && kommanderWidget(w)) matching.append(w->name()); @@ -606,7 +606,7 @@ void Instance::setGlobal(const TQString& variableName, const TQString& value) TQObject* Instance::stringToWidget(const TQString& name) { - return m_instance->child(name); + return m_instance->child(name.utf8()); } KommanderWidget* Instance::kommanderWidget(TQObject* object) diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h index f7af3103..f93c90de 100644 --- a/kommander/executor/instance.h +++ b/kommander/executor/instance.h @@ -42,7 +42,7 @@ class KommanderWidget; class Instance : public TQObject, virtual public DCOPKommanderIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/executor/kmdr-executor.desktop b/kommander/executor/kmdr-executor.desktop index 705c67f7..6a714063 100644 --- a/kommander/executor/kmdr-executor.desktop +++ b/kommander/executor/kmdr-executor.desktop @@ -1,81 +1,10 @@ [Desktop Entry] +Name=Kommander Executor + +Comment=Executor for Kommander dialogs + Type=Application Exec=kmdr-executor %F Icon=kommander -Comment=Executor for Kommander dialogs -Comment[bg]=Изпълнение на диалогови прозорци -Comment[ca]=Executor per a diàlegs de Kommander -Comment[cs]=Spouštěč dialogů Kommanderu -Comment[da]=Udfører Kommanders dialoger -Comment[de]=Stellt Kommander-Dialoge dar -Comment[el]=Εκτελεστής για διαλόγους Kommander -Comment[en_GB]=Executor for Kommander dialogues -Comment[es]=Lanzador de cuadros de diálogo de Kommander -Comment[et]=Kommanderi dialoogide rakendaja -Comment[eu]=Kommander-en elkarrizketen exekutatzailea -Comment[fa]=مجری محاورههای Kommander -Comment[fi]=Komentodialogien rakentaja -Comment[fr]=Exécuteur de boîtes de dialogue de Kommander -Comment[gl]=Executor para os diálogos de Kommander -Comment[hi]=कमांडर संवादों हेतु कार्यपालक -Comment[hu]=Megjelenítőprogram Kommander-párbeszédablakokhoz -Comment[is]=Executor fyrir Kommander glugga -Comment[it]=Esecutore per maschere di Kommander -Comment[ja]=Kommander ダイアログ用の Executor -Comment[ka]=Kommander-ის დიალოგის შემსრულებელნი -Comment[lt]=Kommander dialogų vykdyklė -Comment[ms]=Pelaksana untuk dialog Kommander -Comment[nds]=Föhrt Kommander-Dialogen ut -Comment[ne]=आदेश संवादका लागि निर्वाहक -Comment[nl]=Kommander-dialogen uitvoeren -Comment[pl]=Uruchamianie z okien dialogowych Kommandera -Comment[pt]=Executor dos diálogos do Kommander -Comment[pt_BR]=Executor para diálogos do Kommander -Comment[ru]=Выполнение диалогов Kommander -Comment[sk]=Spúštač pre Kommander dialógy -Comment[sl]=Izvajalnik za pogovorna okna Kommanderja -Comment[sr]=Извршавач за Kommander-ове дијалоге -Comment[sr@Latn]=Izvršavač za Kommander-ove dijaloge -Comment[sv]=Körning av Kommander-dialogrutor -Comment[ta]=Kகட்டளை உரையாடல் நிகழ்த்துபவர் -Comment[tg]=Иҷрокунанда барои диалогҳои Kommander -Comment[tr]=Kommander diyalogları için çalıştırıcı -Comment[uk]=Запускач для вікон Kommander -Comment[zh_CN]=Kommander 对话框执行器 -Comment[zh_HK]=Kommander 對話盒的運行程式 -Comment[zh_TW]=Kommander 對話盒的運行程式 Terminal=false -Name=Kommander Executor -Name[br]=Aozer Kommander -Name[ca]=Executor Kommander -Name[cs]=Spouštěč Kommanderu -Name[de]=Kommander-Exekutor -Name[el]=Εκτελεστής Kommander -Name[eu]=Kommander exekutatzailea -Name[fa]=مجری Kommander -Name[fi]=Komennon suorittaja -Name[fr]=Exécuteur de Kommander -Name[gl]=Executor de Kommander -Name[hi]=कमांडर कार्यपालक -Name[it]=Esecutore per Kommander -Name[lt]=Kommander vykdyklė -Name[ms]=Pelaksana Kommander -Name[nds]=Kommander-Executor -Name[ne]=आदेश निर्वाहक -Name[nl]=Kommander Uitvoerder -Name[pl]=Kommander: uruchamianie -Name[pt]=Executor do Kommander -Name[pt_BR]=Executor do Kommander -Name[ru]=Kommander -Name[sk]=Kommander spúštač -Name[sl]=Izvajalnik Kommander -Name[sr]=Kommander извршавач -Name[sr@Latn]=Kommander izvršavač -Name[ta]=Kகட்டளை நிகழ்த்துபவர் -Name[tg]=Иҷрокунандаи Kommander -Name[tr]=Kommander Çalıştırıcısı -Name[uk]=Запускач Kommander -Name[zh_CN]=Kommander 执行器 -Name[zh_HK]=Kommander 執行器 -Name[zh_TW]=Kommander 執行器 MimeType=application/x-kommander diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index ecd9bfac..f27ab90f 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) TDELocale::setMainCatalogue("kommander"); TDEApplication app; - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); if (!args->count()) { KMessageBox::sorry(0, i18n("Error: no dialog given. Use --stdin option to read dialog from standard input.\n")); diff --git a/kommander/factory/CMakeLists.txt b/kommander/factory/CMakeLists.txt new file mode 100644 index 00000000..d33ff52e --- /dev/null +++ b/kommander/factory/CMakeLists.txt @@ -0,0 +1,39 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +add_definitions( -DTQT_NO_SQL ) + + +##### kommanderfactory (static) + +tde_add_library( kommanderfactory STATIC_PIC AUTOMOC + + SOURCES + kommanderfactory.cpp + domtool.cpp + LINK + kommanderplugin-shared +) + + +###### headers + +install( + FILES kommanderfactory.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/kommander/factory/domtool.cpp b/kommander/factory/domtool.cpp index 56a98a69..587b4a24 100644 --- a/kommander/factory/domtool.cpp +++ b/kommander/factory/domtool.cpp @@ -169,7 +169,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = TQVariant( TQCString( e.firstChild().toText().data() ) ); + v = TQVariant( e.firstChild().toText().data().utf8() ); } else if ( e.tagName() == "number" ) { bool ok = true; v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 81549438..f3cbb0e1 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -25,10 +25,6 @@ #include "kommanderfactory.h" #include <kommanderplugin.h> -#ifdef TQT_NO_SQL -#define TQT_NO_SQL -#endif // TQT_NO_SQL - #include <tqfeatures.h> #include "config.h" #ifndef TQT_NO_SQL @@ -135,7 +131,7 @@ TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, if (!qwf_currFileName) qwf_currFileName = new TQString(); *qwf_currFileName = uiFile; - TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); + TQWidget *w = KommanderFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); @@ -217,7 +213,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg if ( !imageCollection.isNull() ) widgetFactory->loadImageCollection( imageCollection ); - widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); + widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); TQWidget *w = widgetFactory->toplevel; if ( !w ) { delete widgetFactory; @@ -266,7 +262,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) { - TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING ); + TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); if ( !table ) continue; if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) @@ -292,8 +288,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { - TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), TQLABEL_OBJECT_NAME_STRING ); - TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, TQWIDGET_OBJECT_NAME_STRING ); + TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().utf8(), "TQLabel" ); + TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).utf8(), "TQWidget" ); if ( label && buddy ) label->setBuddy( buddy ); } @@ -315,77 +311,77 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi TQString className = literalClassName; // create widgets we know - if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) + if (className == "TQPushButton") return new TQPushButton(parent, name); - else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) + else if (className == "TQToolButton") return new TQToolButton(parent, name); - else if (className == TQCHECKBOX_OBJECT_NAME_STRING) + else if (className == "TQCheckBox") return new TQCheckBox(parent, name); - else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) + else if (className == "TQRadioButton") return new TQRadioButton(parent, name); - else if (className == TQGROUPBOX_OBJECT_NAME_STRING) + else if (className == "TQGroupBox") return new TQGroupBox(parent, name); - else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) + else if (className == "TQButtonGroup") return new TQButtonGroup(parent, name); - else if (className == TQICONVIEW_OBJECT_NAME_STRING) + else if (className == "TQIconView") { #if !defined(TQT_NO_ICONVIEW) return new TQIconView(parent, name); #endif } - else if (className == TQTABLE_OBJECT_NAME_STRING) + else if (className == "TQTable") { #if !defined(TQT_NO_TABLE) return new TQTable(parent, name); #endif } - else if (className == TQLISTBOX_OBJECT_NAME_STRING) + else if (className == "TQListBox") return new TQListBox(parent, name); - else if (className == TQLISTVIEW_OBJECT_NAME_STRING) + else if (className == "TQListView") return new TQListView(parent, name); - 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 == TQMULTILINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQMultiLineEdit") return new TQMultiLineEdit(parent, name); - else if (className == TQLABEL_OBJECT_NAME_STRING) + else if (className == "TQLabel") return new TQLabel(parent, name); - else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) + else if (className == "TQLayoutWidget") return new TQWidget(parent, name); - else if (className == TQTABWIDGET_OBJECT_NAME_STRING) + else if (className == "TQTabWidget") return new TQTabWidget(parent, name); - 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 (!qwf_stays_on_top) return new TQWidget(parent, name); return new TQWidget(parent, name, TQt::WStyle_StaysOnTop); } - else if (className == TQDIALOG_OBJECT_NAME_STRING) + else if (className == "TQDialog") { if (!qwf_stays_on_top) return new TQDialog(parent, name); return new TQDialog(parent, name, false, TQt::WStyle_StaysOnTop); } - else if (className == TQWIZARD_OBJECT_NAME_STRING) + else if (className == "TQWizard") return new TQWizard(parent, name); - 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") return new TQSlider(parent, name); - else if (className == TQFRAME_OBJECT_NAME_STRING) + else if (className == "TQFrame") return new TQFrame(parent, name); - else if (className == TQSPLITTER_OBJECT_NAME_STRING) + else if (className == "TQSplitter") return new TQSplitter(parent, name); else if (className == "Line") { @@ -393,21 +389,21 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); return f; } - else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) + else if (className == "TQTextEdit") return new TQTextEdit(parent, name); - 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 == TQSCROLLBAR_OBJECT_NAME_STRING) + else if (className == "TQScrollBar") return new TQScrollBar(parent, name); - else if (className == TQPOPUPMENU_OBJECT_NAME_STRING) + else if (className == "TQPopupMenu") return new TQPopupMenu(parent, name); - else if (className == TQWIDGETSTACK_OBJECT_NAME_STRING) + else if (className == "TQWidgetStack") return new TQWidgetStack(parent, name); - else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) + else if (className == "TQMainWindow") { TQMainWindow *mw = 0; if (!qwf_stays_on_top) @@ -420,11 +416,11 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi return mw; } #if !defined(TQT_NO_SQL) - else if (className == TQDATATABLE_OBJECT_NAME_STRING) + else if (className == "TQDataTable") return new TQDataTable(parent, name); - else if (className == TQDATABROWSER_OBJECT_NAME_STRING) + else if (className == "TQDataBrowser") return new QDesignerDataBrowser2(parent, name); - else if (className == TQDATAVIEW_OBJECT_NAME_STRING) + else if (className == "TQDataView") return new QDesignerDataView2(parent, name); #endif @@ -515,13 +511,13 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge if ( colspan < 1 ) colspan = 1; if ( !className.isEmpty() ) { - if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) - className = TQWIDGET_OBJECT_NAME_STRING; - if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { + if ( !layout && className == "TQLayoutWidget" ) + className = "TQWidget"; + if ( layout && className == "TQLayoutWidget" ) { // hide layout widgets w = parent; } else { - obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 )); + obj = KommanderFactory::createWidget( className, parent, 0 ); if ( !obj ) { return 0; @@ -529,7 +525,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge w = (TQWidget*)obj; if ( !toplevel ) toplevel = w; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch( layoutType( layout ) ) { @@ -559,39 +555,39 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge createSpacer( n, layout ); } else if ( n.tagName() == "widget" ) { TQMap< TQString, TQString> *oldDbControls = dbControls; - createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); + createWidgetInternal( n, w, layout, n.attribute( "class", "TQWidget" ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::HBox ); else layout = createLayout( w, layout, KommanderFactory::HBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::Grid ); else layout = createLayout( w, layout, KommanderFactory::Grid ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::VBox ); else layout = createLayout( w, layout, KommanderFactory::VBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { @@ -599,14 +595,14 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge } 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, translate(v.toString()) ); } else - if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, translate(v.toString()) ); - }else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + }else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, translate(v.toString()) ); } @@ -627,20 +623,20 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L int spacing = defSpacing; int margin = defMargin; - 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( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - 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; @@ -717,18 +713,18 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const { - 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; } void KommanderFactory::setProperty( 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 ); TQVariant defVariant; if ( e.tagName() == "font" ) { @@ -767,8 +763,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T TQWhatsThis::add( (TQWidget*)obj, translate(v.toString()) ); } #ifndef TQT_NO_SQL - if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) - && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) { + if ( prop == "database" && !obj->inherits( "TQDataView" ) + && !obj->inherits( "TQDataBrowser" ) ) { TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList(); if ( lst.count() > 2 ) { if ( dbControls ) @@ -778,7 +774,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T } } else if ( prop == "database" ) { TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList(); - if ( lst.count() == 2 && obj->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) { + if ( lst.count() == 2 && obj->inherits( "TQWidget" ) ) { SqlWidgetConnection conn( lst[ 0 ], lst[ 1 ] ); sqlWidgetConnections.insert( (TQWidget*)obj, conn ); dbControls = conn.dbControls; @@ -792,7 +788,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T noDatabaseWidgets << obj->name(); } } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() ); } @@ -820,24 +816,24 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T 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 ) ); } if ( prop == "geometry" ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { + if ( obj == toplevel ) { toplevel->resize( v.toRect().size() ); return; } } - obj->setProperty( prop, v ); + obj->setProperty( prop.latin1(), v ); } void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) @@ -848,7 +844,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) int rowspan = e.attribute( "rowspan" ).toInt(); int colspan = e.attribute( "colspan" ).toInt(); - Qt::Orientation orient = Qt::Horizontal; + TQt::Orientation orient = TQt::Horizontal; int w = 0, h = 0; TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; while ( !n.isNull() ) { @@ -856,9 +852,9 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) TQString prop = n.attribute( "name" ); if ( prop == "orientation" ) { if ( n.firstChild().firstChild().toText().data() == "Horizontal" ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; } else if ( prop == "sizeType" ) { if ( n.firstChild().firstChild().toText().data() == "Fixed" ) sizeType = TQSizePolicy::Fixed; @@ -884,14 +880,14 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) rowspan = 1; if ( colspan < 1 ) colspan = 1; - TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, - orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); + TQSpacerItem *item = new TQSpacerItem( w, h, orient == TQt::Horizontal ? sizeType : TQSizePolicy::Minimum, + orient == TQt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { - if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, - orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); + orient == TQt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); } } @@ -924,7 +920,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; @@ -1025,12 +1021,12 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect while ( !n2.isNull() ) { if ( n2.tagName() == "sender" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.sender = TQT_TQOBJECT(toplevel); + if ( name == "this" || name == toplevel->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(); @@ -1040,13 +1036,13 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect if ( !conn.sender ) conn.sender = 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" || name == toplevel->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(); @@ -1054,7 +1050,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect } } } else if ( n2.tagName() == "slot" ) { - conn.slot = n2.firstChild().toText().data(); + conn.slot = n2.firstChild().toText().data().utf8(); } n2 = n2.nextSibling().toElement(); } @@ -1065,7 +1061,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQObject *sender = 0, *receiver = 0; TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), false ); if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) { - sender = TQT_TQOBJECT(toplevel); + sender = toplevel; } else { if ( !l || !l->first() ) { delete l; @@ -1079,7 +1075,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect sender = findAction( conn.sender->name() ); if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) { - receiver = TQT_TQOBJECT(toplevel); + receiver = toplevel; } else { l = toplevel->queryList( 0, conn.receiver->name(), false ); if ( !l || !l->first() ) { @@ -1101,7 +1097,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQStrList slotList = receiver->metaObject()->slotNames( true ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { + if ( slotList.find( conn.slot ) == -1 && receiver == toplevel && connector ) { slotList = connector->metaObject()->slotNames( true ); receiver = connector; } @@ -1112,7 +1108,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect n = n.nextSibling().toElement(); continue; } - TQObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s.utf8(), receiver, s2.utf8() ); } else { EventFunction ef = eventMap[ conn.sender ]; ef.events.append( conn.signal ); @@ -1134,7 +1130,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "tabstop" ) { TQString name = n.firstChild().toText().data(); - 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(); @@ -1151,7 +1147,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) { - 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; @@ -1185,10 +1181,10 @@ void KommanderFactory::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; #ifndef TQT_NO_SQL - bool isSql = (widget->inherits( TQDATATABLE_OBJECT_NAME_STRING )); + bool isSql = (widget->inherits( "TQDataTable" )); #endif bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1273,14 +1269,14 @@ void KommanderFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - 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(); @@ -1290,7 +1286,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi new TQListBoxText( lb, txt ); } #ifndef TQT_NO_ICONVIEW - } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQIconView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; @@ -1300,7 +1296,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi TQIconView *iv = (TQIconView*)widget; new TQIconViewItem( iv, txt, pix ); #endif - } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQListView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -1361,7 +1357,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new TQActionGroup( parent ); @@ -1378,7 +1374,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } if ( a ) @@ -1390,9 +1386,9 @@ void KommanderFactory::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } n = n.nextSibling().toElement(); } @@ -1408,7 +1404,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt(); tb = new TQToolBar( TQString(), mw, dock ); tb->setLabel( n.attribute( "label" ) ); - tb->setName( n.attribute( "name" ) ); + tb->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -1418,9 +1414,9 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) } else if ( n2.tagName() == "separator" ) { tb->addSeparator(); } else if ( n2.tagName() == "widget" ) { - (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); + (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -1437,7 +1433,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "item" ) { TQPopupMenu *popup = new TQPopupMenu( mw ); - popup->setName( n.attribute( "name" ) ); + popup->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -1451,7 +1447,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e ) } mb->insertItem( translate( n.attribute( "text" ) ), popup ); } else if ( n.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } n = n.nextSibling().toElement(); } @@ -1463,7 +1459,7 @@ TQAction *KommanderFactory::findAction( const TQString &name ) for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { 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; } diff --git a/kommander/icons/CMakeLists.txt b/kommander/icons/CMakeLists.txt new file mode 100644 index 00000000..a0a4d713 --- /dev/null +++ b/kommander/icons/CMakeLists.txt @@ -0,0 +1,9 @@ +##### icons + +tde_install_icons( kommander ) + +install( + FILES hi22-action-arrow.png + DESTINATION ${DATA_INSTALL_DIR}/kommander/icons/hicolor/22x22/actions + RENAME arrow.png +) diff --git a/kommander/kmdrtools/CMakeLists.txt b/kommander/kmdrtools/CMakeLists.txt new file mode 100644 index 00000000..12f913d5 --- /dev/null +++ b/kommander/kmdrtools/CMakeLists.txt @@ -0,0 +1,7 @@ +##### other data + +install( + FILES dcoptool-oldparser.kmdr examples.kmdr + DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor +) + diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index f4d758ca..d3a00bc7 100644 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -30,98 +30,98 @@ @TextParam4.setVisible(false) @param4.setVisible(false) -@setGlobal(Array,"values(QString) -keys(QString) -clear(QString) -count(QString) -count(QString) -remove(QString,QString) -remove(QString,QString) -fromString(QString,QString) -toString(QString) -toString(QString) -toString(QString) -toString(QString) -toString(QString)") +@setGlobal(Array,"values(TQString) +keys(TQString) +clear(TQString) +count(TQString) +count(TQString) +remove(TQString,TQString) +remove(TQString,TQString) +fromString(TQString,TQString) +toString(TQString) +toString(TQString) +toString(TQString) +toString(TQString) +toString(TQString)") -@setGlobal(File,"read(QString) -write(QString,QString) -append(QString,QString)") +@setGlobal(File,"read(TQString) +write(TQString,TQString) +append(TQString,TQString)") -@setGlobal(Input,"text(QString,QString,QString) -password(QString,QString) -value(QString,QString,int,int,int,int) -double(QString,QString,double,double,double,double) -openfile(QString,QString,QString) -savefile(QString,QString,QString) -directory(QString,QString,QString) -openfiles(QString,QString,QString)") +@setGlobal(Input,"text(TQString,TQString,TQString) +password(TQString,TQString) +value(TQString,TQString,int,int,int,int) +double(TQString,TQString,double,double,double,double) +openfile(TQString,TQString,TQString) +savefile(TQString,TQString,TQString) +directory(TQString,TQString,TQString) +openfiles(TQString,TQString,TQString)") -@setGlobal(DCOP,"addUniqueItem(QString,QString) -associatedText(QString) -cellText(QString,int,int) -checked(QString) -children(QString,bool) -clear(QString) -count(QString) -currentColumn(QString) -currentItem(QString) -currentRow(QString) -execute(QString) -findItem(QString,QString) -insertColumn(QString,int,int) -insertItem(QString,QString,int) -insertItems(QString,QStringList,int) -insertRow(QString,int,int) -item(QString,int) -itemDepth(QString,int) -itemPath(QString,int) -removeColumn(QString,int,int) -removeItem(QString,int) -removeRow(QString,int,int) -selection(QString) -setAssociatedText(QString,QString) -setEnabled(QString,bool) -setCellText(QString,int,int,QString) -setCellWidget(QString,int,int,QString) -cellWidget(QString,int,int) -setChecked(QString,bool) -setColumnCaption(QString,int,QString) -setCurrentItem(QString,int) -insertTab(QString,QString,int) -setMaximum(QString,int) -setPixmap(QString,QString,int) -setRowCaption(QString,int,QString) -setSelection(QString,QString) -setText(QString,QString) -setVisible(QString,bool) -type(QString) -setEditable(QString,bool)") +@setGlobal(DCOP,"addUniqueItem(TQString,TQString) +associatedText(TQString) +cellText(TQString,int,int) +checked(TQString) +children(TQString,bool) +clear(TQString) +count(TQString) +currentColumn(TQString) +currentItem(TQString) +currentRow(TQString) +execute(TQString) +findItem(TQString,TQString) +insertColumn(TQString,int,int) +insertItem(TQString,TQString,int) +insertItems(TQString,QStringList,int) +insertRow(TQString,int,int) +item(TQString,int) +itemDepth(TQString,int) +itemPath(TQString,int) +removeColumn(TQString,int,int) +removeItem(TQString,int) +removeRow(TQString,int,int) +selection(TQString) +setAssociatedText(TQString,TQString) +setEnabled(TQString,bool) +setCellText(TQString,int,int,TQString) +setCellWidget(TQString,int,int,TQString) +cellWidget(TQString,int,int) +setChecked(TQString,bool) +setColumnCaption(TQString,int,TQString) +setCurrentItem(TQString,int) +insertTab(TQString,TQString,int) +setMaximum(TQString,int) +setPixmap(TQString,TQString,int) +setRowCaption(TQString,int,TQString) +setSelection(TQString,TQString) +setText(TQString,TQString) +setVisible(TQString,bool) +type(TQString) +setEditable(TQString,bool)") -@setGlobal(File,"read(QString) -write(QString,QString) -append(QString,QString)") +@setGlobal(File,"read(TQString) +write(TQString,TQString) +append(TQString,TQString)") @setGlobal(KommanderMessage,"") -@setGlobal(String,"length(QString) -contains(QString,QString) -find(QString,QString,int) -findRev(QString,QString,int) -left(QString,int) -right(QString,int) -mid(QString,int,int) -remove(QString,QString) -replace(QString,QString,QString) -upper(QString) -lower(QString) -compare(QString,QString) -isEmpty(QString) -isNumber(QString) -section(QString,QString,int) -args(QString,QString,QString,QString) -args(QString,QString,QString,QString) -args(QString,QString,QString,QString)") +@setGlobal(String,"length(TQString) +contains(TQString,TQString) +find(TQString,TQString,int) +findRev(TQString,TQString,int) +left(TQString,int) +right(TQString,int) +mid(TQString,int,int) +remove(TQString,TQString) +replace(TQString,TQString,TQString) +upper(TQString) +lower(TQString) +compare(TQString,TQString) +isEmpty(TQString) +isNumber(TQString) +section(TQString,TQString,int) +args(TQString,TQString,TQString,TQString) +args(TQString,TQString,TQString,TQString) +args(TQString,TQString,TQString,TQString)") @functiongroup.setCurrentItem(1) @@ -131,7 +131,7 @@ args(QString,QString,QString,QString)") <string></string> </stringlist> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -224,7 +224,7 @@ args(QString,QString,QString,QString)") </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -247,7 +247,7 @@ args(QString,QString,QString,QString)") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -269,7 +269,7 @@ args(QString,QString,QString,QString)") <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -326,7 +326,7 @@ args(QString,QString,QString,QString)") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -578,7 +578,7 @@ fi </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -647,10 +647,10 @@ fi @#@exec(kdialog --msgbox "@global(_KDDIR)\n") @# dcop kmdr-executor-32730 KommanderIf children kmdr-executor-32730 1 @wname.clear -@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "children(QString,bool)", @global(pdlg), 1 )) +@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "children(TQString,bool)", @global(pdlg), 1 )) @setGlobal(iwd,"") @forEach(i, @global(items)) - @setGlobal(iwd, "@global(iwd)@i (@dcop(@global(pdlg), KommanderIf, "type(QString)", @i))\n") + @setGlobal(iwd, "@global(iwd)@i (@dcop(@global(pdlg), KommanderIf, "type(TQString)", @i))\n") @end @wname.insertItems(@global(iwd),0)</string> </stringlist> @@ -757,7 +757,7 @@ fi <string>@##### put the following in @setfunction ######### @# set up dialog based on function @switch(@functiongroup.selection::@proto.selection) -@case(DCOP::addUniqueItem(QString,QString)) +@case(DCOP::addUniqueItem(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"item") @setGlobal(PARM2,"") @@ -765,7 +765,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,addUniqueItem) @setGlobal(DESC,"Inserts the item if it will not create a duplicate.") -@case(DCOP::associatedText(QString)) +@case(DCOP::associatedText(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -773,7 +773,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,associatedText) @setGlobal(DESC,"Returns scripts associated with widget. This is an advanced feature that would not be commonly used.") -@case(DCOP::cellText(QString,int,int)) +@case(DCOP::cellText(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"column") @@ -781,7 +781,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,cellText) @setGlobal(DESC,"Returns text of a cell in a table.") -@case(DCOP::checked(QString)) +@case(DCOP::checked(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -789,7 +789,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,checked) @setGlobal(DESC,"Returns 1 for checked boxes, 0 for unchecked.") -@case(DCOP::children(QString,bool)) +@case(DCOP::children(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"recursive") @setGlobal(PARM2,"") @@ -797,7 +797,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,children) @setGlobal(DESC,"Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets.") -@case(DCOP::clear(QString)) +@case(DCOP::clear(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -805,7 +805,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,clear) @setGlobal(DESC,"Removes all content from the widget.") -@case(DCOP::count(QString)) +@case(DCOP::count(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -813,7 +813,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,count) @setGlobal(DESC,"Returns number of items in a widget such as combobox or listbox.") -@case(DCOP::currentColumn(QString)) +@case(DCOP::currentColumn(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -821,7 +821,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,currentColumn) @setGlobal(DESC,"Returns index of current column.") -@case(DCOP::currentItem(QString)) +@case(DCOP::currentItem(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -829,7 +829,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,currentItem) @setGlobal(DESC,"Returns index of current item.") -@case(DCOP::currentRow(QString)) +@case(DCOP::currentRow(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -837,7 +837,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,currentRow) @setGlobal(DESC,"Returns index of current row.") -@case(DCOP::execute(QString)) +@case(DCOP::execute(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -845,7 +845,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,execute) @setGlobal(DESC,"Executes the script associated with the widget. With the new parser the execute method can take one or more arguments.") -@case(DCOP::findItem(QString,QString)) +@case(DCOP::findItem(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"item") @setGlobal(PARM2,"") @@ -853,7 +853,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,findItem) @setGlobal(DESC,"Returns the index of an item with the given text.") -@case(DCOP::insertColumn(QString,int,int)) +@case(DCOP::insertColumn(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"column") @setGlobal(PARM2,"count") @@ -861,7 +861,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertColumn) @setGlobal(DESC,"Inserts new column &#040;or <i>count</i> columns&#041; at <i>column</i> position.") -@case(DCOP::insertItem(QString,QString,int)) +@case(DCOP::insertItem(TQString,TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"item") @setGlobal(PARM2,"index") @@ -869,7 +869,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertItem) @setGlobal(DESC,"Inserts item at <i>index</i> position.") -@case(DCOP::insertItems(QString,QStringList,int)) +@case(DCOP::insertItems(TQString,QStringList,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"items") @setGlobal(PARM2,"index") @@ -877,7 +877,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertItems) @setGlobal(DESC,"Inserts multiple items &#040;EOL-separated&#041; at <i>index</i> position.") -@case(DCOP::insertRow(QString,int,int)) +@case(DCOP::insertRow(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"count") @@ -885,7 +885,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertRow) @setGlobal(DESC,"Inserts new row &#040;or <i>count</i> rows&#041; at <i>row</i> position.") -@case(DCOP::item(QString,int)) +@case(DCOP::item(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -893,7 +893,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,item) @setGlobal(DESC,"Returns the text of the item at the given index.") -@case(DCOP::itemDepth(QString,int)) +@case(DCOP::itemDepth(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -901,7 +901,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,itemDepth) @setGlobal(DESC,"Returns the depth of the current item in the tree. Root items have depth 0.") -@case(DCOP::itemPath(QString,int)) +@case(DCOP::itemPath(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -909,7 +909,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,itemPath) @setGlobal(DESC,"Returns the slash-separated path to the given item in the tree.") -@case(DCOP::removeColumn(QString,int,int)) +@case(DCOP::removeColumn(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"column") @setGlobal(PARM2,"count") @@ -917,7 +917,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,removeColumn) @setGlobal(DESC,"Removes the column &#040;or <i>count</i> consecutive columns&#041; with the given index.") -@case(DCOP::removeItem(QString,int)) +@case(DCOP::removeItem(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -925,7 +925,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,removeItem) @setGlobal(DESC,"Removes the item with the given index.") -@case(DCOP::removeRow(QString,int,int)) +@case(DCOP::removeRow(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"count") @@ -933,7 +933,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,removeRow) @setGlobal(DESC,"Removes the row &#040;or <i>count</i> consecutive rows&#041; with the given index.") -@case(DCOP::selection(QString)) +@case(DCOP::selection(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -941,7 +941,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,selection) @setGlobal(DESC,"Returns selected text or text of current item.\nIn case of Table widgets, returns the selection coordinates, separated by commas in TopRow,LeftColumn,BottomRow,RightColumn form. ") -@case(DCOP::setAssociatedText(QString,QString)) +@case(DCOP::setAssociatedText(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -949,7 +949,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setAssociatedText) @setGlobal(DESC,"Sets scripts associated with widget. This is an advanced feature that would not be commonly used.") -@case(DCOP::setEnabled(QString,bool)) +@case(DCOP::setEnabled(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"enabled") @setGlobal(PARM2,"") @@ -957,7 +957,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEnabled) @setGlobal(DESC,"Enables or disables widget.") -@case(DCOP::setCellText(QString,int,int,QString)) +@case(DCOP::setCellText(TQString,int,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"col") @@ -965,7 +965,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setCellText) @setGlobal(DESC,"Sets text of a cell in a table.") -@case(DCOP::setCellWidget(QString,int,int,QString)) +@case(DCOP::setCellWidget(TQString,int,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"col") @@ -973,7 +973,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setCellWidget) @setGlobal(DESC,"Inserts a widget into a cell of a table.") -@case(DCOP::cellWidget(QString,int,int)) +@case(DCOP::cellWidget(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"col") @@ -981,7 +981,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,cellWidget) @setGlobal(DESC,"Returns the name of a widget inserted into a cell, or an empty string if the cell contains no widget or an unknown widget type.") -@case(DCOP::setChecked(QString,bool)) +@case(DCOP::setChecked(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"checked") @setGlobal(PARM2,"") @@ -989,7 +989,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setChecked) @setGlobal(DESC,"Sets/unsets checkbox.") -@case(DCOP::setColumnCaption(QString,int,QString)) +@case(DCOP::setColumnCaption(TQString,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"column") @setGlobal(PARM2,"text") @@ -997,7 +997,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setColumnCaption) @setGlobal(DESC,"Sets caption of the column <i>column</i>.") -@case(DCOP::setCurrentItem(QString,int)) +@case(DCOP::setCurrentItem(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -1005,7 +1005,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setCurrentItem) @setGlobal(DESC,"Selects the item at the specified index. Indexes are zero based.") -@case(DCOP::insertTab(QString,QString,int)) +@case(DCOP::insertTab(TQString,TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"label") @setGlobal(PARM2,"index") @@ -1013,7 +1013,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertTab) @setGlobal(DESC,"Inserts a tab to the tabwidget with the specified label at the given index. Indexes are zero based.") -@case(DCOP::setMaximum(QString,int)) +@case(DCOP::setMaximum(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"value") @setGlobal(PARM2,"") @@ -1021,7 +1021,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setMaximum) @setGlobal(DESC,"Sets maximum numeric value") -@case(DCOP::setPixmap(QString,QString,int)) +@case(DCOP::setPixmap(TQString,TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"iconName") @setGlobal(PARM2,"index") @@ -1029,7 +1029,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setPixmap) @setGlobal(DESC,"Sets pixmap at the given index to the specified icon. Use <i>index = -1</i> to set the pixmap for all items.") -@case(DCOP::setRowCaption(QString,int,QString)) +@case(DCOP::setRowCaption(TQString,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"text") @@ -1037,7 +1037,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setRowCaption) @setGlobal(DESC,"Sets caption of the row <i>row</i>.") -@case(DCOP::setSelection(QString,QString)) +@case(DCOP::setSelection(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1045,7 +1045,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setSelection) @setGlobal(DESC,"Selects given text or select item containing given text.") -@case(DCOP::setText(QString,QString)) +@case(DCOP::setText(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1053,7 +1053,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setText) @setGlobal(DESC,"Sets widget's content.") -@case(DCOP::setVisible(QString,bool)) +@case(DCOP::setVisible(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"visible") @setGlobal(PARM2,"") @@ -1061,7 +1061,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setVisible) @setGlobal(DESC,"Shows/hides widget.") -@case(DCOP::type(QString)) +@case(DCOP::type(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -1069,7 +1069,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,type) @setGlobal(DESC,"Returns type&#040;class&#041; of widget.") -@case(DCOP::setEditable(QString,bool)) +@case(DCOP::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1077,7 +1077,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Makes the widget editable or read only, depending on the editable argument.") -@case(Kommander::setEditable(QString,bool)) +@case(Kommander::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1085,7 +1085,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Returns current widget's content. This was required inside widget A to return widget A content when requested by widget B. The new method is to use &#064;A.text inside B instead of just &#064;A if you just want the unaltered text.") -@case(Kommander::setEditable(QString,bool)) +@case(Kommander::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1093,7 +1093,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Returns selected text or text of current item. This is deprecated for <i>&#064;mywidget.selected</i>.") -@case(Kommander::setEditable(QString,bool)) +@case(Kommander::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1101,7 +1101,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Does nothing. This is useful if you request a CheckBox or RadioButton to return a value where a state, typically the unchecked state, has no value. The &#064;null prevents an error indicating it is empty.") -@case(Kommander::pid(QString,bool)) +@case(Kommander::pid(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1109,7 +1109,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,pid) @setGlobal(DESC,"Returns the pid &#040;process ID&#041; of the current process.") -@case(Kommander::dcopid(QString,bool)) +@case(Kommander::dcopid(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1117,7 +1117,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,dcopid) @setGlobal(DESC,"Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-&#064;pid</i>.") -@case(Kommander::parentPid(QString,bool)) +@case(Kommander::parentPid(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1125,7 +1125,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,parentPid) @setGlobal(DESC,"Returns the pid of the parent Kommander window.") -@case(Kommander::debug(QString)) +@case(Kommander::debug(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1133,7 +1133,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,debug) @setGlobal(DESC,"Writes <i>text</i> on stderr.") -@case(Kommander::echo(QString)) +@case(Kommander::echo(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1141,7 +1141,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,echo) @setGlobal(DESC,"Writes <i>text</i> on standard output.") -@case(Kommander::echo(QString)) +@case(Kommander::echo(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1149,7 +1149,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,echo) @setGlobal(DESC,"Executes a script block. Bash is used if no shell is given. It is primarily for use in non-button widgets where script actions are not expected. Full path is not required for the shell which may be useful for portability. <p><i>If this is used inside a button it allows alternate script languages to be used and will return a value to the main script, which may be unexpected.</i>") -@case(Kommander::env(QString)) +@case(Kommander::env(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"") @@ -1157,7 +1157,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,env) @setGlobal(DESC,"Returns value of an environment &#040;shell&#041; variable. Do not use <i>$</i> in the name. For example, <i>&#064;env&#040;PATH&#041;</i>.") -@case(Kommander::exec(QString)) +@case(Kommander::exec(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"command") @setGlobal(PARM2,"") @@ -1165,7 +1165,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,exec) @setGlobal(DESC,"Executes an external shell command.") -@case(Kommander::exec(QString)) +@case(Kommander::exec(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"command") @setGlobal(PARM2,"") @@ -1173,7 +1173,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,exec) @setGlobal(DESC,"Parses an expression and returns computed value.") -@case(Kommander::forEach(QString,QString)) +@case(Kommander::forEach(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"items") @@ -1181,7 +1181,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,forEach) @setGlobal(DESC,"Executes loop: values from <i>items</i> list &#040;passed as EOL-separated string&#041; are assigned to the variable. <br><b>Old</b><br> <i>&#064;forEach&#040;i,A\\nB\\nC\\n&#041;<br> &#064;# &#064;i=A<br>&#064;end</i><br><b>New</b><br><i>foreach i in MyArray do<br> //i = key, MyArray[i] = val<br>end ") -@case(Kommander::for(QString,int,int,int)) +@case(Kommander::for(TQString,int,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"start") @@ -1189,7 +1189,7 @@ fi @setGlobal(PARM4,"step") @setGlobal(short,for) @setGlobal(DESC,"Executes loop: variable is set to <i>start</i> and is increased by <i>step</i> each time loop is executed. Execution stops when variable becomes larger then <i>end</i>. <br><b>Old</b><br><i>&#064;for&#040;i,1,10,1&#041;<br> &#064;# &#064;i=1<br>&#064;endif</i><br><b>New</b><br><i>for i=0 to 20 step 5 do<br> debug&#040;i&#041;<br>end</i>.") -@case(Kommander::for(QString,int,int,int)) +@case(Kommander::for(TQString,int,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"start") @@ -1197,7 +1197,7 @@ fi @setGlobal(PARM4,"step") @setGlobal(short,for) @setGlobal(DESC,"Returns the value of a global variable.") -@case(Kommander::i18n(QString)) +@case(Kommander::i18n(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"") @@ -1205,7 +1205,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,i18n) @setGlobal(DESC,"Translates the string into the current language. Texts in GUI would be automatically extracted for translation.") -@case(Kommander::if(QString)) +@case(Kommander::if(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"expression") @setGlobal(PARM2,"") @@ -1213,7 +1213,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,if) @setGlobal(DESC,"Executes block if expression is true &#040;non-zero number or non-empty string.&#041; <p><b>Old</b>Close with <b>&#064;endif</b></p><p><b>New</b><br>if val == true then<br>// do op<br>elseif cond<br>// second chance<br>else<br>// cond failed<br>endif</p>") -@case(Kommander::dialog(QString,QString)) +@case(Kommander::dialog(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"file") @setGlobal(PARM2,"args") @@ -1221,7 +1221,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,dialog) @setGlobal(DESC,"Executes another Kommander dialog. Current dialog directory is used if no path is given. Arguments may be given as named arguments which will become global variables in the new dialog. For instance: <i>var=val</i>") -@case(Kommander::readSetting(QString,QString)) +@case(Kommander::readSetting(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"key") @setGlobal(PARM2,"default") @@ -1229,7 +1229,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,readSetting) @setGlobal(DESC,"Reads setting from configration file for this dialog.") -@case(Kommander::setGlobal(QString,QString)) +@case(Kommander::setGlobal(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"value") @@ -1237,7 +1237,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setGlobal) @setGlobal(DESC,"Sets the value of a global variable. Global variables exist for the life of the Kommander window.") -@case(Kommander::writeSetting(QString,QString)) +@case(Kommander::writeSetting(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"key") @setGlobal(PARM2,"value") @@ -1245,7 +1245,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,writeSetting) @setGlobal(DESC,"Stores setting in configuration file for this dialog.") -@case(Kommander::writeSetting(QString,QString)) +@case(Kommander::writeSetting(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"key") @setGlobal(PARM2,"value") @@ -1253,7 +1253,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,writeSetting) @setGlobal(DESC,"Begin of <b>switch</b> block. Following <b>case</b> values are compared to <i>expression</i>.<p>&#064;switch&#040;&#041;<br>&#064;case&#040;&#041;<br>&#064;end") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1261,7 +1261,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Executes an external DCOP call.") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1269,7 +1269,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Adds a comment to EOL that Kommander will not parse") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1277,7 +1277,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Creates a new widget with the specified type and as the child of parent.") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1285,7 +1285,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Returns true if there is a widget with the passed name, false otherwise.") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1293,7 +1293,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Connects the signal of sender with the slot of the receiver") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1301,7 +1301,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Disconnects the signal of sender from the slot of the receiver") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1309,7 +1309,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Exits script execution and returns") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1317,7 +1317,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Exits the current block of a while, for or foreach loop") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1325,7 +1325,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Exit a step and return to the beginning of a loop") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1333,7 +1333,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Return from a script, optionaly with a value from the script to the caller") -@case(Array::values(QString)) +@case(Array::values(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1341,7 +1341,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,values) @setGlobal(DESC,"Returns an EOL-separated list of all values in the array.") -@case(Array::keys(QString)) +@case(Array::keys(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1349,7 +1349,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,keys) @setGlobal(DESC,"Returns an EOL-separated list of all keys in the array.") -@case(Array::clear(QString)) +@case(Array::clear(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1357,7 +1357,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,clear) @setGlobal(DESC,"Removes all elements from the array.") -@case(Array::count(QString)) +@case(Array::count(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1365,7 +1365,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,count) @setGlobal(DESC,"Returns the number of elements in the array.") -@case(Array::count(QString)) +@case(Array::count(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1373,7 +1373,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,count) @setGlobal(DESC,"Returns the value associated with the given key.") -@case(Array::remove(QString,QString)) +@case(Array::remove(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"key") @@ -1381,7 +1381,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,remove) @setGlobal(DESC,"Removes element with the given key from the array.") -@case(Array::remove(QString,QString)) +@case(Array::remove(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"key") @@ -1389,7 +1389,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,remove) @setGlobal(DESC,"Adds element with the given key and value to the array") -@case(Array::fromString(QString,QString)) +@case(Array::fromString(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"string") @@ -1397,7 +1397,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,fromString) @setGlobal(DESC,"Adds all elements in the string to the array. ") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1405,7 +1405,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"Returns all elements in the array in <pre>key\\tvalue\\n</pre> format.") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1413,7 +1413,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1421,7 +1421,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1429,7 +1429,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1437,7 +1437,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(String::length(QString)) +@case(String::length(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1445,7 +1445,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,length) @setGlobal(DESC,"Returns number of chars in the string.") -@case(String::contains(QString,QString)) +@case(String::contains(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @@ -1453,7 +1453,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,contains) @setGlobal(DESC,"Checks if the the string contains the given substring.") -@case(String::find(QString,QString,int)) +@case(String::find(TQString,TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"sought") @@ -1461,7 +1461,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,find) @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found.") -@case(String::findRev(QString,QString,int)) +@case(String::findRev(TQString,TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"sought") @@ -1469,7 +1469,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,findRev) @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found. String is searched backwards") -@case(String::left(QString,int)) +@case(String::left(TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"n") @@ -1477,7 +1477,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,left) @setGlobal(DESC,"Returns the first <i>n</i> chars of the string.") -@case(String::right(QString,int)) +@case(String::right(TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"n") @@ -1485,7 +1485,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,right) @setGlobal(DESC,"Returns the last <i>n</i> chars of the string.") -@case(String::mid(QString,int,int)) +@case(String::mid(TQString,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"start") @@ -1493,7 +1493,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,mid) @setGlobal(DESC,"Returns <i>n</i> chars of the string, starting from <i>start</i>.") -@case(String::remove(QString,QString)) +@case(String::remove(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @@ -1501,7 +1501,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,remove) @setGlobal(DESC,"Removes all occurrences of given substring.") -@case(String::replace(QString,QString,QString)) +@case(String::replace(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @@ -1509,7 +1509,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,replace) @setGlobal(DESC,"Replaces all occurrences of the given substring with the given replacement.") -@case(String::upper(QString)) +@case(String::upper(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1517,7 +1517,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,upper) @setGlobal(DESC,"Converts the string to uppercase.") -@case(String::lower(QString)) +@case(String::lower(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1525,7 +1525,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,lower) @setGlobal(DESC,"Converts the string to lowercase.") -@case(String::compare(QString,QString)) +@case(String::compare(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string1") @setGlobal(PARM2,"string2") @@ -1533,7 +1533,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,compare) @setGlobal(DESC,"Compares two strings. Returns 0 if they are equal, ") -@case(String::isEmpty(QString)) +@case(String::isEmpty(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1541,7 +1541,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,isEmpty) @setGlobal(DESC,"Checks if the string is empty.") -@case(String::isNumber(QString)) +@case(String::isNumber(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1549,7 +1549,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,isNumber) @setGlobal(DESC,"Checks if the string is a valid number.") -@case(String::section(QString,QString,int)) +@case(String::section(TQString,TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"separator") @@ -1557,7 +1557,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,section) @setGlobal(DESC,"Returns given section of a string.") -@case(String::args(QString,QString,QString,QString)) +@case(String::args(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"arg1") @@ -1565,7 +1565,7 @@ fi @setGlobal(PARM4,"arg3") @setGlobal(short,args) @setGlobal(DESC,"Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, <i>arg2</i>, <i>arg3</i> accordingly.") -@case(String::args(QString,QString,QString,QString)) +@case(String::args(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"arg1") @@ -1573,7 +1573,7 @@ fi @setGlobal(PARM4,"arg3") @setGlobal(short,args) @setGlobal(DESC,"Convert a string to an integer. If not possible use the default value") -@case(String::args(QString,QString,QString,QString)) +@case(String::args(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"arg1") @@ -1581,7 +1581,7 @@ fi @setGlobal(PARM4,"arg3") @setGlobal(short,args) @setGlobal(DESC,"Convert a string to a double precision floating point value. If not possible use the default value") -@case(File::read(QString)) +@case(File::read(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -1589,7 +1589,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,read) @setGlobal(DESC,"Returns content of given file.") -@case(File::write(QString,QString)) +@case(File::write(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"file") @setGlobal(PARM2,"string") @@ -1597,7 +1597,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,write) @setGlobal(DESC,"Writes given string to a file.") -@case(File::append(QString,QString)) +@case(File::append(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"file") @setGlobal(PARM2,"string") @@ -1605,7 +1605,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,append) @setGlobal(DESC,"Appends given string to the end of a file.") -@case(Input::text(QString,QString,QString)) +@case(Input::text(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"label") @@ -1613,7 +1613,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,text) @setGlobal(DESC,"Shows text selection dialog. Returns entered text.") -@case(Input::password(QString,QString)) +@case(Input::password(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"password") @@ -1621,7 +1621,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,password) @setGlobal(DESC,"Shows a dialog asking user for password and returns it.") -@case(Input::value(QString,QString,int,int,int,int)) +@case(Input::value(TQString,TQString,int,int,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"label") @@ -1629,7 +1629,7 @@ fi @setGlobal(PARM4,"min") @setGlobal(short,value) @setGlobal(DESC,"Shows value selection dialog. Returns entered value.") -@case(Input::double(QString,QString,double,double,double,double)) +@case(Input::double(TQString,TQString,double,double,double,double)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"label") @@ -1637,7 +1637,7 @@ fi @setGlobal(PARM4,"min") @setGlobal(short,double) @setGlobal(DESC,"Shows float value selection dialog. Returns entered value.") -@case(Input::openfile(QString,QString,QString)) +@case(Input::openfile(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1645,7 +1645,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,openfile) @setGlobal(DESC,"Shows existing file selection dialog. Returns selected file.") -@case(Input::savefile(QString,QString,QString)) +@case(Input::savefile(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1653,7 +1653,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,savefile) @setGlobal(DESC,"Shows save file selection dialog. Returns selected file.") -@case(Input::directory(QString,QString,QString)) +@case(Input::directory(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1661,7 +1661,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,directory) @setGlobal(DESC,"Shows directory selection dialog. Returns selected directory.") -@case(Input::openfiles(QString,QString,QString)) +@case(Input::openfiles(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1669,7 +1669,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,openfiles) @setGlobal(DESC,"Shows multiple files selection dialog. Returns EOL-separated list of selected files.") -@case(Message::info(QString,QString)) +@case(Message::info(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1677,7 +1677,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,info) @setGlobal(DESC,"Shows an information dialog.") -@case(Message::error(QString,QString)) +@case(Message::error(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1685,7 +1685,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,error) @setGlobal(DESC,"Shows an error dialog.") -@case(Message::warning(QString,QString,QString,QString,QString)) +@case(Message::warning(TQString,TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1693,7 +1693,7 @@ fi @setGlobal(PARM4,"button2") @setGlobal(short,warning) @setGlobal(DESC,"Shows a warning dialog with up to three buttons. Returns number of selected button.") -@case(Message::question(QString,QString,QString,QString,QString)) +@case(Message::question(TQString,TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1816,46 +1816,46 @@ fi <property name="associations" stdset="0"> <stringlist> <string>@##### put the following in the @filteroff script ######### -@setGlobal(DCOP,"addUniqueItem(QString,QString) -associatedText(QString) -cellText(QString,int,int) -checked(QString) -children(QString,bool) -clear(QString) -count(QString) -currentColumn(QString) -currentItem(QString) -currentRow(QString) -execute(QString) -findItem(QString,QString) -insertColumn(QString,int,int) -insertItem(QString,QString,int) -insertItems(QString,QStringList,int) -insertRow(QString,int,int) -item(QString,int) -itemDepth(QString,int) -itemPath(QString,int) -removeColumn(QString,int,int) -removeItem(QString,int) -removeRow(QString,int,int) -selection(QString) -setAssociatedText(QString,QString) -setEnabled(QString,bool) -setCellText(QString,int,int,QString) -setCellWidget(QString,int,int,QString) -cellWidget(QString,int,int) -setChecked(QString,bool) -setColumnCaption(QString,int,QString) -setCurrentItem(QString,int) -insertTab(QString,QString,int) -setMaximum(QString,int) -setPixmap(QString,QString,int) -setRowCaption(QString,int,QString) -setSelection(QString,QString) -setText(QString,QString) -setVisible(QString,bool) -type(QString) -setEditable(QString,bool)") +@setGlobal(DCOP,"addUniqueItem(TQString,TQString) +associatedText(TQString) +cellText(TQString,int,int) +checked(TQString) +children(TQString,bool) +clear(TQString) +count(TQString) +currentColumn(TQString) +currentItem(TQString) +currentRow(TQString) +execute(TQString) +findItem(TQString,TQString) +insertColumn(TQString,int,int) +insertItem(TQString,TQString,int) +insertItems(TQString,QStringList,int) +insertRow(TQString,int,int) +item(TQString,int) +itemDepth(TQString,int) +itemPath(TQString,int) +removeColumn(TQString,int,int) +removeItem(TQString,int) +removeRow(TQString,int,int) +selection(TQString) +setAssociatedText(TQString,TQString) +setEnabled(TQString,bool) +setCellText(TQString,int,int,TQString) +setCellWidget(TQString,int,int,TQString) +cellWidget(TQString,int,int) +setChecked(TQString,bool) +setColumnCaption(TQString,int,TQString) +setCurrentItem(TQString,int) +insertTab(TQString,TQString,int) +setMaximum(TQString,int) +setPixmap(TQString,TQString,int) +setRowCaption(TQString,int,TQString) +setSelection(TQString,TQString) +setText(TQString,TQString) +setVisible(TQString,bool) +type(TQString) +setEditable(TQString,bool)") @proto.clear @proto.insertItems(@global(DCOP), 0) @@ -1888,195 +1888,195 @@ setEditable(QString,bool)") @##### put the following in the @filteron script ######### @case(aboutdialog) - @setGlobal(DCOP,"execute(QString)") + @setGlobal(DCOP,"execute(TQString)") @case(buttongroup) - @setGlobal(DCOP,"checked(QString) -setChecked(QString,bool)") + @setGlobal(DCOP,"checked(TQString) +setChecked(TQString,bool)") @case(checkbox) - @setGlobal(DCOP,"setText(QString,QString) -checked(QString) -setChecked(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +checked(TQString) +setChecked(TQString,bool)") @case(closebutton) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(combobox) - @setGlobal(DCOP,"selection(QString) -setSelection(QString,QString) -currentItem(QString) -setCurrentItem(QString,int) -item(QString,int) -removeItem(QString,int) -insertItem(QString,QString,int) -insertItems(QString,QStringList,int) -addUniqueItem(QString,QString) -clear(QString) -count(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"selection(TQString) +setSelection(TQString,TQString) +currentItem(TQString) +setCurrentItem(TQString,int) +item(TQString,int) +removeItem(TQString,int) +insertItem(TQString,TQString,int) +insertItems(TQString,QStringList,int) +addUniqueItem(TQString,TQString) +clear(TQString) +count(TQString) +setEditable(TQString,bool)") @case(datepicker) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(dialog) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(execbutton) - @setGlobal(DCOP,"setText(QString,QString) -execute(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +execute(TQString)") @case(fileselector) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString)") @case(fontdialog) - @setGlobal(DCOP,"execute(QString)") + @setGlobal(DCOP,"execute(TQString)") @case(groupbox) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(konsole) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -execute(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +execute(TQString)") @case(label) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString)") @case(lineedit) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -clear(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString) +setEditable(TQString,bool)") @case(listbox) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -insertItems(QString,QStringList,int) -insertItem(QString,QString,int) -removeItem(QString,int) -clear(QString) -currentItem(QString) -setCurrentItem(QString,int) -item(QString,int) -addUniqueItem(QString,QString) -findItem(QString,QString) -setPixmap(QString,QString,int) -count(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +insertItems(TQString,QStringList,int) +insertItem(TQString,TQString,int) +removeItem(TQString,int) +clear(TQString) +currentItem(TQString) +setCurrentItem(TQString,int) +item(TQString,int) +addUniqueItem(TQString,TQString) +findItem(TQString,TQString) +setPixmap(TQString,TQString,int) +count(TQString)") @case(pixmaplabel) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString)") @case(popupmenu) - @setGlobal(DCOP,"clear(QString) -execute(QString) -item(QString,int) -count(QString)") + @setGlobal(DCOP,"clear(TQString) +execute(TQString) +item(TQString,int) +count(TQString)") @case(progressbar) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -setMaximum(QString,int)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +setMaximum(TQString,int)") @case(radiobutton) - @setGlobal(DCOP,"setText(QString,QString) -setChecked(QString,bool) -checked(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +setChecked(TQString,bool) +checked(TQString)") @case(richtexteditor) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -selection(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +selection(TQString) +setEditable(TQString,bool)") @case(scriptobject) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -execute(QString) -item(QString,int) -count(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +execute(TQString) +item(TQString,int) +count(TQString)") @case(slider) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -setMaximum(QString,int)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +setMaximum(TQString,int)") @case(spinboxint) - @setGlobal(DCOP,"setText(QString,QString) -setMaximum(QString,int)") + @setGlobal(DCOP,"setText(TQString,TQString) +setMaximum(TQString,int)") @case(statusbar) - @setGlobal(DCOP,"setText(QString,QString) -insertItem(QString,QString,int) -removeItem(QString,int) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +insertItem(TQString,TQString,int) +removeItem(TQString,int) +clear(TQString)") @case(table) - @setGlobal(DCOP,"currentColumn(QString) -currentRow(QString) -insertColumn(QString,int,int) -insertRow(QString,int,int) -cellText(QString,int,int) -setCellText(QString,int,int,QString) -setCellWidget(QString,int,int,QString) -cellWidget(QString,int,int) -removeRow(QString,int,int) -removeColumn(QString,int,int) -setColumnCaption(QString,int,QString) -setRowCaption(QString,int,QString) -setText(QString,QString) -selection(QString)") + @setGlobal(DCOP,"currentColumn(TQString) +currentRow(TQString) +insertColumn(TQString,int,int) +insertRow(TQString,int,int) +cellText(TQString,int,int) +setCellText(TQString,int,int,TQString) +setCellWidget(TQString,int,int,TQString) +cellWidget(TQString,int,int) +removeRow(TQString,int,int) +removeColumn(TQString,int,int) +setColumnCaption(TQString,int,TQString) +setRowCaption(TQString,int,TQString) +setText(TQString,TQString) +selection(TQString)") @case(tabwidget) - @setGlobal(DCOP,"currentItem(QString) -setCurrentItem(QString,int) -insertTab(QString,QString,int)") + @setGlobal(DCOP,"currentItem(TQString) +setCurrentItem(TQString,int) +insertTab(TQString,TQString,int)") @case(textbrowser) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +clear(TQString)") @case(textedit) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -clear(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString) +setEditable(TQString,bool)") @case(timer) - @setGlobal(DCOP,"setText(QString,QString) -execute(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +execute(TQString)") @case(timewidget) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(toolbox) - @setGlobal(DCOP,"count(QString)") + @setGlobal(DCOP,"count(TQString)") @case(treewidget) - @setGlobal(DCOP,"insertItem(QString,QString,int) -setText(QString,QString) -insertItems(QString,QStringList,int) -selection(QString) -setSelection(QString,QString) -clear(QString) -removeItem(QString,int) -currentItem(QString) -setCurrentItem(QString,int) -findItem(QString,QString) -item(QString,int) -itemPath(QString,int) -itemDepth(QString,int) -setPixmap(QString,QString,int) -setColumnCaption(QString,int,QString)") + @setGlobal(DCOP,"insertItem(TQString,TQString,int) +setText(TQString,TQString) +insertItems(TQString,QStringList,int) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString) +removeItem(TQString,int) +currentItem(TQString) +setCurrentItem(TQString,int) +findItem(TQString,TQString) +item(TQString,int) +itemPath(TQString,int) +itemDepth(TQString,int) +setPixmap(TQString,TQString,int) +setColumnCaption(TQString,int,TQString)") @end @proto.clear @@ -2095,13 +2095,13 @@ setColumnCaption(QString,int,QString)") <connections> <connection> <sender>wname</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>filterscript</receiver> <slot>execute()</slot> </connection> <connection> <sender>functiongroup</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>proto</receiver> <slot>populate()</slot> </connection> diff --git a/kommander/kmdrtools/examples.kmdr b/kommander/kmdrtools/examples.kmdr index b5a5f5d7..ae3a8ad4 100644 --- a/kommander/kmdrtools/examples.kmdr +++ b/kommander/kmdrtools/examples.kmdr @@ -75,7 +75,7 @@ end <number>0</number> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout90</cstring> </property> diff --git a/kommander/part/CMakeLists.txt b/kommander/part/CMakeLists.txt new file mode 100644 index 00000000..22b08144 --- /dev/null +++ b/kommander/part/CMakeLists.txt @@ -0,0 +1,47 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/executor + ${CMAKE_SOURCE_DIR}/kommander/factory +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkommander_part (kpart) + +tde_add_kpart( libkommander_part AUTOMOC + + SOURCES + kommander_part.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + kjs-shared + tdeparts-shared + tdehtml-shared + kommanderwidget-shared + kommanderplugin-shared + instance-static + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kommander_part.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kommander-desktops +) diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index 1d4fb709..66649ab3 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -66,7 +66,7 @@ bool KommanderPart::openFile() delete m_instance; m_instance = new Instance(0L); m_instance->build(m_url); - TQTimer::singleShot(0, this, TQT_SLOT(slotRun())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRun())); emit setStatusBarText( m_url.prettyURL() ); return true; diff --git a/kommander/part/kommander_part.desktop b/kommander/part/kommander_part.desktop index 239f4f25..024e8885 100644 --- a/kommander/part/kommander_part.desktop +++ b/kommander/part/kommander_part.desktop @@ -1,15 +1,7 @@ [Desktop Entry] Name=KommanderPart -Name[ca]=Part del Kommander -Name[de]=Kommander-Komponente -Name[et]=Kommanderi komponent -Name[nds]=Kommander-Komponent -Name[nl]=Kommander-component -Name[pl]=Moduł Kommandera -Name[ru]=Компонент Kommander -Name[sv]=Kommander-delprogram -Name[zh_TW]=Kommander 部件 + +Type=Service MimeType=application/x-kommander; X-TDE-ServiceTypes=KParts/ReadOnlyPart X-TDE-Library=libkommander_part -Type=Service diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h index aca36b89..91c10fdb 100644 --- a/kommander/part/kommander_part.h +++ b/kommander/part/kommander_part.h @@ -23,7 +23,7 @@ class TQGridLayout; class KommanderPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KommanderPart(TQWidget *parentWidget, const char *widgetName, diff --git a/kommander/plugin/CMakeLists.txt b/kommander/plugin/CMakeLists.txt new file mode 100644 index 00000000..44a70077 --- /dev/null +++ b/kommander/plugin/CMakeLists.txt @@ -0,0 +1,41 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kommanderplugin (shared) + +tde_add_library( kommanderplugin SHARED AUTOMOC + + SOURCES + kommanderplugin.cpp + specialinformation.cpp + LINK + tdecore-shared + tdeui-shared + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) + + +##### headers + +install( + FILES kommanderplugin.h specials.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/kommander/plugin/kommanderplugin.h b/kommander/plugin/kommanderplugin.h index 509ee9da..0699774e 100644 --- a/kommander/plugin/kommanderplugin.h +++ b/kommander/plugin/kommanderplugin.h @@ -44,7 +44,7 @@ class TQIconSet; class KOMMANDER_EXPORT KommanderPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: KommanderPlugin(); diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp index 0a80dd85..e8449f1a 100644 --- a/kommander/plugin/specialinformation.cpp +++ b/kommander/plugin/specialinformation.cpp @@ -12,7 +12,9 @@ * (at your option) any later version. * * * ***************************************************************************/ - +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "specials.h" #include "specialinformation.h" @@ -63,7 +65,7 @@ SpecialFunction::SpecialFunction(ParserType p, const TQString& name, const TQStr } -TQString SpecialFunction::prototype(uint prototypeFlags) const +TQString TDE_EXPORT SpecialFunction::prototype(uint prototypeFlags) const { if (!m_types.count()) return m_function; @@ -82,21 +84,21 @@ TQString SpecialFunction::prototype(uint prototypeFlags) const return TQString("%1(%2)").arg(m_function).arg(params.join(", ")); } -TQString SpecialFunction::argumentName(uint i) const +TQString TDE_EXPORT SpecialFunction::argumentName(uint i) const { if (i < m_args.count()) return m_args[i]; return TQString(); } -TQString SpecialFunction::argumentType(uint i) const +TQString TDE_EXPORT SpecialFunction::argumentType(uint i) const { if (i < m_types.count()) return m_types[i]; return TQString(); } -int SpecialFunction::argumentCount() const +int TDE_EXPORT SpecialFunction::argumentCount() const { return m_types.count(); } @@ -104,7 +106,7 @@ int SpecialFunction::argumentCount() const -int SpecialInformation::function(int group, const TQString& fname) +int TDE_EXPORT SpecialInformation::function(int group, const TQString& fname) { TQString f = fname.lower(); if (m_functions.contains(group) && m_functions[group].contains(f)) @@ -114,13 +116,13 @@ int SpecialInformation::function(int group, const TQString& fname) return -1; } -SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname) +TDE_EXPORT SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname) { int gid = group(gname); return m_specials[gid][function(gid, fname)]; } -int SpecialInformation::group(const TQString& gname) +int TDE_EXPORT SpecialInformation::group(const TQString& gname) { if (m_groups.contains(gname)) return m_groups[gname]; @@ -137,7 +139,7 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname) return function(group(gname), fname) != -1; } -bool SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p) +bool TDE_EXPORT SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p) { return m_specials.contains(gname) && m_specials[gname].contains(fname) && m_specials[gname][fname].isSupported(p); @@ -151,14 +153,14 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname, return f != -1 && m_specials[g][f].isSupported(p); } -int SpecialInformation::minArg(int gname, int fname) +int TDE_EXPORT SpecialInformation::minArg(int gname, int fname) { if (isValid(gname, fname)) return m_specials[gname][fname].minArg(); return -1; } -int SpecialInformation::maxArg(int gname, int fname) +int TDE_EXPORT SpecialInformation::maxArg(int gname, int fname) { if (isValid(gname, fname)) return m_specials[gname][fname].maxArg(); @@ -186,7 +188,7 @@ TQString SpecialInformation::description(int gname, int fname) return TQString(); } -TQString SpecialInformation::prototype(int gname, int fname, uint flags) +TQString TDE_EXPORT SpecialInformation::prototype(int gname, int fname, uint flags) { if (isValid(gname, fname)) return m_specials[gname][fname].prototype(flags); @@ -246,7 +248,7 @@ void SpecialInformation::insertGroup(int id, const TQString& name, const TQStrin } } -TQString SpecialInformation::parserGroupName(const TQString& name) +TQString TDE_EXPORT SpecialInformation::parserGroupName(const TQString& name) { if (m_parserGroups.contains(name)) return m_parserGroups[name]; @@ -254,12 +256,12 @@ TQString SpecialInformation::parserGroupName(const TQString& name) return name; } -TQStringList SpecialInformation::groups() +TQStringList TDE_EXPORT SpecialInformation::groups() { return m_groups.keys(); } -TQStringList SpecialInformation::functions(const TQString& g) +TQStringList TDE_EXPORT SpecialInformation::functions(const TQString& g) { int gid = group(g); if (gid == -1) @@ -279,7 +281,7 @@ bool SpecialFunction::isSupported(ParserType p) const return (m_parserTypes & p); } -void SpecialInformation::registerSpecials() +void TDE_EXPORT SpecialInformation::registerSpecials() { insertGroup(Group::DCOP, "DCOP", ""); insert(DCOP::addUniqueItem, "addUniqueItem(TQString widget, TQString item)", diff --git a/kommander/pluginmanager/CMakeLists.txt b/kommander/pluginmanager/CMakeLists.txt new file mode 100644 index 00000000..d65e78ff --- /dev/null +++ b/kommander/pluginmanager/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/factory +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kmdr-plugins (executable) + +tde_add_executable( kmdr-plugins AUTOMOC + + SOURCES + main.cpp + mainwindow.cpp + pluginmanager.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index dd196043..2f34f712 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -35,7 +35,7 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) toolBar->insertButton("document-open", Add, true, i18n("Add") ); toolBar->insertButton("no", Remove, true, i18n("Remove") ); toolBar->insertButton("reload", Refresh, true, i18n("Refresh") ); - connect( toolBar, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(toolButton(int)) ); + connect( toolBar, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(toolButton(int)) ); m_list = new TDEListBox( this ); setCentralWidget(m_list); diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h index b49c4e21..09e536b4 100644 --- a/kommander/pluginmanager/mainwindow.h +++ b/kommander/pluginmanager/mainwindow.h @@ -25,7 +25,7 @@ class PluginManager; class MainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); diff --git a/kommander/widget/CMakeLists.txt b/kommander/widget/CMakeLists.txt new file mode 100644 index 00000000..866a0dfd --- /dev/null +++ b/kommander/widget/CMakeLists.txt @@ -0,0 +1,49 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${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} +) + + +##### kommanderwidget (shared) + +tde_add_library( kommanderwidget SHARED AUTOMOC + + SOURCES + expression.cpp function.cpp + functionlib.cpp invokeclass.cpp + kmdrmainwindow.cpp kommanderfunctions.cpp + kommanderwidget.cpp kommanderwindow.cpp + myprocess.cpp parsenode.cpp + parser.cpp parserdata.cpp + LINK + tdecore-shared + tdeio-shared + tdeui-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) + + +##### headers + +install( + FILES kommanderwidget.h kommander_export.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index b0579897..47db3bd0 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -164,7 +164,7 @@ static ParseNode f_return(Parser* p, const ParameterList& params) static ParseNode f_stringRound(Parser*, const ParameterList& params) { TQString s; - s.sprintf("%."+params[1].toString()+"f", params[0].toDouble()); + s.sprintf("%.*f", params[1].toInt(), params[0].toDouble()); return s; } @@ -172,7 +172,7 @@ static ParseNode f_stringRound(Parser*, const ParameterList& params) static ParseNode f_debug(Parser*, const ParameterList& params) { for (uint i=0; i<params.count(); i++) - std::cerr << params[i].toString(); + std::cerr << params[i].toString().local8Bit(); std::cerr << "\n"; fflush(stderr); return ParseNode(); @@ -181,7 +181,7 @@ static ParseNode f_debug(Parser*, const ParameterList& params) static ParseNode f_echo(Parser*, const ParameterList& params) { for (uint i=0; i<params.count(); i++) - std::cout << params[i].toString(); + std::cout << params[i].toString().local8Bit(); fflush(stdout); return ParseNode(); } @@ -353,7 +353,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) byteDataStream << params[i++].toDouble(); else if (*it == "bool") byteDataStream << (bool)params[i++].toInt(); - else if (*it == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (*it == "TQStringList") if (params[i].toString().find('\n') != -1) byteDataStream << TQStringList::split("\n", params[i++].toString(), true); else @@ -371,7 +371,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) return ParseNode(); } TQDataStream byteReplyStream(byteReply, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { TQString text; byteReplyStream >> text; @@ -389,7 +389,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) byteReplyStream >> b; return b; } - else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (replyType == "TQStringList") { TQStringList text; byteReplyStream >> text; @@ -429,9 +429,9 @@ static ParseNode f_widgetExists(Parser* p, const ParameterList& params) static ParseNode f_connect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); @@ -445,9 +445,9 @@ static ParseNode f_connect(Parser* p, const ParameterList& params) static ParseNode f_disconnect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); @@ -510,7 +510,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params) static ParseNode f_i18n(Parser*, const ParameterList& params) { - return TDEGlobal::locale()->translate(params[0].toString()); + return TDEGlobal::locale()->translate(params[0].toString().utf8()); } static ParseNode f_env(Parser*, const ParameterList& params) @@ -567,13 +567,11 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params) TQStringList keys = P->array(name).keys(); TQValueList<ParseNode> values = P->array(name).values(); - TQStringList::Iterator it = keys.begin(); + TQStringList::Iterator it = keys.begin(); TQValueList<ParseNode>::Iterator itval = values.begin(); - while (*it) + for (; it != keys.end(); ++it, ++itval) { array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString()); - ++it; - ++itval; } return array; } diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp index ec360d69..033ea770 100644 --- a/kommander/widget/invokeclass.cpp +++ b/kommander/widget/invokeclass.cpp @@ -24,8 +24,8 @@ void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringLis { TQString invokeName = slot; invokeName = invokeName.mid(invokeName.find('(')); - invokeName.prepend(TQString::number(TQSIGNAL_CODE) + "invoke"); - TQString slotName = TQString::number(TQSLOT_CODE) + slot; + invokeName.prepend(TQString::number(TQ_SIGNAL_CODE) + "invoke"); + TQString slotName = TQString::number(TQ_SLOT_CODE) + slot; connect(this, invokeName.ascii(), object, slotName.ascii()); if (args.count() == 0) diff --git a/kommander/widget/invokeclass.h b/kommander/widget/invokeclass.h index 341aa78f..ac6ce32f 100644 --- a/kommander/widget/invokeclass.h +++ b/kommander/widget/invokeclass.h @@ -17,7 +17,7 @@ #include <tqstringlist.h> class InvokeClass : public TQObject { -Q_OBJECT +TQ_OBJECT public: InvokeClass(TQObject *parent); diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp index 5805c58d..c44ea4a6 100644 --- a/kommander/widget/kmdrmainwindow.cpp +++ b/kommander/widget/kmdrmainwindow.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "kmdrmainwindow.h" #include <tqtimer.h> @@ -16,7 +21,7 @@ KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f) : TDEMainWindow(parent, name, f) { - TQTimer::singleShot(10, this, TQT_SIGNAL(initialize())); + TQTimer::singleShot(10, this, TQ_SIGNAL(initialize())); } diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h index 91be985d..484969d5 100644 --- a/kommander/widget/kmdrmainwindow.h +++ b/kommander/widget/kmdrmainwindow.h @@ -17,9 +17,9 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class KmdrMainWindow : public TDEMainWindow +class TDE_EXPORT KmdrMainWindow : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: KmdrMainWindow(TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose); diff --git a/kommander/widget/kommander_export.h b/kommander/widget/kommander_export.h index 3cc7aa73..3fc17b1e 100644 --- a/kommander/widget/kommander_export.h +++ b/kommander/widget/kommander_export.h @@ -27,7 +27,7 @@ #include <kdemacros.h> -#define KOMMANDER_EXPORT KDE_EXPORT +#define KOMMANDER_EXPORT TDE_EXPORT #else #define KOMMANDER_EXPORT diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 3d580f88..59aaec07 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -57,7 +57,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL case Kommander::env: return TQString(getenv(args[0].latin1())); case Kommander::i18n: - return TDEGlobal::locale()->translate(args[0]); + return TDEGlobal::locale()->translate(args[0].utf8()); case Kommander::global: return global(args[0]); case Kommander::setGlobal: diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 7d80c8db..5ccb8375 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -295,7 +295,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteDataStream << a_query[i+3].toDouble(); else if (argTypes[i] == "bool") byteDataStream << (bool)(a_query[i+3] != "false" && a_query[i+3] != "false" && a_query[i+3] != "0"); - else if (argTypes[i] == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (argTypes[i] == "TQStringList") if (a_query[i+3].find('\n') != -1) byteDataStream << TQStringList::split("\n", a_query[i+3], true); else @@ -312,7 +312,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) } TQDataStream byteReplyStream(byteReply, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { TQString text; byteReplyStream >> text; @@ -330,7 +330,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteReplyStream >> b; return TQString::number(b); } - else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (replyType == "TQStringList") { TQStringList text; byteReplyStream >> text; @@ -413,12 +413,12 @@ void KommanderWidget::printError(const TQString& a_error) const case KDialogBase::Yes: break; case KDialogBase::Cancel: - if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parentDialog()->inherits("TQDialog")) { parentDialog()->close(); exit(-1); } - else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + else if (parentDialog()->inherits("TQMainWindow")) kapp->quit(); } } @@ -655,7 +655,7 @@ TQWidget* KommanderWidget::parentDialog() const while (superParent->parent()) { superParent = superParent->parent(); - if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (superParent->inherits("TQDialog") || superParent->inherits("TQMainWindow")) break; } return (TQWidget*)superParent; @@ -695,7 +695,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg case DCOP::children: { TQStringList matching; - TQObjectList* widgets = current->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false"); + TQObjectList* widgets = current->queryList("TQWidget", 0, false, args.count() == 0 || args[0] != "false"); for (TQObject* w = widgets->first(); w; w = widgets->next()) if (w->name() && (dynamic_cast<KommanderWidget*>(w))) matching.append(w->name()); diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp index 45e64790..943589c7 100644 --- a/kommander/widget/myprocess.cpp +++ b/kommander/widget/myprocess.cpp @@ -85,9 +85,9 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) mProcess = new TDEProcess; (*mProcess) << shellName.latin1(); - connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); if(!mProcess->start(TDEProcess::NotifyOnExit, TDEProcess::All)) { @@ -102,7 +102,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) else { TQWidget dummy(0, 0, WType_Dialog | WShowModal); - dummy.setFocusPolicy(TQ_NoFocus); + dummy.setFocusPolicy(TQWidget::NoFocus); m_loopStarted = true; tqt_enter_modal(&dummy); tqApp->enter_loop(); diff --git a/kommander/widget/myprocess.h b/kommander/widget/myprocess.h index 039db894..aed080d9 100644 --- a/kommander/widget/myprocess.h +++ b/kommander/widget/myprocess.h @@ -28,7 +28,7 @@ class KommanderWidget; class KOMMANDER_EXPORT MyProcess : public TQObject { - Q_OBJECT + TQ_OBJECT public: MyProcess(const KommanderWidget *); diff --git a/kommander/widgets/CMakeLists.txt b/kommander/widgets/CMakeLists.txt new file mode 100644 index 00000000..a3e2d641 --- /dev/null +++ b/kommander/widgets/CMakeLists.txt @@ -0,0 +1,52 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/factory + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kommanderwidgets (shared) + +tde_add_library( kommanderwidgets SHARED AUTOMOC + + SOURCES + aboutdialog.cpp buttongroup.cpp + checkbox.cpp closebutton.cpp + combobox.cpp datepicker.cpp dialog.cpp + execbutton.cpp fileselector.cpp + fontdialog.cpp groupbox.cpp + konsole.cpp label.cpp + lineedit.cpp listbox.cpp + pixmaplabel.cpp plugin.cpp + popupmenu.cpp progressbar.cpp + radiobutton.cpp richtexteditor.cpp + scriptobject.cpp slider.cpp + spinboxint.cpp statusbar.cpp + subdialog.cpp table.cpp + tabwidget.cpp textbrowser.cpp + textedit.cpp timer.cpp + toolbox.cpp treewidget.cpp + wizard.cpp + LINK + tdeio-shared + kommanderwidget-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index a9a8f77f..1ed4888e 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqfile.h> #include "aboutdialog.h" @@ -37,7 +42,7 @@ enum Functions { }; AboutDialog::AboutDialog(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -119,8 +124,8 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons m_appName = appName; m_icon = icon; m_copyright = copyright; - m_aboutData = new TDEAboutData(m_appName, m_appName, m_version); - m_aboutData->setCopyrightStatement(m_copyright); + m_aboutData = new TDEAboutData(m_appName.utf8(), m_appName.utf8(), m_version.utf8()); + m_aboutData->setCopyrightStatement(m_copyright.utf8()); if (!m_icon.isEmpty()) m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage()); } @@ -133,7 +138,7 @@ void AboutDialog::addAuthor(const TQString& author, const TQString &task, const m_emails.append(email); m_tasks.append(task); m_addresses.append(webAddress); - m_aboutData->addAuthor(author, task, email, webAddress); + m_aboutData->addAuthor(author.utf8(), task.utf8(), email.utf8(), webAddress.utf8()); } void AboutDialog::addTranslator(const TQString& author, const TQString& email) @@ -142,7 +147,7 @@ void AboutDialog::addTranslator(const TQString& author, const TQString& email) return; m_authors.append(author); m_emails.append(email); - m_aboutData->setTranslator(author, email); + m_aboutData->setTranslator(author.utf8(), email.utf8()); } void AboutDialog::setDescription(const TQString& description) @@ -150,7 +155,7 @@ void AboutDialog::setDescription(const TQString& description) if (!m_aboutData) return; m_description = description; - m_aboutData->setShortDescription(m_description); + m_aboutData->setShortDescription(m_description.utf8()); } void AboutDialog::setHomepage(const TQString &homepage) @@ -158,7 +163,7 @@ void AboutDialog::setHomepage(const TQString &homepage) if (!m_aboutData) return; m_homepage = homepage; - m_aboutData->setHomepage(m_homepage); + m_aboutData->setHomepage(m_homepage.utf8()); } void AboutDialog::setBugAddress(const TQString &bugAddress) @@ -166,7 +171,7 @@ void AboutDialog::setBugAddress(const TQString &bugAddress) if (!m_aboutData) return; m_bugaddress = bugAddress; - m_aboutData->setBugAddress(m_bugaddress); + m_aboutData->setBugAddress(m_bugaddress.utf8()); } void AboutDialog::setLicense(const TQString &key) @@ -195,7 +200,7 @@ void AboutDialog::setLicense(const TQString &key) { if (!key.isEmpty()) m_license = key; - m_aboutData->setLicenseText(m_license); + m_aboutData->setLicenseText(m_license.utf8()); } else { @@ -204,9 +209,9 @@ void AboutDialog::setLicense(const TQString &key) if (!key.isEmpty()) file = key; } - m_aboutData->setLicenseTextFile(file); - } - + m_aboutData->setLicenseTextFile(file.utf8()); + } + } void AboutDialog::setPopulationText(const TQString& a_text) diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 440541c8..fdb1b2aa 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -21,9 +21,9 @@ class TDEAboutData; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class AboutDialog : public TQLabel, public KommanderWidget +class TDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp index 3d17b042..d598d64c 100644 --- a/kommander/widgets/buttongroup.cpp +++ b/kommander/widgets/buttongroup.cpp @@ -39,7 +39,7 @@ enum Functions { }; ButtonGroup::ButtonGroup(TQWidget *a_parent, const char *a_name) - : TQButtonGroup(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQButtonGroup(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "checked"; diff --git a/kommander/widgets/buttongroup.h b/kommander/widgets/buttongroup.h index cf2aa882..d9f79a86 100644 --- a/kommander/widgets/buttongroup.h +++ b/kommander/widgets/buttongroup.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ButtonGroup : public TQButtonGroup, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp index 61ab0aff..f7fe20be 100644 --- a/kommander/widgets/checkbox.cpp +++ b/kommander/widgets/checkbox.cpp @@ -29,7 +29,7 @@ #include "checkbox.h" CheckBox::CheckBox(TQWidget *a_parent, const char *a_name) - : TQCheckBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQCheckBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "unchecked"; diff --git a/kommander/widgets/checkbox.h b/kommander/widgets/checkbox.h index 6a740246..24713e9f 100644 --- a/kommander/widgets/checkbox.h +++ b/kommander/widgets/checkbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT CheckBox : public TQCheckBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index eeb2c79f..07fb7ed8 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -31,7 +31,7 @@ #include "closebutton.h" CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) - : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KPushButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -39,16 +39,16 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); - TQObject *parent = TQT_TQOBJECT(this); + TQObject *parent = this; while (parent->parent() != 0) { parent = parent->parent(); - if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parent->inherits("TQDialog")) break; } - connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); + connect(this, TQ_SIGNAL(clicked()), parent, TQ_SLOT(reject())); } CloseButton::~CloseButton() @@ -105,10 +105,10 @@ void CloseButton::startProcess() KShellProcess *process = new KShellProcess("/bin/sh"); *process << at; - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(endProcess(TDEProcess *))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(endProcess(TDEProcess *))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); if (!process->start(TDEProcess::Block, TDEProcess::Stdout)) diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h index 975a3f46..96a5689a 100644 --- a/kommander/widgets/closebutton.h +++ b/kommander/widgets/closebutton.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT CloseButton : public KPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp index 6ebb9c17..1bb99c2b 100644 --- a/kommander/widgets/combobox.cpp +++ b/kommander/widgets/combobox.cpp @@ -37,14 +37,14 @@ enum Functions { ComboBox::ComboBox(TQWidget *a_parent, const char *a_name) - : KComboBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KComboBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(emitWidgetTextChanged(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(emitWidgetTextChanged(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(popupList, "popupList(TQString widget)", i18n("Make the ComboBox expose it's list without mousing around."), 1); diff --git a/kommander/widgets/combobox.h b/kommander/widgets/combobox.h index 70a4c2d7..c964667d 100644 --- a/kommander/widgets/combobox.h +++ b/kommander/widgets/combobox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ComboBox : public KComboBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp index 64a064d3..6114f7f7 100644 --- a/kommander/widgets/datepicker.cpp +++ b/kommander/widgets/datepicker.cpp @@ -27,7 +27,7 @@ #include "datepicker.h" DatePicker::DatePicker(TQWidget *a_parent, const char *a_name) - : KDatePicker(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KDatePicker(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -76,13 +76,13 @@ void DatePicker::populate() void DatePicker::setWidgetText(const TQString& a_text) { - setDate(TQDate::fromString(a_text, Qt::ISODate)); + setDate(TQDate::fromString(a_text, TQt::ISODate)); emit widgetTextChanged(a_text); } TQString DatePicker::widgetText() const { - return date().toString(Qt::ISODate); + return date().toString(TQt::ISODate); } @@ -108,9 +108,9 @@ TQString DatePicker::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: - return date().toString(Qt::ISODate); + return date().toString(TQt::ISODate); case DCOP::setText: - setDate(TQDate::fromString(args[0], Qt::ISODate)); + setDate(TQDate::fromString(args[0], TQt::ISODate)); break; case DCOP::geometry: { diff --git a/kommander/widgets/datepicker.h b/kommander/widgets/datepicker.h index aa9e81e9..ddfa3be9 100644 --- a/kommander/widgets/datepicker.h +++ b/kommander/widgets/datepicker.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT DatePicker : public KDatePicker, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp index 4f73cedc..3c6ed20f 100644 --- a/kommander/widgets/dialog.cpp +++ b/kommander/widgets/dialog.cpp @@ -13,6 +13,15 @@ * (at your option) any later version. * * * ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef KMDR_EXECUTOR_PATH +#define KMDR_EXECUTOR_PATH "/usr/bin/kmdr-executor" +#endif + /* KDE INCLUDES */ #include <tdelocale.h> @@ -41,7 +50,7 @@ enum Functions { }; Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(TQT_TQOBJECT(this)) + : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this) { TQStringList states; states << "default"; @@ -50,7 +59,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); m_useShebang = false; - m_shebang = "#!/usr/bin/kmdr-executor"; + m_shebang = "#!" KMDR_EXECUTOR_PATH; m_firstShow = true; KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)", i18n("The name of the widget having focus"), 1); diff --git a/kommander/widgets/dialog.h b/kommander/widgets/dialog.h index 9f34dd94..1859ed79 100644 --- a/kommander/widgets/dialog.h +++ b/kommander/widgets/dialog.h @@ -28,7 +28,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Dialog : public TQDialog, public KommanderWindow { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index fa535813..9ab99d1f 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -48,7 +48,7 @@ enum Functions { }; ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) - : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KPushButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -56,7 +56,7 @@ ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); setBlockGUI(Button); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(EB_isOn, "isOn(TQString widget)", i18n("For use only when button is togle type."), 1); @@ -120,13 +120,13 @@ void ExecButton::startProcess() TDEApplication::setOverrideCursor(TQCursor(TQt::WaitCursor)); MyProcess* process = new MyProcess(this); process->setBlocking(m_blockGUI == GUI); - connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); + connect(process, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); m_output = process->run(at); if (m_blockGUI == GUI) { TDEApplication::restoreOverrideCursor(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; } setEnabled(enabledStatus); } @@ -160,7 +160,7 @@ void ExecButton::processExited(MyProcess* p) { m_output = p->output(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; delete p; } } diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h index 58fb7ef5..f866f8b2 100644 --- a/kommander/widgets/execbutton.h +++ b/kommander/widgets/execbutton.h @@ -35,7 +35,7 @@ class MyProcess; class TQShowEvent; class KOMMANDER_EXPORT ExecButton : public KPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS(Blocking) diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index 9d6869a7..f562662c 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -35,7 +35,7 @@ #include "fileselector.h" FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) - : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQWidget(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -54,7 +54,7 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection())); + connect(m_selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(makeSelection())); setSelectionType(Open); setSelectionOpenMultiple(false); diff --git a/kommander/widgets/fileselector.h b/kommander/widgets/fileselector.h index ecdbf402..2f69c872 100644 --- a/kommander/widgets/fileselector.h +++ b/kommander/widgets/fileselector.h @@ -35,7 +35,7 @@ class KLineEdit; class TQShowEvent; class KOMMANDER_EXPORT FileSelector : public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 419fc8d2..95c4fe82 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "fontdialog.h" #include "kommanderplugin.h" @@ -29,7 +34,7 @@ enum Functions { }; FontDialog::FontDialog(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index c9e9e7ba..039bab06 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -20,9 +20,9 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class FontDialog : public TQLabel, public KommanderWidget +class TDE_EXPORT FontDialog : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp index a90f447e..027168d8 100644 --- a/kommander/widgets/groupbox.cpp +++ b/kommander/widgets/groupbox.cpp @@ -32,7 +32,7 @@ GroupBox::GroupBox(TQWidget *a_parent, const char *a_name) - : TQGroupBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQGroupBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -84,13 +84,13 @@ void GroupBox::populate() void GroupBox::insertChild(TQObject *a_child) { m_childList.append(a_child); - TQT_TQOBJECT(this)->TQObject::insertChild(a_child); + this->TQObject::insertChild(a_child); } void GroupBox::removeChild(TQObject *a_child) { m_childList.remove(a_child); - TQT_TQOBJECT(this)->TQObject::removeChild(a_child); + this->TQObject::removeChild(a_child); } void GroupBox::showEvent( TQShowEvent *e ) diff --git a/kommander/widgets/groupbox.h b/kommander/widgets/groupbox.h index aac0d9ce..33472edc 100644 --- a/kommander/widgets/groupbox.h +++ b/kommander/widgets/groupbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT GroupBox : public TQGroupBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp index bbfc5309..dd4a955d 100644 --- a/kommander/widgets/konsole.cpp +++ b/kommander/widgets/konsole.cpp @@ -26,7 +26,7 @@ #include <myprocess.h> Konsole::Konsole(TQWidget* a_parent, const char* a_name) - : KTextEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), mSeenEOL(false), mProcess(0) + : KTextEdit(a_parent, a_name), KommanderWidget(this), mSeenEOL(false), mProcess(0) { TQStringList states; states << "default"; @@ -87,8 +87,8 @@ void Konsole::execute() mSeenEOL = false; mProcess = new MyProcess(this); mProcess->setBlocking(false); - connect(mProcess, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); - connect(mProcess, TQT_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQT_SLOT(processReceivedStdout(MyProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); + connect(mProcess, TQ_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQ_SLOT(processReceivedStdout(MyProcess*, char*, int))); setCursor(TQCursor(TQt::WaitCursor)); mProcess->run(at); } diff --git a/kommander/widgets/konsole.h b/kommander/widgets/konsole.h index 9ab83525..5c2722e5 100644 --- a/kommander/widgets/konsole.h +++ b/kommander/widgets/konsole.h @@ -31,7 +31,7 @@ class MyProcess; class KOMMANDER_EXPORT Konsole : public KTextEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp index 31d0adac..ee422325 100644 --- a/kommander/widgets/label.cpp +++ b/kommander/widgets/label.cpp @@ -26,7 +26,7 @@ #include "label.h" Label::Label(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/label.h b/kommander/widgets/label.h index 8c0b2ed3..cd49dadd 100644 --- a/kommander/widgets/label.h +++ b/kommander/widgets/label.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT Label : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp index 7a01ae4e..f75526d9 100644 --- a/kommander/widgets/lineedit.cpp +++ b/kommander/widgets/lineedit.cpp @@ -31,15 +31,15 @@ enum functions { }; LineEdit::LineEdit(TQWidget *a_parent, const char *a_name) - : KLineEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KLineEdit(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged(const TQString &)), this, - TQT_SIGNAL(widgetTextChanged(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), this, + TQ_SIGNAL(widgetTextChanged(const TQString &))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(LE_clearModified, "clearModified(TQString widget)", i18n("Clear widget modified status."), 1); diff --git a/kommander/widgets/lineedit.h b/kommander/widgets/lineedit.h index d56b3e30..581fa4cc 100644 --- a/kommander/widgets/lineedit.h +++ b/kommander/widgets/lineedit.h @@ -33,7 +33,7 @@ class TQShowEvent; class KOMMANDER_EXPORT LineEdit : public KLineEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index 5d067f9c..b1d465c6 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -30,7 +30,7 @@ #include "listbox.h" ListBox::ListBox(TQWidget *a_parent, const char *a_name) - : TDEListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h index 61932c64..9ced5462 100644 --- a/kommander/widgets/listbox.h +++ b/kommander/widgets/listbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ListBox : public TDEListBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp index a9298530..3d71ab1e 100644 --- a/kommander/widgets/pixmaplabel.cpp +++ b/kommander/widgets/pixmaplabel.cpp @@ -31,7 +31,7 @@ #include "pixmaplabel.h" PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/pixmaplabel.h b/kommander/widgets/pixmaplabel.h index 35538be1..3fbf08fe 100644 --- a/kommander/widgets/pixmaplabel.h +++ b/kommander/widgets/pixmaplabel.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT PixmapLabel : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 343526ae..b24e5956 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "popupmenu.h" #include "specials.h" @@ -33,7 +38,7 @@ #define LAST_FUNCTION INSERTSUBMENU PopupMenu::PopupMenu(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -50,7 +55,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name) setHidden(true); m_menu = new TDEPopupMenu(this); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuItemActivated(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(INSERTMENUITEM, "insertMenuItem(TQString widget, TQString text, TQString executeWidget, int index, TQString icon)", i18n("Insert an item into the popup menu. The executeWidget's execute method will be run when this item is selected. Returns the id of the inserted item. Use -1 for index to insert to the end. The icon is optional."), 4, 5); diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index 7d691ff0..60a095e3 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -22,9 +22,9 @@ class TDEPopupMenu; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class PopupMenu : public TQLabel, public KommanderWidget +class TDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp index 111ffe9f..88e253e9 100644 --- a/kommander/widgets/progressbar.cpp +++ b/kommander/widgets/progressbar.cpp @@ -36,7 +36,7 @@ enum Functions { }; ProgressBar::ProgressBar(TQWidget *a_parent, const char *a_name) - : KProgress(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KProgress(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/progressbar.h b/kommander/widgets/progressbar.h index 7570b681..9532e139 100644 --- a/kommander/widgets/progressbar.h +++ b/kommander/widgets/progressbar.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ProgressBar: public KProgress, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp index d6306c80..ba46248d 100644 --- a/kommander/widgets/radiobutton.cpp +++ b/kommander/widgets/radiobutton.cpp @@ -28,7 +28,7 @@ #include "radiobutton.h" RadioButton::RadioButton(TQWidget *a_parent, const char *a_name) - : TQRadioButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQRadioButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "unchecked"; diff --git a/kommander/widgets/radiobutton.h b/kommander/widgets/radiobutton.h index 2870a230..15f18a78 100644 --- a/kommander/widgets/radiobutton.h +++ b/kommander/widgets/radiobutton.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT RadioButton : public TQRadioButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index 3233ea8f..33127372 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -43,7 +43,7 @@ #include "pixmaps/textright.xpm" RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) - : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQWidget(a_parent, a_name), KommanderWidget(this) { TQStringList states; @@ -84,15 +84,15 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextBold = new TQToolButton(m_formatGroup, "textBold"); m_buttonTextBold->setPixmap(TQPixmap((const char **)bold_xpm)); m_buttonTextBold->setToggleButton(true); - connect(m_buttonTextBold, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textBold(bool))); + connect(m_buttonTextBold, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textBold(bool))); m_buttonTextItalic = new TQToolButton(m_formatGroup, "textItalic"); m_buttonTextItalic->setPixmap(TQPixmap((const char **)italic_xpm)); m_buttonTextItalic->setToggleButton(true); - connect(m_buttonTextItalic, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textItalic(bool))); + connect(m_buttonTextItalic, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textItalic(bool))); m_buttonTextUnder = new TQToolButton(m_formatGroup, "textUnder"); m_buttonTextUnder->setPixmap(TQPixmap((const char **)under_xpm)); m_buttonTextUnder->setToggleButton(true); - connect(m_buttonTextUnder, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textUnder(bool))); + connect(m_buttonTextUnder, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textUnder(bool))); m_buttonTextLeft = new TQToolButton(m_alignGroup, "textLeft"); m_buttonTextLeft->setPixmap(TQPixmap((const char **)left_xpm)); @@ -104,11 +104,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextRight->setPixmap(TQPixmap((const char **)right_xpm)); m_buttonTextRight->setToggleButton(true); - connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int))); - connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &))); - connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int))); + connect(m_alignGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(textAlign(int))); + connect(m_textedit, TQ_SIGNAL(currentFontChanged(const TQFont &)), this, TQ_SLOT(fontChanged(const TQFont &))); + connect(m_textedit, TQ_SIGNAL(currentAlignmentChanged(int)), this, TQ_SLOT(alignmentChanged(int))); - connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(m_textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); } diff --git a/kommander/widgets/richtexteditor.h b/kommander/widgets/richtexteditor.h index b7fd1540..79119f94 100644 --- a/kommander/widgets/richtexteditor.h +++ b/kommander/widgets/richtexteditor.h @@ -36,7 +36,7 @@ class TQHButtonGroup; class TQShowEvent; class KOMMANDER_EXPORT RichTextEditor : public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp index 514c4ae5..2b444471 100644 --- a/kommander/widgets/scriptobject.cpp +++ b/kommander/widgets/scriptobject.cpp @@ -30,7 +30,7 @@ #include <specials.h> ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/scriptobject.h b/kommander/widgets/scriptobject.h index 2a954f2d..9d427351 100644 --- a/kommander/widgets/scriptobject.h +++ b/kommander/widgets/scriptobject.h @@ -28,7 +28,7 @@ class KOMMANDER_EXPORT ScriptObject : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/slider.cpp b/kommander/widgets/slider.cpp index b8068ede..8c7d06bf 100644 --- a/kommander/widgets/slider.cpp +++ b/kommander/widgets/slider.cpp @@ -23,7 +23,7 @@ #include "slider.h" Slider::Slider(TQWidget * a_parent, const char *a_name) - : TQSlider(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQSlider(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/slider.h b/kommander/widgets/slider.h index 517f00e9..4bb1f1e3 100644 --- a/kommander/widgets/slider.h +++ b/kommander/widgets/slider.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Slider: public TQSlider, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp index 72991376..a2b9af6a 100644 --- a/kommander/widgets/spinboxint.cpp +++ b/kommander/widgets/spinboxint.cpp @@ -28,7 +28,7 @@ #include "spinboxint.h" SpinBoxInt::SpinBoxInt(TQWidget *a_parent, const char *a_name) - : TQSpinBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQSpinBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/spinboxint.h b/kommander/widgets/spinboxint.h index 777ee291..93b75813 100644 --- a/kommander/widgets/spinboxint.h +++ b/kommander/widgets/spinboxint.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT SpinBoxInt : public TQSpinBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/statusbar.cpp b/kommander/widgets/statusbar.cpp index 3c5e76f5..0a3a249f 100644 --- a/kommander/widgets/statusbar.cpp +++ b/kommander/widgets/statusbar.cpp @@ -27,7 +27,7 @@ #include "statusbar.h" StatusBar::StatusBar(TQWidget *a_parent, const char *a_name) - : KStatusBar(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KStatusBar(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/statusbar.h b/kommander/widgets/statusbar.h index f7e8f139..91fbe0b6 100644 --- a/kommander/widgets/statusbar.h +++ b/kommander/widgets/statusbar.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT StatusBar : public KStatusBar, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp index 47e4ec69..66c8770b 100644 --- a/kommander/widgets/subdialog.cpp +++ b/kommander/widgets/subdialog.cpp @@ -32,14 +32,14 @@ #include "subdialog.h" SubDialog::SubDialog(TQWidget *a_parent, const char *a_name) - : TQPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), m_dialog(0) + : TQPushButton(a_parent, a_name), KommanderWidget(this), m_dialog(0) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(showDialog())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(showDialog())); } @@ -103,7 +103,7 @@ void SubDialog::showDialog() if(!m_dialog) { kdWarning() << "Creation of sub dialog failed .." << endl; - connect(m_dialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished())); + connect(m_dialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFinished())); m_dialog->exec(); } diff --git a/kommander/widgets/subdialog.h b/kommander/widgets/subdialog.h index bbf07e21..7f742c51 100644 --- a/kommander/widgets/subdialog.h +++ b/kommander/widgets/subdialog.h @@ -33,7 +33,7 @@ class TQDialog; class TQShowEvent; class KOMMANDER_EXPORT SubDialog : public TQPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp index 49ea5c19..6a8abc4b 100644 --- a/kommander/widgets/table.cpp +++ b/kommander/widgets/table.cpp @@ -48,7 +48,7 @@ enum Functions { Table::Table(TQWidget *a_parent, const char *a_name) - : TQTable(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQTable(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -57,11 +57,11 @@ Table::Table(TQWidget *a_parent, const char *a_name) KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TBL_sortColumnExtra, "sortColumnExtra(TQString widget, int col, bool ascending, bool wholeRows)", i18n("Sets a column to sort ascending or descending. Optionally can sort with rows intact for database use."), 2, 4); KommanderPlugin::registerFunction(TBL_keepCellVisible, "keepCellVisible(TQString widget, int row, int col)", i18n("Scrolls the table so the cell indicated is visible."), 3); - KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 5); + KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses"), 5); KommanderPlugin::registerFunction(TBL_selectRow, "selectRow(TQString widget, int row)", i18n("Select the row with the zero based index."), 2); - KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 2); - KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); - KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); + KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index."), 2); + KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index."), 3); + KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index."), 3); KommanderPlugin::registerFunction(TBL_rowCount, "rowCount(TQString widget)", i18n("Returns the number of rows of the table"), 1); KommanderPlugin::registerFunction(TBL_colHeader, "columnHeader(TQString widget, int Column)", i18n("Returns the text of the header for the column index"), 2); KommanderPlugin::registerFunction(TBL_rowHeader, "rowHeader(TQString widget, int Row)", i18n("Returns the text of the header for the row index"), 2); @@ -131,7 +131,7 @@ void Table::setCellWidget(int row, int col, const TQString & _widgetName) KommanderWidget *w = widgetByName(_widgetName); if (w) { - TQWidget *widget = TQT_TQWIDGET(w->object()); + TQWidget *widget = static_cast<TQWidget*>(w->object()); if (TQTable::cellWidget(row, col) != widget) { setCurrentCell(-1, -1); //hack to not delete the cellwidget after clicking away to another cell. diff --git a/kommander/widgets/table.h b/kommander/widgets/table.h index 3a95b483..21f3dc58 100644 --- a/kommander/widgets/table.h +++ b/kommander/widgets/table.h @@ -30,7 +30,7 @@ class TQWidget; class KOMMANDER_EXPORT Table : public TQTable, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp index 7180a7d0..b4116fe3 100644 --- a/kommander/widgets/tabwidget.cpp +++ b/kommander/widgets/tabwidget.cpp @@ -44,7 +44,7 @@ enum Functions { }; TabWidget::TabWidget(TQWidget *a_parent, const char *a_name, int a_flags) - : TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(TQT_TQOBJECT(this)) + : TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/tabwidget.h b/kommander/widgets/tabwidget.h index 818879ec..6eb0747a 100644 --- a/kommander/widgets/tabwidget.h +++ b/kommander/widgets/tabwidget.h @@ -27,7 +27,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TabWidget : public TQTabWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp index 9e466c5e..5a6e1576 100644 --- a/kommander/widgets/textbrowser.cpp +++ b/kommander/widgets/textbrowser.cpp @@ -35,7 +35,7 @@ enum Functions { }; TextBrowser::TextBrowser(TQWidget * a_parent, const char *a_name) - : KTextBrowser(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KTextBrowser(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -121,7 +121,7 @@ TQString TextBrowser::handleDCOP(int function, const TQStringList& args) case DCOP::selection: return selectedText(); case TBR_setNotifyClick: - KTextBrowser::setNotifyClick(args[0]); + KTextBrowser::setNotifyClick(args[0].utf8()); break; case TBR_isNotifyClick: return TQString::number(KTextBrowser::isNotifyClick()); diff --git a/kommander/widgets/textbrowser.h b/kommander/widgets/textbrowser.h index 18c99712..f134891a 100644 --- a/kommander/widgets/textbrowser.h +++ b/kommander/widgets/textbrowser.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TextBrowser: public KTextBrowser, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index aa2b7c9d..ad5f06d9 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -43,14 +43,14 @@ enum Functions { }; TextEdit::TextEdit(TQWidget * a_parent, const char *a_name):KTextEdit(a_parent, a_name), -KommanderWidget(TQT_TQOBJECT(this)) +KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TE_setModified, "setModified(TQString widget, bool Modified)", i18n("Set widget modified status."), 1); diff --git a/kommander/widgets/textedit.h b/kommander/widgets/textedit.h index a1713fd9..d445d563 100644 --- a/kommander/widgets/textedit.h +++ b/kommander/widgets/textedit.h @@ -31,7 +31,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TextEdit: public KTextEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp index b91d0eb5..ea39706c 100644 --- a/kommander/widgets/timer.cpp +++ b/kommander/widgets/timer.cpp @@ -38,7 +38,7 @@ enum Functions { }; Timer::Timer(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -57,7 +57,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name) mTimer = new TQTimer(this); setInterval(5000); setSingleShot(false); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(SetInterval, "setInterval(TQString widget, int interval)", i18n("Set the timer timeout interval in ms."), 2); @@ -148,7 +148,7 @@ void Timer::timeout() void Timer::execute() { if (mSingleShot) - TQTimer::singleShot(mInterval, this, TQT_SLOT(timeout())); + TQTimer::singleShot(mInterval, this, TQ_SLOT(timeout())); else mTimer->start(mInterval); } diff --git a/kommander/widgets/timer.h b/kommander/widgets/timer.h index fa3523ad..d53550a9 100644 --- a/kommander/widgets/timer.h +++ b/kommander/widgets/timer.h @@ -26,7 +26,7 @@ class TQTimer; class KOMMANDER_EXPORT Timer : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index 6dfc8b89..0bebe1bb 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "toolbox.h" #include "kommanderplugin.h" #include "specials.h" @@ -28,7 +33,7 @@ #define LAST_FUNCTION INDEXOF ToolBox::ToolBox(TQWidget *parent, const char *name) - : TQToolBox(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQToolBox(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index 1d253c90..4d596bb2 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -18,9 +18,10 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class ToolBox : public TQToolBox, public KommanderWidget + +class TDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index 15949534..c2d6f87a 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -55,7 +55,7 @@ enum Functions { }; TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name) - : TDEListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListView(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index 291a254e..e3bb7f4f 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -34,7 +34,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT TreeWidget : public TDEListView, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/widgets.desktop b/kommander/widgets/widgets.desktop index f24396de..e0ac75a9 100644 --- a/kommander/widgets/widgets.desktop +++ b/kommander/widgets/widgets.desktop @@ -1,36 +1,6 @@ [Desktop Entry] Name=Widgets -Name[bg]=Графични обекти -Name[br]=Widgetoù -Name[ca]=Estris -Name[cs]=Widgety -Name[cy]=Celfigion -Name[da]=Kontroller -Name[el]=Γραφικά συστατικά -Name[et]=Elemendid -Name[fa]=عناصر -Name[fi]=Elementit -Name[fr]=Éléments graphiques -Name[ga]=Giuirléidí -Name[hi]=विजेट्स -Name[hu]=Grafikai elemek -Name[ja]=ウィジェット -Name[lt]=Valdikliai -Name[ms]=Wijet -Name[ne]=विजेट -Name[pl]=Elementy interfejsu -Name[pt]=Elementos -Name[pt_BR]=Janelas -Name[ru]=Виджеты -Name[sl]=Gradniki -Name[sr]=Контроле -Name[sr@Latn]=Kontrole -Name[sv]=Grafiska komponenter -Name[ta]=சின்னப் படங்கள் -Name[tg]=Васеъкуниҳо -Name[tr]=Bileşenler -Name[uk]=Віджети -Name[zh_CN]=部件 -Exec=widgets %i %m -caption "%c" + Type=Application +Exec=widgets %i %m -caption "%c" Terminal=false diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp index 797ed009..0ae537de 100644 --- a/kommander/widgets/wizard.cpp +++ b/kommander/widgets/wizard.cpp @@ -32,7 +32,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(TQT_TQOBJECT(this)) + : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this) { TQStringList states; states << "default"; @@ -41,7 +41,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(runHelp())); + connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(runHelp())); } Wizard::~Wizard() diff --git a/kommander/widgets/wizard.h b/kommander/widgets/wizard.h index d8bbab45..7b3b6fdf 100644 --- a/kommander/widgets/wizard.h +++ b/kommander/widgets/wizard.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Wizard : public TQWizard, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/working/CMakeLists.txt b/kommander/working/CMakeLists.txt new file mode 100644 index 00000000..d03e032a --- /dev/null +++ b/kommander/working/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory( plugintemplate ) + +install( + PROGRAMS kmdr2po extractkmdr + DESTINATION ${DATA_INSTALL_DIR}/kommander/translating +) diff --git a/kommander/working/plugintemplate/CMakeLists.txt b/kommander/working/plugintemplate/CMakeLists.txt new file mode 100644 index 00000000..1d4f4aac --- /dev/null +++ b/kommander/working/plugintemplate/CMakeLists.txt @@ -0,0 +1,17 @@ +##### other data + +install( + FILES kommanderplugin.png + DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard +) + +install( + FILES kommanderplugin.tdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates +) + +tde_create_tarball( + TARGET kommanderplugin.tar.gz + FILES src-Makefile.am plugin.cpp widget.h widget.cpp app.tdevelop + DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard +) diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h index c07c78cf..328ebe3b 100644 --- a/kommander/working/plugintemplate/widget.h +++ b/kommander/working/plugintemplate/widget.h @@ -14,7 +14,7 @@ class TQStringList; //replace TQWidget with the widget you want to derive from class %{APPNAME}: public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/x-kommander.desktop b/kommander/x-kommander.desktop index 656cad13..ea0a716b 100644 --- a/kommander/x-kommander.desktop +++ b/kommander/x-kommander.desktop @@ -1,50 +1,8 @@ [Desktop Entry] Comment=Kommander File -Comment[bg]=Файл на Kommander -Comment[br]=Restr Kommander -Comment[ca]=Fitxer de Kommander -Comment[cs]=Soubor Kommanderu -Comment[da]=Kommander-fil -Comment[de]=Kommander-Datei -Comment[el]=Αρχείο Kommander -Comment[es]=Archivo de Kommander -Comment[et]=Kommanderi fail -Comment[eu]=Kommander fitxategiak -Comment[fa]=پروندۀ Kommander -Comment[fi]=Komentotiedosto -Comment[fr]=Fichier de Kommander -Comment[ga]=Comhad Kommander -Comment[gl]=Ficheiro de Kommander -Comment[hi]=कमांडर फ़ाइल -Comment[hu]=Kommander-fájl -Comment[is]=Kommander skrá -Comment[it]=File di Kommander -Comment[ja]=Kommander ファイル -Comment[ka]=Kommander-ის ფაილი -Comment[lt]=Kommander byla -Comment[ms]=Fail Kommander -Comment[nds]=Kommander-Datei -Comment[ne]=आदेश फाइल -Comment[nl]=Kommander-dialoogbestand -Comment[pa]=Kommander ਫਾਇਲ -Comment[pl]=Plik Kommandera -Comment[pt]=Ficheiro do Kommander -Comment[pt_BR]=Arquivo do Kommander -Comment[ru]=Файл Kommander -Comment[sk]=Kommander súbor -Comment[sl]=Datoteka Kommanderja -Comment[sr]=Kommander-ов фајл -Comment[sr@Latn]=Kommander-ov fajl -Comment[sv]=Kommander-fil -Comment[ta]=Kகட்டளை கோப்பு -Comment[tg]=Файли Kommander -Comment[tr]=Kommander Dosyası -Comment[uk]=Файл Kommander -Comment[zh_CN]=Kommander 文件 -Comment[zh_HK]=Kommander 檔案 -Comment[zh_TW]=Kommander 檔案 -Icon=application-x-designer + Type=MimeType +Icon=application-x-designer MimeType=application/x-kommander Patterns=*.kmdr; X-TDE-IsAlso=application/x-executable-script @@ -52,4 +10,3 @@ X-TDE-IsAlso=application/x-executable-script [Property::X-TDE-text] Type=bool Value=true - |