diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-17 19:08:25 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-17 19:08:25 +0000 |
| commit | e9be34de5fe62ce92c1d4cad63d03be76e9beb8d (patch) | |
| tree | b41889ff9d6b950124134560ccbcecc78493a452 /kdevdesigner | |
| parent | 48d4a26399959121f33d2bc3bfe51c7827b654fc (diff) | |
| download | tdevelop-e9be34de5fe62ce92c1d4cad63d03be76e9beb8d.tar.gz tdevelop-e9be34de5fe62ce92c1d4cad63d03be76e9beb8d.zip | |
Fix kdevelop Qt3 compilation
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1237312 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdevdesigner')
39 files changed, 299 insertions, 301 deletions
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 2bd08500..a94b74ff 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -84,7 +84,7 @@ ActionDrag::~ActionDrag() the_action = 0; } -void TQDesignerAction::init() +void QDesignerAction::init() { MetaDataBase::addEntry( this ); int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) ); @@ -92,7 +92,7 @@ void TQDesignerAction::init() WidgetFactory::saveChangedProperties( this, id ); } -void TQDesignerActionGroup::init() +void QDesignerActionGroup::init() { MetaDataBase::addEntry( this ); int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) ); @@ -100,7 +100,7 @@ void TQDesignerActionGroup::init() WidgetFactory::saveChangedProperties( this, id ); } -bool TQDesignerAction::addTo( TQWidget *w ) +bool QDesignerAction::addTo( TQWidget *w ) { if ( !widgetToInsert ) return TQAction::addTo( w ); @@ -114,7 +114,7 @@ bool TQDesignerAction::addTo( TQWidget *w ) return TRUE; } -bool TQDesignerAction::removeFrom( TQWidget *w ) +bool QDesignerAction::removeFrom( TQWidget *w ) { if ( !widgetToInsert ) return TQAction::removeFrom( w ); @@ -123,7 +123,7 @@ bool TQDesignerAction::removeFrom( TQWidget *w ) return TRUE; } -void TQDesignerAction::remove() +void QDesignerAction::remove() { if ( !widgetToInsert ) return; @@ -131,7 +131,7 @@ void TQDesignerAction::remove() widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE ); } -TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent, const char* name ) : TQWidget( tqparent, name ) { @@ -143,17 +143,17 @@ TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToo tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } -void TQDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) +void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) { orient = o; } -void TQDesignerToolBarSeparator::styleChange( TQStyle& ) +void QDesignerToolBarSeparator::styleChange( TQStyle& ) { setOrientation( orient ); } -TQSize TQDesignerToolBarSeparator::tqsizeHint() const +TQSize QDesignerToolBarSeparator::tqsizeHint() const { int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); @@ -163,7 +163,7 @@ TQSize TQDesignerToolBarSeparator::tqsizeHint() const return TQSize( 0, extent ); } -void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) +void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -177,16 +177,16 @@ void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) -TQSeparatorAction::TQSeparatorAction( TQObject *tqparent ) +QSeparatorAction::QSeparatorAction( TQObject *tqparent ) : TQAction( tqparent, "qt_designer_separator" ), wid( 0 ) { } -bool TQSeparatorAction::addTo( TQWidget *w ) +bool QSeparatorAction::addTo( TQWidget *w ) { if ( ::tqqt_cast<TQToolBar*>(w) ) { TQToolBar *tb = (TQToolBar*)w; - wid = new TQDesignerToolBarSeparator( tb->orientation(), tb ); + wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); return TRUE; } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { idx = ( (TQPopupMenu*)w )->count(); @@ -196,7 +196,7 @@ bool TQSeparatorAction::addTo( TQWidget *w ) return FALSE; } -bool TQSeparatorAction::removeFrom( TQWidget *w ) +bool QSeparatorAction::removeFrom( TQWidget *w ) { if ( ::tqqt_cast<TQToolBar*>(w) ) { delete wid; @@ -208,14 +208,14 @@ bool TQSeparatorAction::removeFrom( TQWidget *w ) return FALSE; } -TQWidget *TQSeparatorAction::widget() const +TQWidget *QSeparatorAction::widget() const { return wid; } -TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw ) +QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw ) : TQToolBar( mw ), lastIndicatorPos( -1, -1 ) { insertAnchor = 0; @@ -223,7 +223,7 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw ) setAcceptDrops( TRUE ); MetaDataBase::addEntry( TQT_TQOBJECT(this) ); lastIndicatorPos = TQPoint( -1, -1 ); - indicator = new TQDesignerIndicatorWidget( this ); + indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); installEventFilter( this ); widgetInserting = FALSE; @@ -231,13 +231,13 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw ) mw->setDockEnabled( DockTornOff, FALSE ); } -TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, Dock dock ) +QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock ) : TQToolBar( TQString(), mw, dock), lastIndicatorPos( -1, -1 ) { insertAnchor = 0; afterAnchor = TRUE; setAcceptDrops( TRUE ); - indicator = new TQDesignerIndicatorWidget( this ); + indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); MetaDataBase::addEntry( TQT_TQOBJECT(this) ); installEventFilter( this ); @@ -246,7 +246,7 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, Dock dock ) mw->setDockEnabled( DockTornOff, FALSE ); } -void TQDesignerToolBar::findFormWindow() +void QDesignerToolBar::findFormWindow() { TQWidget *w = this; while ( w ) { @@ -257,29 +257,29 @@ void TQDesignerToolBar::findFormWindow() } } -void TQDesignerToolBar::addAction( TQAction *a ) +void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); if ( ::tqqt_cast<TQActionGroup*>(a) ) { - ( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this ); - actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a ); - } else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) { - ( (TQSeparatorAction*)a )->widget()->installEventFilter( this ); - actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a ); + ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); + actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); + } else if ( ::tqqt_cast<QSeparatorAction*>(a) ) { + ( (QSeparatorAction*)a )->widget()->installEventFilter( this ); + actionMap.insert( ( (QSeparatorAction*)a )->widget(), a ); } else { - ( (TQDesignerAction*)a )->widget()->installEventFilter( this ); - actionMap.insert( ( (TQDesignerAction*)a )->widget(), a ); + ( (QDesignerAction*)a )->widget()->installEventFilter( this ); + actionMap.insert( ( (QDesignerAction*)a )->widget(), a ); } } static void fixObject( TQObject *&o ) { - while ( o && o->tqparent() && !::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) ) + while ( o && o->tqparent() && !::tqqt_cast<QDesignerToolBar*>(o->tqparent()) ) o = o->tqparent(); } -bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) +bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) { if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) ) return TQToolBar::eventFilter( o, e ); @@ -334,7 +334,7 @@ bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) return TQToolBar::eventFilter( o, e ); } -void TQDesignerToolBar::paintEvent( TQPaintEvent *e ) +void QDesignerToolBar::paintEvent( TQPaintEvent *e ) { TQToolBar::paintEvent( e ); if ( e->rect() != rect() ) @@ -342,7 +342,7 @@ void TQDesignerToolBar::paintEvent( TQPaintEvent *e ) lastIndicatorPos = TQPoint( -1, -1 ); } -void TQDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) +void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) { e->accept(); TQPopupMenu menu( 0 ); @@ -356,7 +356,7 @@ void TQDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) } } -void TQDesignerToolBar::mousePressEvent( TQMouseEvent *e ) +void QDesignerToolBar::mousePressEvent( TQMouseEvent *e ) { widgetInserting = FALSE; if ( e->button() == Qt::LeftButton && @@ -367,14 +367,14 @@ void TQDesignerToolBar::mousePressEvent( TQMouseEvent *e ) widgetInserting = TRUE; } -void TQDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e ) +void QDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); widgetInserting = FALSE; } -void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) +void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); @@ -385,7 +385,7 @@ void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) widgetInserting = FALSE; } -void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o ) +void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o ) { e->accept(); TQPopupMenu menu( 0 ); @@ -393,7 +393,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject const int ID_SEP = 2; const int ID_DELTOOLBAR = 3; TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); - if ( it != actionMap.end() && ::tqqt_cast<TQSeparatorAction*>(*it) ) + if ( it != actionMap.end() && ::tqqt_cast<QSeparatorAction*>(*it) ) menu.insertItem( i18n( "Delete Separator" ), ID_DELETE ); else menu.insertItem( i18n( "Delete Item" ), ID_DELETE ); @@ -415,7 +415,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject cmd->execute(); } else if ( res == ID_SEP ) { calcIndicatorPos( mapFromGlobal( e->globalPos() ) ); - TQAction *a = new TQSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; @@ -436,7 +436,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject } } -void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) +void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) { widgetInserting = FALSE; @@ -455,7 +455,7 @@ void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) dragStartPos = e->pos(); } -void TQDesignerToolBar::removeWidget( TQWidget *w ) +void QDesignerToolBar::removeWidget( TQWidget *w ) { TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w ); if ( it == actionMap.end() ) @@ -472,7 +472,7 @@ void TQDesignerToolBar::removeWidget( TQWidget *w ) adjustSize(); } -void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) +void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) { if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 ) return; @@ -495,12 +495,12 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) adjustSize(); TQString type = ::tqqt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) : - ::tqqt_cast<TQSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); + ::tqqt_cast<QSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); TQStoredDrag *drag = new ActionDrag( type, a, this ); drag->setPixmap( a->iconSet().pixmap() ); - if ( ::tqqt_cast<TQDesignerAction*>(a) ) { - if ( formWindow->widgets()->tqfind( ( (TQDesignerAction*)a )->widget() ) ) - formWindow->selectWidget( ( TQT_TQOBJECT(( (TQDesignerAction*)a )->widget())), FALSE ); + if ( ::tqqt_cast<QDesignerAction*>(a) ) { + if ( formWindow->widgets()->tqfind( ( (QDesignerAction*)a )->widget() ) ) + formWindow->selectWidget( ( TQT_TQOBJECT(( (QDesignerAction*)a )->widget())), FALSE ); } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). @@ -515,7 +515,7 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) #ifndef TQT_NO_DRAGANDDROP -void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e ) +void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e ) { widgetInserting = FALSE; lastIndicatorPos = TQPoint( -1, -1 ); @@ -523,7 +523,7 @@ void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e ) e->accept(); } -void TQDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e ) +void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e ) { if (ActionDrag::canDecode(e)) { e->accept(); @@ -531,14 +531,14 @@ void TQDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e ) } } -void TQDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * ) +void QDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * ) { indicator->hide(); insertAnchor = 0; afterAnchor = TRUE; } -void TQDesignerToolBar::dropEvent( TQDropEvent *e ) +void QDesignerToolBar::dropEvent( TQDropEvent *e ) { if (!ActionDrag::canDecode(e)) return; @@ -555,11 +555,11 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) if ( e->provides( "application/x-designer-actions" ) || e->provides( "application/x-designer-separator" ) ) { if ( e->provides( "application/x-designer-actions" ) ) - a = ::tqqt_cast<TQDesignerAction*>(ActionDrag::action()); + a = ::tqqt_cast<QDesignerAction*>(ActionDrag::action()); else - a = ::tqqt_cast<TQSeparatorAction*>(ActionDrag::action()); + a = ::tqqt_cast<QSeparatorAction*>(ActionDrag::action()); } else { - a = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action()); + a = ::tqqt_cast<QDesignerActionGroup*>(ActionDrag::action()); } if ( actionList.tqfindRef( a ) != -1 ) { @@ -581,7 +581,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) #endif -void TQDesignerToolBar::reInsert() +void QDesignerToolBar::reInsert() { TQAction *a = 0; actionMap.clear(); @@ -589,27 +589,27 @@ void TQDesignerToolBar::reInsert() for ( a = actionList.first(); a; a = actionList.next() ) { a->addTo( this ); if ( ::tqqt_cast<TQActionGroup*>(a) ) { - actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a ); - if ( ( (TQDesignerActionGroup*)a )->widget() ) - ( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this ); - } else if ( ::tqqt_cast<TQDesignerAction*>(a) ) { - actionMap.insert( ( (TQDesignerAction*)a )->widget(), a ); - ( (TQDesignerAction*)a )->widget()->installEventFilter( this ); - } else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) { - actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a ); - ( (TQSeparatorAction*)a )->widget()->installEventFilter( this ); + actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); + if ( ( (QDesignerActionGroup*)a )->widget() ) + ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); + } else if ( ::tqqt_cast<QDesignerAction*>(a) ) { + actionMap.insert( ( (QDesignerAction*)a )->widget(), a ); + ( (QDesignerAction*)a )->widget()->installEventFilter( this ); + } else if ( ::tqqt_cast<QSeparatorAction*>(a) ) { + actionMap.insert( ( (QSeparatorAction*)a )->widget(), a ); + ( (QSeparatorAction*)a )->widget()->installEventFilter( this ); } } TQApplication::sendPostedEvents(); adjustSize(); } -void TQDesignerToolBar::actionRemoved() +void QDesignerToolBar::actionRemoved() { actionList.removeRef( (TQAction*)sender() ); } -TQPoint TQDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) +TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) { if ( orientation() ==Qt::Horizontal ) { TQPoint pnt( width() - 2, 0 ); @@ -660,7 +660,7 @@ TQPoint TQDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) } } -void TQDesignerToolBar::drawIndicator( const TQPoint &pos ) +void QDesignerToolBar::drawIndicator( const TQPoint &pos ) { if ( lastIndicatorPos == pos ) return; @@ -684,7 +684,7 @@ void TQDesignerToolBar::drawIndicator( const TQPoint &pos ) TQApplication::sendPostedEvents(); } -void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) +void QDesignerToolBar::doInsertWidget( const TQPoint &p ) { if ( formWindow != MainWindow::self->formWindow() ) return; @@ -692,7 +692,7 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE ); installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); - TQDesignerAction *a = new TQDesignerAction( w, tqparent() ); + QDesignerAction *a = new QDesignerAction( w, tqparent() ); int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; @@ -706,16 +706,16 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) MainWindow::self->resetTool(); } -void TQDesignerToolBar::clear() +void QDesignerToolBar::clear() { for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { - if ( ::tqqt_cast<TQDesignerAction*>(a) ) - ( (TQDesignerAction*)a )->remove(); + if ( ::tqqt_cast<QDesignerAction*>(a) ) + ( (QDesignerAction*)a )->remove(); } TQToolBar::clear(); } -void TQDesignerToolBar::installEventFilters( TQWidget *w ) +void QDesignerToolBar::installEventFilters( TQWidget *w ) { if ( !w ) return; diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h index 560bcca4..8ee705c8 100644 --- a/kdevdesigner/designer/actiondnd.h +++ b/kdevdesigner/designer/actiondnd.h @@ -39,17 +39,17 @@ #include "../shared/widgetdatabase.h" //class TQDesignerPopupMenu; -class TQDesignerIndicatorWidget; +class QDesignerIndicatorWidget; class FormWindow; class TQPopupMenu; -class TQDesignerIndicatorWidget : public TQWidget +class QDesignerIndicatorWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - TQDesignerIndicatorWidget( TQWidget *p ) + QDesignerIndicatorWidget( TQWidget *p ) : TQWidget( p, "qt_dockwidget_internal" ) { setBackgroundColor( red ); } @@ -79,13 +79,13 @@ private: static TQAction *the_action; }; -class TQDesignerActionGroup : public TQActionGroup +class QDesignerActionGroup : public TQActionGroup { Q_OBJECT TQ_OBJECT public: - TQDesignerActionGroup( TQObject *tqparent ) + QDesignerActionGroup( TQObject *tqparent ) : TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); } void init(); @@ -115,15 +115,15 @@ private: }; -class TQDesignerAction : public TQAction +class QDesignerAction : public TQAction { Q_OBJECT TQ_OBJECT public: - TQDesignerAction( TQObject *tqparent ) + QDesignerAction( TQObject *tqparent ) : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } - TQDesignerAction( TQWidget *w, TQObject *tqparent ) + QDesignerAction( TQWidget *w, TQObject *tqparent ) : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } void init(); @@ -152,13 +152,13 @@ private: }; -class TQDesignerToolBarSeparator : public TQWidget +class QDesignerToolBarSeparator : public TQWidget { Q_OBJECT TQ_OBJECT public: - TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); + QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } @@ -172,13 +172,13 @@ private: }; -class TQSeparatorAction : public TQAction +class QSeparatorAction : public TQAction { Q_OBJECT TQ_OBJECT public: - TQSeparatorAction( TQObject *tqparent ); + QSeparatorAction( TQObject *tqparent ); bool addTo( TQWidget *w ); bool removeFrom( TQWidget *w ); @@ -192,14 +192,14 @@ private: }; -class TQDesignerToolBar : public TQToolBar +class QDesignerToolBar : public TQToolBar { Q_OBJECT TQ_OBJECT public: - TQDesignerToolBar( TQMainWindow *mw ); - TQDesignerToolBar( TQMainWindow *mw, Dock dock ); + QDesignerToolBar( TQMainWindow *mw ); + QDesignerToolBar( TQMainWindow *mw, Dock dock ); TQPtrList<TQAction> insertedActions() const { return actionList; } void addAction( TQAction *a ); @@ -245,7 +245,7 @@ private: TQPtrList<TQAction> actionList; TQMap<TQWidget*, TQAction*> actionMap; TQPoint dragStartPos; - TQDesignerIndicatorWidget *indicator; + QDesignerIndicatorWidget *indicator; bool widgetInserting; FormWindow *formWindow; diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp index 92b8a044..c17c641a 100644 --- a/kdevdesigner/designer/actionlistview.cpp +++ b/kdevdesigner/designer/actionlistview.cpp @@ -43,18 +43,18 @@ ActionListView::ActionListView( TQWidget *tqparent, const char *name ) ActionItem::ActionItem( TQListView *lv, TQAction *ac ) : TQListViewItem( lv ), a( 0 ), g( 0 ) { - g = ::tqqt_cast<TQDesignerActionGroup*>(ac); + g = ::tqqt_cast<QDesignerActionGroup*>(ac); if ( !g ) - a = ::tqqt_cast<TQDesignerAction*>(ac); + a = ::tqqt_cast<QDesignerAction*>(ac); setDragEnabled( TRUE ); } ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) : TQListViewItem( i ), a( 0 ), g( 0 ) { - g = ::tqqt_cast<TQDesignerActionGroup*>(ac); + g = ::tqqt_cast<QDesignerActionGroup*>(ac); if ( !g ) - a = ::tqqt_cast<TQDesignerAction*>(ac); + a = ::tqqt_cast<QDesignerAction*>(ac); setDragEnabled( TRUE ); moveToEnd(); } diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h index a3910c5b..9c213c99 100644 --- a/kdevdesigner/designer/actionlistview.h +++ b/kdevdesigner/designer/actionlistview.h @@ -35,24 +35,24 @@ class ActionItem : public TQListViewItem public: ActionItem( TQListView *lv, bool group ) : TQListViewItem( lv ), - a( group ? 0 : new TQDesignerAction( 0 ) ), - g( group ? new TQDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); } + a( group ? 0 : new QDesignerAction( 0 ) ), + g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); } ActionItem( TQListView *lv, TQAction *ac ); ActionItem( TQListViewItem *i, TQAction *ac ); ActionItem( ActionItem *tqparent, bool group = FALSE ) : TQListViewItem( tqparent ), - a( group ? 0 : new TQDesignerAction( tqparent->actionGroup() ) ), - g( group ? new TQDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } + a( group ? 0 : new QDesignerAction( tqparent->actionGroup() ) ), + g( group ? new QDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } - TQDesignerAction *action() const { return a; } - TQDesignerActionGroup *actionGroup() const { return g; } + QDesignerAction *action() const { return a; } + QDesignerActionGroup *actionGroup() const { return g; } private: void moveToEnd(); private: - TQDesignerAction *a; - TQDesignerActionGroup *g; + QDesignerAction *a; + QDesignerActionGroup *g; }; diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index 5079fff4..14016cbc 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -1848,7 +1848,7 @@ void PopulateTableCommand::unexecute() // ------------------------------------------------------------ AddActionToToolBarCommand::AddActionToToolBarCommand( const TQString &n, FormWindow *fw, - TQAction *a, TQDesignerToolBar *tb, int idx ) + TQAction *a, QDesignerToolBar *tb, int idx ) : Command( n, fw ), action( a ), toolBar( tb ), index( idx ) { } @@ -1870,9 +1870,9 @@ void AddActionToToolBarCommand::execute() toolBar->insertAction( ( (TQDesignerActionGroup*)action )->widget(), action ); ( (TQDesignerActionGroup*)action )->widget()->installEventFilter( toolBar ); } - } else if ( ::tqqt_cast<TQSeparatorAction*>(action) ) { - toolBar->insertAction( ( (TQSeparatorAction*)action )->widget(), action ); - ( (TQSeparatorAction*)action )->widget()->installEventFilter( toolBar ); + } else if ( ::tqqt_cast<QSeparatorAction*>(action) ) { + toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action ); + ( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar ); } if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { if ( index == -1 ) @@ -1953,7 +1953,7 @@ AddToolBarCommand::AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainW void AddToolBarCommand::execute() { if ( !toolBar ) { - toolBar = new TQDesignerToolBar( mainWindow ); + toolBar = new QDesignerToolBar( mainWindow ); TQString n = "Toolbar"; formWindow()->unify( TQT_TQOBJECT(toolBar), n, TRUE ); toolBar->setName( n ); diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index a44f2431..f0bfc0a6 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -50,7 +50,7 @@ class TQListBox; class TQIconView; class TQTable; class TQAction; -class TQDesignerToolBar; +class QDesignerToolBar; class TQMainWindow; class TQTextEdit; struct LanguageInterface; @@ -887,7 +887,7 @@ class AddActionToToolBarCommand : public Command { public: AddActionToToolBarCommand( const TQString &n, FormWindow *fw, - TQAction *a, TQDesignerToolBar *tb, int idx ); + TQAction *a, QDesignerToolBar *tb, int idx ); void execute(); void unexecute(); @@ -895,7 +895,7 @@ public: private: TQAction *action; - TQDesignerToolBar *toolBar; + QDesignerToolBar *toolBar; int index; }; @@ -904,7 +904,7 @@ class RemoveActionFromToolBarCommand : public AddActionToToolBarCommand { public: RemoveActionFromToolBarCommand( const TQString &n, FormWindow *fw, - TQAction *a, TQDesignerToolBar *tb, int idx ) + TQAction *a, QDesignerToolBar *tb, int idx ) : AddActionToToolBarCommand( n, fw, a, tb, idx ) {} void execute() { AddActionToToolBarCommand::unexecute(); } @@ -925,7 +925,7 @@ public: Type type() const { return AddToolBar; } protected: - TQDesignerToolBar *toolBar; + QDesignerToolBar *toolBar; TQMainWindow *mainWindow; }; @@ -933,7 +933,7 @@ protected: class RemoveToolBarCommand : public AddToolBarCommand { public: - RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, TQDesignerToolBar *tb ) + RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, QDesignerToolBar *tb ) : AddToolBarCommand( n, fw, mw ) { toolBar = tb; } void execute() { AddToolBarCommand::unexecute(); } diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp index b426e9dd..9d12aa21 100644 --- a/kdevdesigner/designer/database.cpp +++ b/kdevdesigner/designer/database.cpp @@ -69,12 +69,12 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t } } -TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name ) +QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *tqparent, const char *name ) : TQDataBrowser( tqparent, name ) { } -bool TQDesignerDataBrowser::event( TQEvent* e ) +bool QDesignerDataBrowser::event( TQEvent* e ) { bool b = TQDataBrowser::event( e ); #if defined(DESIGNER) @@ -96,12 +96,12 @@ bool TQDesignerDataBrowser::event( TQEvent* e ) return b; } -TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name ) +QDesignerDataView::QDesignerDataView( TQWidget *tqparent, const char *name ) : TQDataView( tqparent, name ) { } -bool TQDesignerDataView::event( TQEvent* e ) +bool QDesignerDataView::event( TQEvent* e ) { bool b = TQDataView::event( e ); #if defined(DESIGNER) diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h index 8ff9bec3..8fe3442b 100644 --- a/kdevdesigner/designer/database.h +++ b/kdevdesigner/designer/database.h @@ -56,25 +56,25 @@ protected: }; -class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport +class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport { Q_OBJECT TQ_OBJECT public: - TQDesignerDataBrowser( TQWidget *tqparent, const char *name ); + QDesignerDataBrowser( TQWidget *tqparent, const char *name ); protected: bool event( TQEvent* e ); }; -class TQDesignerDataView : public TQDataView, public DatabaseSupport +class QDesignerDataView : public TQDataView, public DatabaseSupport { Q_OBJECT TQ_OBJECT public: - TQDesignerDataView( TQWidget *tqparent, const char *name ); + QDesignerDataView( TQWidget *tqparent, const char *name ); protected: bool event( TQEvent* e ); diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h index 5145b3b5..f013f507 100644 --- a/kdevdesigner/designer/hierarchyview.h +++ b/kdevdesigner/designer/hierarchyview.h @@ -31,7 +31,7 @@ #include <tqlistview.h> #include <tqtabwidget.h> #include <tqguardedptr.h> -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include "../interfaces/classbrowserinterface.h" class FormWindow; diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index 83db3b7d..17592f0f 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -747,7 +747,7 @@ void GridLayout::doLayout() if ( !prepareLayout( needMove, needRetqparent ) ) return; - TQDesignerGridLayout *tqlayout = (TQDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid ); + QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid ); if ( !grid ) buildGrid(); @@ -1003,13 +1003,13 @@ void Spacer::setOrientation( Qt::Orientation o ) } -void TQDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ ) +void QDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ ) { items.insert( w, Item(row, col, 1, 1) ); TQGridLayout::addWidget( w, row, col, align_ ); } -void TQDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow, +void QDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow, int fromCol, int toCol, int align_ ) { items.insert( w, Item(fromRow, fromCol, toRow - fromRow + 1, toCol - fromCol +1) ); diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index 67061595..ac4aabb2 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -161,13 +161,13 @@ protected: TQSize sh; }; -class TQDesignerGridLayout : public TQGridLayout +class QDesignerGridLayout : public TQGridLayout { Q_OBJECT TQ_OBJECT public: - TQDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){}; - TQDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){}; + QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){}; + QDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){}; void addWidget( TQWidget *, int row, int col, int align = 0 ); void addMultiCellWidget( TQWidget *, int fromRow, int toRow, diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index b4b5c1ac..e53d0383 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -826,7 +826,7 @@ void MainWindow::helpAbout() dlg.exec(); } -void MainWindow::helpAboutTQt() +void MainWindow::helpAboutQt() { TQMessageBox::aboutTQt( this, "TQt Designer" ); } @@ -989,33 +989,33 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) if ( o && currentTool() == POINTER_TOOL && ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) || - ::tqqt_cast<TQDesignerToolBar*>(o) || + ::tqqt_cast<QDesignerToolBar*>(o) || ( ::tqqt_cast<TQComboBox*>(o) || ::tqqt_cast<TQToolButton*>(o) || - ::tqqt_cast<TQDesignerToolBarSeparator*>(o) ) && + ::tqqt_cast<QDesignerToolBarSeparator*>(o) ) && o->tqparent() - && ( ::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) + && ( ::tqqt_cast<QDesignerToolBar*>(o->tqparent()) || ::tqqt_cast<TQDesignerWidgetStack*>(o->tqparent())) ) ) { TQWidget *w = (TQWidget*)o; if ( ::tqqt_cast<TQToolButton*>(w) || ::tqqt_cast<TQComboBox*>(w) || ::tqqt_cast<PopupMenuEditor*>(w) || - ::tqqt_cast<TQDesignerToolBarSeparator*>(w) ) + ::tqqt_cast<QDesignerToolBarSeparator*>(w) ) w = w->tqparentWidget(); TQWidget *pw = w->tqparentWidget(); while ( pw ) { if ( ::tqqt_cast<FormWindow*>(pw) ) { ( (FormWindow*)pw )->emitShowProperties( TQT_TQOBJECT(w) ); - if ( !::tqqt_cast<TQDesignerToolBar*>(o) ) + if ( !::tqqt_cast<QDesignerToolBar*>(o) ) return ( !::tqqt_cast<TQToolButton*>(o) && !::tqqt_cast<MenuBarEditor*>(o) && !::tqqt_cast<TQComboBox*>(o) && - !::tqqt_cast<TQDesignerToolBarSeparator*>(o) ); + !::tqqt_cast<QDesignerToolBarSeparator*>(o) ); } pw = pw->tqparentWidget(); } } - if ( o && ( ::tqqt_cast<TQDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) + if ( o && ( ::tqqt_cast<QDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) && e->type() == TQEvent::ContextMenu ) break; if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL ) @@ -1246,7 +1246,7 @@ TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const { while ( o ) { - if ( ::tqqt_cast<TQDesignerToolBar*>(o) ) + if ( ::tqqt_cast<QDesignerToolBar*>(o) ) return (TQWidget*)o; if ( ::tqqt_cast<FormWindow*>(o) ) return 0; diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h index a33c5e25..950cf241 100644 --- a/kdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -43,7 +43,7 @@ #include <tqmainwindow.h> #include <tqmap.h> #include <tqguardedptr.h> -#include <private/tqpluginmanager_p.h> +#include <tqpluginmanager_p.h> #include <tqobjectlist.h> class TQToolBox; @@ -292,7 +292,7 @@ public slots: void helpContents(); void helpManual(); void helpAbout(); - void helpAboutTQt(); + void helpAboutQt(); void helpRegister(); private slots: diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index 1a609f8f..68f721e8 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -50,7 +50,7 @@ #include <tqwidgetlist.h> #include <tqmainwindow.h> #include <tqregexp.h> -#include <private/tqpluginmanager_p.h> +#include <tqpluginmanager_p.h> #include <tqdatetime.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index 5d230e05..82378a84 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -36,7 +36,7 @@ #include "kdevdesigner_part.h" #include <tqtextedit.h> -#include <./private/tqrichtext_p.h> +#include <tqrichtext_p.h> #include <tqpushbutton.h> #include <tqlayout.h> #include <tqtoolbutton.h> diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h index b39aea71..9fc56257 100644 --- a/kdevdesigner/designer/multilineeditorimpl.h +++ b/kdevdesigner/designer/multilineeditorimpl.h @@ -29,7 +29,7 @@ #include <tqaction.h> #include <tqtextedit.h> -#include <private/tqrichtext_p.h> +#include <tqrichtext_p.h> #include "multilineeditor.h" class FormWindow; diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h index 350fd6f0..ad3b1ba7 100644 --- a/kdevdesigner/designer/project.h +++ b/kdevdesigner/designer/project.h @@ -33,7 +33,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqmap.h> -#include <private/tqpluginmanager_p.h> +#include <tqpluginmanager_p.h> #include "../interfaces/projectsettingsiface.h" #include "sourcefile.h" #include "formfile.h" diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index f963cf51..6499c78d 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -30,7 +30,7 @@ #include <tqapplication.h> #include <tqvbox.h> -TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name ) +QCompletionEdit::QCompletionEdit( TQWidget *tqparent, const char *name ) : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE ) { popup = new TQVBox( 0, 0, WType_Popup ); @@ -51,27 +51,27 @@ TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name ) installEventFilter( this ); } -bool TQCompletionEdit::autoAdd() const +bool QCompletionEdit::autoAdd() const { return aAdd; } -TQStringList TQCompletionEdit::completionList() const +TQStringList QCompletionEdit::completionList() const { return compList; } -void TQCompletionEdit::setCompletionList( const TQStringList &l ) +void QCompletionEdit::setCompletionList( const TQStringList &l ) { compList = l; } -void TQCompletionEdit::setAutoAdd( bool add ) +void QCompletionEdit::setAutoAdd( bool add ) { aAdd = add; } -void TQCompletionEdit::textDidChange( const TQString &text ) +void QCompletionEdit::textDidChange( const TQString &text ) { if ( text.isEmpty() ) { popup->close(); @@ -81,7 +81,7 @@ void TQCompletionEdit::textDidChange( const TQString &text ) placeListBox(); } -void TQCompletionEdit::placeListBox() +void QCompletionEdit::placeListBox() { if ( listbox->count() == 0 ) { popup->close(); @@ -102,7 +102,7 @@ void TQCompletionEdit::placeListBox() setFocus(); } -void TQCompletionEdit::updateListBox() +void QCompletionEdit::updateListBox() { listbox->clear(); if ( compList.isEmpty() ) @@ -114,7 +114,7 @@ void TQCompletionEdit::updateListBox() } } -bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) +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 ( e->type() == TQEvent::KeyPress ) { @@ -178,7 +178,7 @@ bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) return TQLineEdit::eventFilter( o, e ); } -void TQCompletionEdit::addCompletionEntry( const TQString &entry ) +void QCompletionEdit::addCompletionEntry( const TQString &entry ) { if ( compList.tqfind( entry ) == compList.end() ) { compList << entry; @@ -186,24 +186,24 @@ void TQCompletionEdit::addCompletionEntry( const TQString &entry ) } } -void TQCompletionEdit::removeCompletionEntry( const TQString &entry ) +void QCompletionEdit::removeCompletionEntry( const TQString &entry ) { TQStringList::Iterator it = compList.tqfind( entry ); if ( it != compList.end() ) compList.remove( it ); } -void TQCompletionEdit::setCaseSensitive( bool b ) +void QCompletionEdit::setCaseSensitive( bool b ) { caseSensitive = b; } -bool TQCompletionEdit::isCaseSensitive() const +bool QCompletionEdit::isCaseSensitive() const { return caseSensitive; } -void TQCompletionEdit::clear() +void QCompletionEdit::clear() { TQLineEdit::clear(); compList.clear(); diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h index 8bc7e72d..6e7ba455 100644 --- a/kdevdesigner/designer/qcompletionedit.h +++ b/kdevdesigner/designer/qcompletionedit.h @@ -33,7 +33,7 @@ class TQListBox; class TQVBox; -class TQCompletionEdit : public TQLineEdit +class QCompletionEdit : public TQLineEdit { Q_OBJECT TQ_OBJECT @@ -41,7 +41,7 @@ class TQCompletionEdit : public TQLineEdit TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) public: - TQCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 ); + QCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 ); bool autoAdd() const; TQStringList completionList() const; diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 0e342060..174edc63 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -79,7 +79,7 @@ #include <tqworkspace.h> #include <tqworkspace.h> #include <tqsplitter.h> -#include <private/tqucom_p.h> +#include <tqucom_p.h> #include <kiconloader.h> #include <kfiledialog.h> diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h index 607359f0..87f94872 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.h +++ b/kdevdesigner/designer/syntaxhighlighter_html.h @@ -27,7 +27,7 @@ #ifndef SYNTAXHIGHLIGHTER_HTML_H #define SYNTAXHIGHLIGHTER_HTML_H -#include <./private/tqrichtext_p.h> +#include <tqrichtext_p.h> class SyntaxHighlighter_HTML : public TQTextPreProcessor { diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 43081cdd..5d47c863 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -123,52 +123,52 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* ) } -TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *tqparent, const char *name ) +QDesignerTabWidget::QDesignerTabWidget( TQWidget *tqparent, const char *name ) : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) { tabBar()->setAcceptDrops( TRUE ); tabBar()->installEventFilter( this ); } -int TQDesignerTabWidget::currentPage() const +int QDesignerTabWidget::currentPage() const { return tabBar()->currentTab(); } -void TQDesignerTabWidget::setCurrentPage( int i ) +void QDesignerTabWidget::setCurrentPage( int i ) { tabBar()->setCurrentTab( i ); } -TQString TQDesignerTabWidget::pageTitle() const +TQString QDesignerTabWidget::pageTitle() const { return ((TQTabWidget*)this)->tabLabel( TQTabWidget::currentPage() ); } -void TQDesignerTabWidget::setPageTitle( const TQString& title ) +void QDesignerTabWidget::setPageTitle( const TQString& title ) { changeTab( TQTabWidget::currentPage(), title ); } -void TQDesignerTabWidget::setPageName( const TQCString& name ) +void QDesignerTabWidget::setPageName( const TQCString& name ) { if ( TQTabWidget::currentPage() ) TQTabWidget::currentPage()->setName( name ); } -TQCString TQDesignerTabWidget::pageName() const +TQCString QDesignerTabWidget::pageName() const { if ( !TQTabWidget::currentPage() ) return 0; return TQTabWidget::currentPage()->name(); } -int TQDesignerTabWidget::count() const +int QDesignerTabWidget::count() const { return tabBar()->count(); } -bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) +bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) { if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return FALSE; @@ -290,7 +290,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) } -TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *name ) +QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *tqparent, const char *name ) : TQWidgetStack( tqparent, name ) { prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" ); @@ -306,7 +306,7 @@ TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *na updateButtons(); } -void TQDesignerWidgetStack::updateButtons() +void QDesignerWidgetStack::updateButtons() { prev->setGeometry( width() - 31, 1, 15, 15 ); next->setGeometry( width() - 16, 1, 15, 15 ); @@ -316,23 +316,23 @@ void TQDesignerWidgetStack::updateButtons() next->raise(); } -void TQDesignerWidgetStack::prevPage() +void QDesignerWidgetStack::prevPage() { setCurrentPage( currentPage() - 1 ); } -void TQDesignerWidgetStack::nextPage() +void QDesignerWidgetStack::nextPage() { setCurrentPage( currentPage() + 1 ); } -int TQDesignerWidgetStack::currentPage() const +int QDesignerWidgetStack::currentPage() const { - TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this; + QDesignerWidgetStack* that = (QDesignerWidgetStack*) this; return that->pages.tqfind( visibleWidget() ); } -void TQDesignerWidgetStack::setCurrentPage( int i ) +void QDesignerWidgetStack::setCurrentPage( int i ) { // help next/prev page commands if ( i < 0 ) @@ -346,34 +346,34 @@ void TQDesignerWidgetStack::setCurrentPage( int i ) updateButtons(); } -TQCString TQDesignerWidgetStack::pageName() const +TQCString QDesignerWidgetStack::pageName() const { if ( !visibleWidget() ) return 0; return visibleWidget()->name(); } -void TQDesignerWidgetStack::setPageName( const TQCString& name ) +void QDesignerWidgetStack::setPageName( const TQCString& name ) { if ( visibleWidget() ) visibleWidget()->setName( name ); } -int TQDesignerWidgetStack::count() const +int QDesignerWidgetStack::count() const { return pages.count(); } -TQWidget* TQDesignerWidgetStack::page( int i ) const +TQWidget* QDesignerWidgetStack::page( int i ) const { if ( i < 0 || i >= count() ) return 0; - TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this; + QDesignerWidgetStack* that = (QDesignerWidgetStack*) this; return that->pages.at( i ); } -int TQDesignerWidgetStack::insertPage( TQWidget *p, int i ) +int QDesignerWidgetStack::insertPage( TQWidget *p, int i ) { if ( i < 0 ) pages.append( p ); @@ -387,7 +387,7 @@ int TQDesignerWidgetStack::insertPage( TQWidget *p, int i ) return pages.tqfind( p ); } -int TQDesignerWidgetStack::removePage( TQWidget *p ) +int QDesignerWidgetStack::removePage( TQWidget *p ) { int i = pages.tqfind( p ); pages.remove( p ); @@ -398,7 +398,7 @@ int TQDesignerWidgetStack::removePage( TQWidget *p ) } -int TQDesignerWizard::currentPageNum() const +int QDesignerWizard::currentPageNum() const { for ( int i = 0; i < pageCount(); ++i ) { if ( page( i ) == currentPage() ) @@ -411,7 +411,7 @@ int TQDesignerWizard::currentPageNum() const -void TQDesignerWizard::setCurrentPage( int i ) +void QDesignerWizard::setCurrentPage( int i ) { if ( i < currentPageNum() ) { while ( i < currentPageNum() ) { @@ -429,30 +429,30 @@ void TQDesignerWizard::setCurrentPage( int i ) } } -TQString TQDesignerWizard::pageTitle() const +TQString QDesignerWizard::pageTitle() const { return title( currentPage() ); } -void TQDesignerWizard::setPageTitle( const TQString& title ) +void QDesignerWizard::setPageTitle( const TQString& title ) { setTitle( currentPage(), title ); } -void TQDesignerWizard::setPageName( const TQCString& name ) +void QDesignerWizard::setPageName( const TQCString& name ) { if ( TQWizard::currentPage() ) TQWizard::currentPage()->setName( name ); } -TQCString TQDesignerWizard::pageName() const +TQCString QDesignerWizard::pageName() const { if ( !TQWizard::currentPage() ) return 0; return TQWizard::currentPage()->name(); } -int TQDesignerWizard::pageNum( TQWidget *p ) +int QDesignerWizard::pageNum( TQWidget *p ) { for ( int i = 0; i < pageCount(); ++i ) { if ( page( i ) == p ) @@ -461,20 +461,20 @@ int TQDesignerWizard::pageNum( TQWidget *p ) return -1; } -void TQDesignerWizard::addPage( TQWidget *p, const TQString &t ) +void QDesignerWizard::addPage( TQWidget *p, const TQString &t ) { TQWizard::addPage( p, t ); if ( removedPages.tqfind( p ) ) removedPages.remove( p ); } -void TQDesignerWizard::removePage( TQWidget *p ) +void QDesignerWizard::removePage( TQWidget *p ) { TQWizard::removePage( p ); removedPages.insert( p, p ); } -void TQDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) +void QDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) { TQWizard::insertPage( p, t, index ); if ( removedPages.tqfind( p ) ) @@ -603,7 +603,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay l = new TQVBoxLayout( tqlayout ); break; case Grid: - l = new TQDesignerGridLayout( tqlayout ); + l = new QDesignerGridLayout( tqlayout ); break; default: return 0; @@ -621,7 +621,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay l = new TQVBoxLayout( tqlayout ); break; case Grid: - l = new TQDesignerGridLayout( tqlayout ); + l = new QDesignerGridLayout( tqlayout ); break; default: return 0; @@ -638,7 +638,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay l = new TQVBoxLayout( widget ); break; case Grid: - l = new TQDesignerGridLayout( widget ); + l = new QDesignerGridLayout( widget ); break; default: return 0; @@ -689,17 +689,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) { TQPushButton *b = 0; if ( init ) { - b = new TQDesignerPushButton( tqparent, name ); + b = new QDesignerPushButton( tqparent, name ); b->setText( TQString::tqfromLatin1( name ) ); } else { - b = new TQDesignerPushButton( tqparent, name ); + b = new QDesignerPushButton( tqparent, name ); } TQWidget *w = find_formwindow( b ); b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) { if ( init ) { - TQDesignerToolButton *tb = new TQDesignerToolButton( tqparent, name ); + QDesignerToolButton *tb = new QDesignerToolButton( tqparent, name ); if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) { tb->setUsesTextLabel(TRUE); tb->setTextLabel("..."); @@ -710,21 +710,21 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return tb; } - return new TQDesignerToolButton( tqparent, name ); + return new QDesignerToolButton( tqparent, name ); } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) { if ( init ) { - TQDesignerCheckBox *cb = new TQDesignerCheckBox( tqparent, name ); + QDesignerCheckBox *cb = new QDesignerCheckBox( tqparent, name ); cb->setText( TQString::tqfromLatin1( name ) ); return cb; } - return new TQDesignerCheckBox( tqparent, name ); + return new QDesignerCheckBox( tqparent, name ); } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) { if ( init ) { - TQDesignerRadioButton *rb = new TQDesignerRadioButton( tqparent, name ); + QDesignerRadioButton *rb = new QDesignerRadioButton( tqparent, name ); rb->setText( TQString::tqfromLatin1( name ) ); return rb; } - return new TQDesignerRadioButton( tqparent, name ); + return new QDesignerRadioButton( tqparent, name ); } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) { if ( init ) return new TQGroupBox( TQString::tqfromLatin1( name ), tqparent, name ); @@ -787,7 +787,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING ) return new TQTextEdit( tqparent, name ); else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" ) { - TQDesignerLabel *l = new TQDesignerLabel( tqparent, name ); + QDesignerLabel *l = new QDesignerLabel( tqparent, name ); if ( init ) { l->setText( TQString::tqfromLatin1( name ) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); @@ -795,7 +795,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if ( className == "PixmapLabel" ) { - TQDesignerLabel *l = new TQDesignerLabel( tqparent, name ); + QDesignerLabel *l = new QDesignerLabel( tqparent, name ); if ( init ) { l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) ); l->setScaledContents( TRUE ); @@ -807,23 +807,23 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) return new TQLayoutWidget( tqparent, name ); else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) { - TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name ); + TQTabWidget *tw = new QDesignerTabWidget( tqparent, name ); if ( init ) { FormWindow *fw = find_formwindow( tqparent ); - TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); + TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 1") ); MetaDataBase::addEntry( TQT_TQOBJECT(w) ); - w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); + 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) ); } return tw; } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) { - TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name ); + QDesignerWidgetStack *ws = new QDesignerWidgetStack( tqparent, name ); if ( init ) { FormWindow *fw = find_formwindow( tqparent ); - TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); + TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( TQT_TQOBJECT(w) ); MetaDataBase::addEntry( TQT_TQOBJECT(ws) ); @@ -841,7 +841,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa ::tqqt_cast<TQMainWindow*>(tqparent) ) ) { FormWindow *fw = find_formwindow( tqparent ); if ( fw ) { - TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name ); + QDesignerWidget *dw = new QDesignerWidget( fw, tqparent, name ); MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); return dw; } @@ -850,7 +850,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) { TQDialog *dia = 0; if ( ::tqqt_cast<FormWindow*>(tqparent) ) - dia = new TQDesignerDialog( (FormWindow*)tqparent, tqparent, name ); + dia = new QDesignerDialog( (FormWindow*)tqparent, tqparent, name ); else dia = new TQDialog( tqparent, name ); #if defined(TQT_NON_COMMERCIAL) @@ -861,7 +861,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); return dia; } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) { - TQWizard *wiz = new TQDesignerWizard( tqparent, name ); + TQWizard *wiz = new QDesignerWizard( tqparent, name ); #if defined(TQT_NON_COMMERCIAL) if ( ::tqqt_cast<MainWindow*>(tqparent) ) #else @@ -869,7 +869,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa #endif wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) { - TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" ); + QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" ); MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); wiz->addPage( dw, i18n( "Page" ) ); TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); @@ -943,7 +943,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) { TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 ); mw->setDockEnabled( TQt::DockMinimized, FALSE ); - TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, mw, "central widget" ); + QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, mw, "central widget" ); mw->setDockMenuEnabled( FALSE ); MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); mw->setCentralWidget( dw ); @@ -952,14 +952,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return mw; } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) { if ( !init ) - return new TQDesignerToolBox( tqparent, name ); - TQToolBox *tb = new TQDesignerToolBox( tqparent, name ); + return new QDesignerToolBox( tqparent, name ); + TQToolBox *tb = new QDesignerToolBox( tqparent, name ); FormWindow *fw = find_formwindow( tqparent ); - TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) : + TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, i18n("Page 1") ); MetaDataBase::addEntry( TQT_TQOBJECT(w) ); - w = fw ? new TQDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" ); + w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" ); tb->addItem( w, i18n("Page 2") ); MetaDataBase::addEntry( TQT_TQOBJECT(tb) ); MetaDataBase::addEntry( TQT_TQOBJECT(w) ); @@ -967,12 +967,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } #ifndef TQT_NO_SQL else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) { - TQWidget *w = new TQDesignerDataBrowser( tqparent, name ); + TQWidget *w = new QDesignerDataBrowser( tqparent, name ); if ( tqparent ) w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); return w; } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) { - TQWidget *w = new TQDesignerDataView( tqparent, name ); + TQWidget *w = new QDesignerDataView( tqparent, name ); if ( tqparent ) w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); return w; @@ -1222,46 +1222,46 @@ const char* WidgetFactory::classNameOf( TQObject* o ) return o->className(); if (WidgetDatabase::isCustomPluginWidget(WidgetDatabase::idFromClassName(o->className()))) return o->className(); - else if ( ::tqqt_cast<TQDesignerTabWidget*>(o) ) + else if ( ::tqqt_cast<QDesignerTabWidget*>(o) ) return TQTABWIDGET_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerWidgetStack*>(o) ) + else if ( ::tqqt_cast<QDesignerWidgetStack*>(o) ) return TQWIDGETSTACK_OBJECT_NAME_STRING; else if ( ::tqqt_cast<TQWidgetStack*>(o) ) return "TQWeDoNotWantToBreakTabWidget"; - else if ( ::tqqt_cast<TQDesignerDialog*>(o) ) + else if ( ::tqqt_cast<QDesignerDialog*>(o) ) return TQDIALOG_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerWidget*>(o) ) + else if ( ::tqqt_cast<QDesignerWidget*>(o) ) return TQWIDGET_OBJECT_NAME_STRING; else if ( o->inherits( "CustomWidget" ) ) return ( (CustomWidget*)o )->realClassName().latin1(); - else if ( ::tqqt_cast<TQDesignerLabel*>(o) ) + else if ( ::tqqt_cast<QDesignerLabel*>(o) ) return TQLABEL_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerWizard*>(o) ) + else if ( ::tqqt_cast<QDesignerWizard*>(o) ) return TQWIZARD_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerPushButton*>(o) ) + else if ( ::tqqt_cast<QDesignerPushButton*>(o) ) return TQPUSHBUTTON_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerToolButton*>(o) ) + else if ( ::tqqt_cast<QDesignerToolButton*>(o) ) return TQTOOLBUTTON_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerRadioButton*>(o) ) + else if ( ::tqqt_cast<QDesignerRadioButton*>(o) ) return TQRADIOBUTTON_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerCheckBox*>(o) ) + else if ( ::tqqt_cast<QDesignerCheckBox*>(o) ) return TQCHECKBOX_OBJECT_NAME_STRING; else if ( ::tqqt_cast<MenuBarEditor*>(o) ) return TQMENUBAR_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerToolBar*>(o) ) + else if ( ::tqqt_cast<QDesignerToolBar*>(o) ) return TQTOOLBAR_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerAction*>(o) ) + else if ( ::tqqt_cast<QDesignerAction*>(o) ) return TQACTION_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerActionGroup*>(o) ) + else if ( ::tqqt_cast<QDesignerActionGroup*>(o) ) return TQACTIONGROUP_OBJECT_NAME_STRING; else if ( ::tqqt_cast<PopupMenuEditor*>(o) ) return TQPOPUPMENU_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerToolBox*>(o) ) + else if ( ::tqqt_cast<QDesignerToolBox*>(o) ) return TQTOOLBOX_OBJECT_NAME_STRING; #ifndef TQT_NO_SQL - else if ( ::tqqt_cast<TQDesignerDataBrowser*>(o) ) + else if ( ::tqqt_cast<QDesignerDataBrowser*>(o) ) return TQDATABROWSER_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQDesignerDataView*>(o) ) + else if ( ::tqqt_cast<QDesignerDataView*>(o) ) return TQDATAVIEW_OBJECT_NAME_STRING; #endif return o->className(); @@ -1307,7 +1307,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) MainWindow::self->currProject()->fakeFormFileFor( o ) ) return; MetaDataBase::setPropertyChanged( o, "name", TRUE ); - if ( !::tqqt_cast<TQDesignerToolBar*>(o) && !::tqqt_cast<MenuBarEditor*>(o) ) + if ( !::tqqt_cast<QDesignerToolBar*>(o) && !::tqqt_cast<MenuBarEditor*>(o) ) MetaDataBase::setPropertyChanged( o, "geometry", TRUE ); if ( ::tqqt_cast<TQPushButton*>(o) || @@ -1359,7 +1359,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) #endif } else if ( ::tqqt_cast<TQSplitter*>(o) ) { MetaDataBase::setPropertyChanged( o, "orientation", TRUE ); - } else if ( ::tqqt_cast<TQDesignerToolBar*>(o) ) { + } else if ( ::tqqt_cast<QDesignerToolBar*>(o) ) { MetaDataBase::setPropertyChanged( o, "label", TRUE ); } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) { MetaDataBase::setPropertyChanged( o, "itemName", TRUE ); @@ -1543,7 +1543,7 @@ TQVariant WidgetFactory::property( TQObject *w, const char *name ) return w->property( name ); } -void TQDesignerLabel::updateBuddy() +void QDesignerLabel::updateBuddy() { if ( myBuddy.isEmpty() ) @@ -1560,7 +1560,7 @@ void TQDesignerLabel::updateBuddy() } -void TQDesignerWidget::resizeEvent( TQResizeEvent* e) +void QDesignerWidget::resizeEvent( TQResizeEvent* e) { if ( need_frame ) { TQPainter p(this); @@ -1569,7 +1569,7 @@ void TQDesignerWidget::resizeEvent( TQResizeEvent* e) } } -void TQDesignerWidget::paintEvent( TQPaintEvent *e ) +void QDesignerWidget::paintEvent( TQPaintEvent *e ) { if ( need_frame ) { TQPainter p(this); @@ -1579,7 +1579,7 @@ void TQDesignerWidget::paintEvent( TQPaintEvent *e ) formwindow->paintGrid( this, e ); } -void TQDesignerDialog::paintEvent( TQPaintEvent *e ) +void QDesignerDialog::paintEvent( TQPaintEvent *e ) { formwindow->paintGrid( this, e ); } @@ -1757,39 +1757,39 @@ TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget } -TQDesignerToolBox::TQDesignerToolBox( TQWidget *tqparent, const char *name ) +QDesignerToolBox::QDesignerToolBox( TQWidget *tqparent, const char *name ) : TQToolBox( tqparent, name ) { } -TQString TQDesignerToolBox::itemLabel() const +TQString QDesignerToolBox::itemLabel() const { return TQToolBox::itemLabel( currentIndex() ); } -void TQDesignerToolBox::setItemLabel( const TQString &l ) +void QDesignerToolBox::setItemLabel( const TQString &l ) { TQToolBox::setItemLabel( currentIndex(), l ); } -TQCString TQDesignerToolBox::itemName() const +TQCString QDesignerToolBox::itemName() const { return currentItem() ? currentItem()->name() : 0; } -void TQDesignerToolBox::setItemName( const TQCString &n ) +void QDesignerToolBox::setItemName( const TQCString &n ) { if (currentItem()) currentItem()->setName( n ); } -TQt::BackgroundMode TQDesignerToolBox::itemBackgroundMode() const +TQt::BackgroundMode QDesignerToolBox::itemBackgroundMode() const { return (item(0) ? item(0)->backgroundMode() : PaletteBackground); } -void TQDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode ) +void QDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode ) { for (int i = 0; i < count(); ++i) { TQWidget *w = item(i); @@ -1798,7 +1798,7 @@ void TQDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode ) } } -void TQDesignerToolBox::itemInserted( int index ) +void QDesignerToolBox::itemInserted( int index ) { if (count() > 1) item(index)->setBackgroundMode(item(index>0?0:1)->backgroundMode()); diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index 17f5133b..1100418c 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -119,7 +119,7 @@ private: }; -class TQDesignerTabWidget : public TQTabWidget +class QDesignerTabWidget : public TQTabWidget { Q_OBJECT TQ_OBJECT @@ -127,7 +127,7 @@ class TQDesignerTabWidget : public TQTabWidget TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - TQDesignerTabWidget( TQWidget *tqparent, const char *name ); + QDesignerTabWidget( TQWidget *tqparent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -149,14 +149,14 @@ private: bool mousePressed; }; -class TQDesignerWidgetStack : public TQWidgetStack +class QDesignerWidgetStack : public TQWidgetStack { Q_OBJECT TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - TQDesignerWidgetStack( TQWidget *tqparent, const char *name ); + QDesignerWidgetStack( TQWidget *tqparent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -193,7 +193,7 @@ private: }; -class TQDesignerWizard : public TQWizard +class QDesignerWizard : public TQWizard { Q_OBJECT TQ_OBJECT @@ -203,7 +203,7 @@ class TQDesignerWizard : public TQWizard TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - TQDesignerWizard( TQWidget *tqparent, const char *name ) + QDesignerWizard( TQWidget *tqparent, const char *name ) : TQWizard( tqparent, name ), modal(FALSE) {} int currentPageNum() const; @@ -315,7 +315,7 @@ public: } }; -class TQDesignerLabel : public TQLabel +class QDesignerLabel : public TQLabel { Q_OBJECT TQ_OBJECT @@ -323,7 +323,7 @@ class TQDesignerLabel : public TQLabel TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) public: - TQDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 ) + QDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 ) : TQLabel( tqparent, name ) { myBuddy = 0; } void setBuddyWidget( const TQCString &b ) { @@ -348,15 +348,15 @@ private: }; -class TQDesignerWidget : public TQWidget +class QDesignerWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - TQDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name ) + QDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) { - need_frame = tqparent && tqparent->inherits("TQDesignerWidgetStack" ); + need_frame = tqparent && tqparent->inherits("QDesignerWidgetStack" ); } protected: @@ -369,14 +369,14 @@ private: }; -class TQDesignerDialog : public TQDialog +class QDesignerDialog : public TQDialog { Q_OBJECT TQ_OBJECT TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - TQDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) + QDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) : TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {} bool isModal() const { return modal; } @@ -391,14 +391,14 @@ private: }; -class TQDesignerToolButton : public TQToolButton +class QDesignerToolButton : public TQToolButton { Q_OBJECT TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerToolButton( TQWidget *tqparent, const char *name ) + QDesignerToolButton( TQWidget *tqparent, const char *name ) : TQToolButton( tqparent, name ) {} bool isInButtonGroup() const { @@ -415,14 +415,14 @@ public: } }; -class TQDesignerRadioButton : public TQRadioButton +class QDesignerRadioButton : public TQRadioButton { Q_OBJECT TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerRadioButton( TQWidget *tqparent, const char *name ) + QDesignerRadioButton( TQWidget *tqparent, const char *name ) : TQRadioButton( tqparent, name ) {} bool isInButtonGroup() const { @@ -440,14 +440,14 @@ public: }; -class TQDesignerPushButton : public TQPushButton +class QDesignerPushButton : public TQPushButton { Q_OBJECT TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerPushButton( TQWidget *tqparent, const char *name ) + QDesignerPushButton( TQWidget *tqparent, const char *name ) : TQPushButton( tqparent, name ) {} bool isInButtonGroup() const { @@ -465,14 +465,14 @@ public: }; -class TQDesignerCheckBox : public TQCheckBox +class QDesignerCheckBox : public TQCheckBox { Q_OBJECT TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerCheckBox( TQWidget *tqparent, const char *name ) + QDesignerCheckBox( TQWidget *tqparent, const char *name ) : TQCheckBox( tqparent, name ) {} bool isInButtonGroup() const { @@ -490,7 +490,7 @@ public: }; -class TQDesignerToolBox : public TQToolBox +class QDesignerToolBox : public TQToolBox { Q_OBJECT TQ_OBJECT @@ -499,7 +499,7 @@ class TQDesignerToolBox : public TQToolBox TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true ) public: - TQDesignerToolBox( TQWidget *tqparent, const char *name ); + QDesignerToolBox( TQWidget *tqparent, const char *name ); TQString itemLabel() const; void setItemLabel( const TQString &l ); diff --git a/kdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h index ce5f844c..03e1c98e 100644 --- a/kdevdesigner/interfaces/actioninterface.h +++ b/kdevdesigner/interfaces/actioninterface.h @@ -27,7 +27,7 @@ #ifndef ACTIONINTERFACE_H #define ACTIONINTERFACE_H -#include <private/tqcom_p.h> +#include <tqcom_p.h> class TQAction; class TQObject; diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h index 320f3d88..d76df941 100644 --- a/kdevdesigner/interfaces/classbrowserinterface.h +++ b/kdevdesigner/interfaces/classbrowserinterface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include <tqobject.h> class TQListView; diff --git a/kdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h index d7f0667b..d96cc388 100644 --- a/kdevdesigner/interfaces/designerinterface.h +++ b/kdevdesigner/interfaces/designerinterface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include <tqptrlist.h> #include <tqstring.h> #include <tqmap.h> diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h index 02fa1bf4..e0d6fc06 100644 --- a/kdevdesigner/interfaces/editorinterface.h +++ b/kdevdesigner/interfaces/editorinterface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include <tqmap.h> #include <tqvaluelist.h> diff --git a/kdevdesigner/interfaces/filterinterface.h b/kdevdesigner/interfaces/filterinterface.h index abca17b4..6af54bcb 100644 --- a/kdevdesigner/interfaces/filterinterface.h +++ b/kdevdesigner/interfaces/filterinterface.h @@ -27,7 +27,7 @@ #ifndef FILTERINTERFACE_H #define FILTERINTERFACE_H -#include <private/tqcom_p.h> +#include <tqcom_p.h> // {ea8cb381-59b5-44a8-bae5-9bea8295762a} #ifndef IID_ImportFilter diff --git a/kdevdesigner/interfaces/interpreterinterface.h b/kdevdesigner/interfaces/interpreterinterface.h index fd6a86d3..45ba9e12 100644 --- a/kdevdesigner/interfaces/interpreterinterface.h +++ b/kdevdesigner/interfaces/interpreterinterface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> class TQObject; diff --git a/kdevdesigner/interfaces/languageinterface.h b/kdevdesigner/interfaces/languageinterface.h index 31e9f013..9d1f7e3d 100644 --- a/kdevdesigner/interfaces/languageinterface.h +++ b/kdevdesigner/interfaces/languageinterface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include <tqvaluelist.h> #include <tqstringlist.h> #include <tqmap.h> diff --git a/kdevdesigner/interfaces/preferenceinterface.h b/kdevdesigner/interfaces/preferenceinterface.h index ba972933..5b356c4b 100644 --- a/kdevdesigner/interfaces/preferenceinterface.h +++ b/kdevdesigner/interfaces/preferenceinterface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include <tqwidgetlist.h> #include <tqcstring.h> diff --git a/kdevdesigner/interfaces/projectsettingsiface.h b/kdevdesigner/interfaces/projectsettingsiface.h index d8d39097..e47f8ae7 100644 --- a/kdevdesigner/interfaces/projectsettingsiface.h +++ b/kdevdesigner/interfaces/projectsettingsiface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include <tqwidgetlist.h> #include <tqcstring.h> diff --git a/kdevdesigner/interfaces/sourcetemplateiface.h b/kdevdesigner/interfaces/sourcetemplateiface.h index cc54f274..8d914625 100644 --- a/kdevdesigner/interfaces/sourcetemplateiface.h +++ b/kdevdesigner/interfaces/sourcetemplateiface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> #include <tqstring.h> // {1b3446a4-1c71-424b-8789-1f34eb5697d8} diff --git a/kdevdesigner/interfaces/templatewizardiface.h b/kdevdesigner/interfaces/templatewizardiface.h index 561b5264..be1c57f1 100644 --- a/kdevdesigner/interfaces/templatewizardiface.h +++ b/kdevdesigner/interfaces/templatewizardiface.h @@ -40,7 +40,7 @@ // // -#include <private/tqcom_p.h> +#include <tqcom_p.h> class TQWidget; struct DesignerFormWindow; diff --git a/kdevdesigner/interfaces/widgetinterface.h b/kdevdesigner/interfaces/widgetinterface.h index dea77857..5f0312f8 100644 --- a/kdevdesigner/interfaces/widgetinterface.h +++ b/kdevdesigner/interfaces/widgetinterface.h @@ -27,7 +27,7 @@ #ifndef WIDGETINTERFACE_H #define WIDGETINTERFACE_H -#include <private/tqwidgetinterface_p.h> +#include <tqwidgetinterface_p.h> #define WidgetInterface TQWidgetFactoryInterface #define IID_Widget IID_TQWidgetFactory diff --git a/kdevdesigner/shared/widgetdatabase.h b/kdevdesigner/shared/widgetdatabase.h index e64e4fae..5395f2ef 100644 --- a/kdevdesigner/shared/widgetdatabase.h +++ b/kdevdesigner/shared/widgetdatabase.h @@ -30,7 +30,7 @@ #include <tqiconset.h> #include <tqstring.h> #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility -#include <private/tqpluginmanager_p.h> +#include <tqpluginmanager_p.h> extern TQPluginManager<WidgetInterface> *widgetManager(); diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h index ada42364..c8881736 100644 --- a/kdevdesigner/uilib/database2.h +++ b/kdevdesigner/uilib/database2.h @@ -56,25 +56,25 @@ protected: }; -class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 +class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 { Q_OBJECT TQ_OBJECT public: - TQDesignerDataBrowser2( TQWidget *tqparent, const char *name ); + QDesignerDataBrowser2( TQWidget *tqparent, const char *name ); protected: bool event( TQEvent* e ); }; -class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2 +class QDesignerDataView2 : public TQDataView, public DatabaseSupport2 { Q_OBJECT TQ_OBJECT public: - TQDesignerDataView2( TQWidget *tqparent, const char *name ); + QDesignerDataView2( TQWidget *tqparent, const char *name ); protected: bool event( TQEvent* e ); @@ -82,8 +82,8 @@ protected: }; #define DatabaseSupport DatabaseSupport2 -#define TQDesignerDataBrowser TQDesignerDataBrowser2 -#define TQDesignerDataView TQDesignerDataView2 +#define TQDesignerDataBrowser QDesignerDataBrowser2 +#define TQDesignerDataView QDesignerDataView2 #endif diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index b19d7d14..7b5cf28b 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -41,7 +41,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqobjectlist.h> -#include <private/tqpluginmanager_p.h> +#include <tqpluginmanager_p.h> #include <tqmime.h> #include <tqdragobject.h> @@ -354,11 +354,11 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; - if ( cit.key()->inherits( "TQDesignerDataBrowser2" ) ) - ( (TQDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, + if ( cit.key()->inherits( "QDesignerDataBrowser2" ) ) + ( (QDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, TQT_TQOBJECT(cit.key()), *(*cit).dbControls ); - else if ( cit.key()->inherits( "TQDesignerDataView2" ) ) - ( (TQDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, + else if ( cit.key()->inherits( "QDesignerDataView2" ) ) + ( (QDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, TQT_TQOBJECT(cit.key()), *(*cit).dbControls ); } @@ -1516,9 +1516,9 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) { return new TQDataTable( tqparent, name ); } else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) { - return new TQDesignerDataBrowser2( tqparent, name ); + return new QDesignerDataBrowser2( tqparent, name ); } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) { - return new TQDesignerDataView2( tqparent, name ); + return new QDesignerDataView2( tqparent, name ); } #endif diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h index c7028696..575a3630 100644 --- a/kdevdesigner/uilib/qwidgetfactory.h +++ b/kdevdesigner/uilib/qwidgetfactory.h @@ -27,7 +27,6 @@ #ifndef TQWIDGETFACTORY_H #define TQWIDGETFACTORY_H -#ifndef TQT_H #include <tqstring.h> #include <tqptrlist.h> #include <tqimage.h> @@ -35,7 +34,6 @@ #include <tqvaluelist.h> #include <tqmap.h> #include <tqaction.h> -#endif // TQT_H class TQDomDocument; class TQDomElement; |