From 2cb2dfe421fb3f11a70368dafbd8a1ec7383d30b Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 23:06:17 +0000 Subject: Fix remaining kdevelop build problems git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1237331 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdevdesigner/designer/command.cpp | 64 +++++++++++++++--------------- kdevdesigner/designer/command.h | 10 ++--- kdevdesigner/designer/designerappiface.cpp | 12 +++--- kdevdesigner/designer/formwindow.cpp | 6 +-- kdevdesigner/designer/hierarchyview.cpp | 40 +++++++++---------- kdevdesigner/designer/mainwindow.cpp | 18 ++++----- kdevdesigner/designer/popupmenueditor.cpp | 12 +++--- kdevdesigner/designer/propertyeditor.cpp | 8 ++-- kdevdesigner/designer/resource.cpp | 48 +++++++++++----------- kdevdesigner/designer/resource.h | 4 +- kdevdesigner/designer/workspace.cpp | 2 +- kdevdesigner/designer/workspace.h | 6 +-- 12 files changed, 115 insertions(+), 115 deletions(-) diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index 14016cbc..f461a877 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -850,7 +850,7 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw, TQTabWidget *tw, const TQString &label ) : Command( n, fw ), tabWidget( tw ), tabLabel( label ) { - tabPage = new TQDesignerWidget( formWindow(), tabWidget, "TabPage" ); + tabPage = new QDesignerWidget( formWindow(), tabWidget, "TabPage" ); tabPage->hide(); index = -1; MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) ); @@ -859,7 +859,7 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw, void AddTabPageCommand::execute() { if ( index == -1 ) - index = ( (TQDesignerTabWidget*)tabWidget )->count(); + index = ( (QDesignerTabWidget*)tabWidget )->count(); tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); @@ -886,18 +886,18 @@ MoveTabPageCommand::MoveTabPageCommand( const TQString &n, FormWindow *fw, void MoveTabPageCommand::execute() { - ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage ); - ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex ); - ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage ); + ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); + ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex ); + ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } void MoveTabPageCommand::unexecute() { - ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage ); - ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex ); - ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage ); + ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); + ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex ); + ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -908,8 +908,8 @@ DeleteTabPageCommand::DeleteTabPageCommand( const TQString &n, FormWindow *fw, TQTabWidget *tw, TQWidget *page ) : Command( n, fw ), tabWidget( tw ), tabPage( page ) { - tabLabel = ( (TQDesignerTabWidget*)tabWidget )->pageTitle(); - index = ( (TQDesignerTabWidget*)tabWidget )->currentPage(); + tabLabel = ( (QDesignerTabWidget*)tabWidget )->pageTitle(); + index = ( (QDesignerTabWidget*)tabWidget )->currentPage(); } void DeleteTabPageCommand::execute() @@ -931,10 +931,10 @@ void DeleteTabPageCommand::unexecute() // ------------------------------------------------------------ AddWidgetStackPageCommand::AddWidgetStackPageCommand( const TQString &n, FormWindow *fw, - TQDesignerWidgetStack *ws ) + QDesignerWidgetStack *ws ) : Command( n, fw ), widgetStack( ws ) { - stackPage = new TQDesignerWidget( formWindow(), widgetStack, "WStackPage" ); + stackPage = new QDesignerWidget( formWindow(), widgetStack, "WStackPage" ); stackPage->hide(); index = -1; MetaDataBase::addEntry( TQT_TQOBJECT(stackPage) ); @@ -956,7 +956,7 @@ void AddWidgetStackPageCommand::unexecute() } DeleteWidgetStackPageCommand::DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw, - TQDesignerWidgetStack *ws, TQWidget *page ) + QDesignerWidgetStack *ws, TQWidget *page ) : Command( n, fw), widgetStack( ws ), stackPage( page ) { index = -1; @@ -984,7 +984,7 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw, TQWizard *w, const TQString &label, int i, bool s ) : Command( n, fw ), wizard( w ), pageLabel( label ) { - page = new TQDesignerWidget( formWindow(), wizard, "WizardPage" ); + page = new QDesignerWidget( formWindow(), wizard, "WizardPage" ); page->hide(); index = i; show = s; @@ -997,7 +997,7 @@ void AddWizardPageCommand::execute() index = wizard->pageCount(); wizard->insertPage( page, pageLabel, index ); if ( show ) - ( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) ); + ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1033,7 +1033,7 @@ void DeleteWizardPageCommand::unexecute() { wizard->insertPage( page, pageLabel, index ); if ( show ) - ( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) ); + ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1857,18 +1857,18 @@ void AddActionToToolBarCommand::execute() { action->addTo( toolBar ); - if ( ::tqqt_cast(action) ) { - TQString s = ( (TQDesignerAction*)action )->widget()->name(); + if ( ::tqqt_cast(action) ) { + TQString s = ( (QDesignerAction*)action )->widget()->name(); if ( s.startsWith( "qt_dead_widget_" ) ) { s.remove( 0, TQString( "qt_dead_widget_" ).length() ); - ( (TQDesignerAction*)action )->widget()->setName( s ); + ( (QDesignerAction*)action )->widget()->setName( s ); } - toolBar->insertAction( ( (TQDesignerAction*)action )->widget(), action ); - ( (TQDesignerAction*)action )->widget()->installEventFilter( toolBar ); - } else if ( ::tqqt_cast(action) ) { - if ( ( (TQDesignerActionGroup*)action )->usesDropDown() ) { - toolBar->insertAction( ( (TQDesignerActionGroup*)action )->widget(), action ); - ( (TQDesignerActionGroup*)action )->widget()->installEventFilter( toolBar ); + toolBar->insertAction( ( (QDesignerAction*)action )->widget(), action ); + ( (QDesignerAction*)action )->widget()->installEventFilter( toolBar ); + } else if ( ::tqqt_cast(action) ) { + if ( ( (QDesignerActionGroup*)action )->usesDropDown() ) { + toolBar->insertAction( ( (QDesignerActionGroup*)action )->widget(), action ); + ( (QDesignerActionGroup*)action )->widget()->installEventFilter( toolBar ); } } else if ( ::tqqt_cast(action) ) { toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action ); @@ -1892,8 +1892,8 @@ void AddActionToToolBarCommand::execute() if ( !::tqqt_cast(o) ) continue; // ### fix it for nested actiongroups - if ( ::tqqt_cast(o) ) { - TQDesignerAction *ac = (TQDesignerAction*)o; + if ( ::tqqt_cast(o) ) { + QDesignerAction *ac = (QDesignerAction*)o; toolBar->insertAction( ac->widget(), ac ); ac->widget()->installEventFilter( toolBar ); if ( index == -1 ) @@ -1912,10 +1912,10 @@ void AddActionToToolBarCommand::execute() void AddActionToToolBarCommand::unexecute() { - if ( ::tqqt_cast(action) ) { - TQString s = ( (TQDesignerAction*)action )->widget()->name(); + if ( ::tqqt_cast(action) ) { + TQString s = ( (QDesignerAction*)action )->widget()->name(); s.prepend( "qt_dead_widget_" ); - ( (TQDesignerAction*)action )->widget()->setName( s ); + ( (QDesignerAction*)action )->widget()->setName( s ); } toolBar->removeAction( action ); @@ -1932,7 +1932,7 @@ void AddActionToToolBarCommand::unexecute() ++it; if ( !::tqqt_cast(o) ) continue; - if ( ::tqqt_cast(o) ) { + if ( ::tqqt_cast(o) ) { o->removeEventFilter( toolBar ); toolBar->removeAction( (TQAction*)o ); } @@ -2426,7 +2426,7 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw, TQToolBox *tw, const TQString &label ) : Command( n, fw ), toolBox( tw ), toolBoxLabel( label ) { - toolBoxPage = new TQDesignerWidget( formWindow(), toolBox, "page" ); + toolBoxPage = new QDesignerWidget( formWindow(), toolBox, "page" ); toolBoxPage->hide(); index = -1; MetaDataBase::addEntry( TQT_TQOBJECT(toolBoxPage) ); diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index f0bfc0a6..3aa1a919 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -445,19 +445,19 @@ private: TQString tabLabel; }; -class TQDesignerWidgetStack; +class QDesignerWidgetStack; class AddWidgetStackPageCommand : public Command { public: AddWidgetStackPageCommand( const TQString &n, FormWindow *fw, - TQDesignerWidgetStack *ws ); + QDesignerWidgetStack *ws ); void execute(); void unexecute(); Type type() const { return AddWidgetStackPage; } private: - TQDesignerWidgetStack *widgetStack; + QDesignerWidgetStack *widgetStack; int index; TQWidget *stackPage; }; @@ -466,14 +466,14 @@ class DeleteWidgetStackPageCommand : public Command { public: DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw, - TQDesignerWidgetStack *ws, TQWidget *page ); + QDesignerWidgetStack *ws, TQWidget *page ); void execute(); void unexecute(); Type type() const { return DeleteWidgetStackPage; } private: - TQDesignerWidgetStack *widgetStack; + QDesignerWidgetStack *widgetStack; int index; TQWidget *stackPage; }; diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index 5c7fa739..1cf01d4d 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -719,7 +719,7 @@ TQPtrList DesignerFormWindowImpl::actionList() const TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, TQObject* tqparent, const char* name, bool toggle ) { - TQDesignerAction *a = new TQDesignerAction( tqparent ); + QDesignerAction *a = new QDesignerAction( tqparent ); a->setName( name ); a->setText( text ); if ( !icon.isNull() && !icon.pixmap().isNull() ) @@ -998,7 +998,7 @@ void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu ) PopupMenuEditor *popup = (PopupMenuEditor*)mw->child( menu, "PopupMenuEditor" ); if ( !popup ) return; - TQAction *a = new TQSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); popup->insert( a ); } @@ -1007,7 +1007,7 @@ void DesignerFormWindowImpl::addToolBar( const TQString &text, const TQString &n if ( !::tqqt_cast(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); - TQToolBar *tb = new TQDesignerToolBar( mw ); + TQToolBar *tb = new QDesignerToolBar( mw ); TQString n = name; formWindow->unify( TQT_TQOBJECT(tb), n, TRUE ); tb->setName( n ); @@ -1019,7 +1019,7 @@ void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a if ( !::tqqt_cast(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); - TQDesignerToolBar *tb = (TQDesignerToolBar*)mw->child( tbn, "TQDesignerToolBar" ); + QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" ); if ( !tb ) return; a->addTo( tb ); @@ -1031,10 +1031,10 @@ void DesignerFormWindowImpl::addToolBarSeparator( const TQString &tbn ) if ( !::tqqt_cast(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); - TQDesignerToolBar *tb = (TQDesignerToolBar*)mw->child( tbn, "TQDesignerToolBar" ); + QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" ); if ( !tb ) return; - TQAction *a = new TQSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); a->addTo( tb ); tb->addAction( a ); } diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index cd097c54..de98ad44 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -1203,7 +1203,7 @@ void FormWindow::selectWidget( TQObject *o, bool select ) return; } - if ( ::tqqt_cast(o) ) + if ( ::tqqt_cast(o) ) return; if ( select ) { @@ -1486,7 +1486,7 @@ void FormWindow::deleteWidgets() if ( !( tb = mainWindow()->isAToolBarChild( TQT_TQOBJECT(it.current()->widget()) ) ) ) widgets.append( it.current()->widget() ); else - ( (TQDesignerToolBar*)tb )->removeWidget( it.current()->widget() ); + ( (QDesignerToolBar*)tb )->removeWidget( it.current()->widget() ); } if ( widgets.isEmpty() ) @@ -2462,7 +2462,7 @@ bool FormWindow::isDatabaseWidgetUsed() const bool FormWindow::isDatabaseAware() const { #ifndef TQT_NO_SQL - if ( TQString(mContainer->className()) == "TQDesignerDataBrowser" || TQString(mContainer->className()) == "TQDesignerDataView" ) + if ( TQString(mContainer->className()) == "QDesignerDataBrowser" || TQString(mContainer->className()) == "QDesignerDataView" ) return TRUE; return isDatabaseWidgetUsed(); #else diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index 7428e883..2deb21b2 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -264,14 +264,14 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); } else if ( ::tqqt_cast(w->tqparent()->tqparent()) ) { - ((TQDesignerWizard*)w->tqparent()->tqparent())-> - setCurrentPage( ( (TQDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) ); + ((QDesignerWizard*)w->tqparent()->tqparent())-> + setCurrentPage( ( (QDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) ); o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); } else { ( (TQWidgetStack*)w->tqparent() )->raiseWidget( w ); - if ( (TQWidgetStack*)w->tqparent()->isA( "TQDesignerWidgetStack" ) ) - ( (TQDesignerWidgetStack*)w->tqparent() )->updateButtons(); + if ( (TQWidgetStack*)w->tqparent()->isA( "QDesignerWidgetStack" ) ) + ( (QDesignerWidgetStack*)w->tqparent() )->updateButtons(); } } else if ( ::tqqt_cast(w) || ::tqqt_cast(w) ) { formWindow->setActiveObject( TQT_TQOBJECT(w) ); @@ -468,7 +468,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) ( (HierarchyItem*)item )->setObject( o ); TQObjectList l = o->childrenListObject(); - if ( ::tqqt_cast(o) ) + if ( ::tqqt_cast(o) ) l.clear(); if ( !l.isEmpty() ) { TQObjectListIt it( l ); @@ -481,8 +481,8 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) if ( ::tqqt_cast(it.current()->tqparent()) || ::tqqt_cast(it.current()) ) { TQObject *obj = it.current(); - TQDesignerTabWidget *tw = ::tqqt_cast(it.current()->tqparent()); - TQDesignerWizard *dw = ::tqqt_cast(it.current()->tqparent()); + QDesignerTabWidget *tw = ::tqqt_cast(it.current()->tqparent()); + QDesignerWizard *dw = ::tqqt_cast(it.current()->tqparent()); TQWidgetStack *stack = 0; if ( dw || tw || ::tqqt_cast(obj) ) stack = (TQWidgetStack*)obj; @@ -519,7 +519,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) } if ( fakeMainWindow ) { - TQObjectList *l = o->tqparent()->queryList( "TQDesignerToolBar" ); + TQObjectList *l = o->tqparent()->queryList( "QDesignerToolBar" ); TQObject *obj; for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); @@ -528,10 +528,10 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; - } else if ( ::tqqt_cast(o) || ::tqqt_cast(o) ) { + } else if ( ::tqqt_cast(o) || ::tqqt_cast(o) ) { TQPtrList actions; - if ( ::tqqt_cast(o) ) - actions = ( (TQDesignerToolBar*)o )->insertedActions(); + if ( ::tqqt_cast(o) ) + actions = ( (QDesignerToolBar*)o )->insertedActions(); else ( (PopupMenuEditor*)o )->insertedActions( actions ); @@ -539,27 +539,27 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) it.toLast(); while ( it.current() ) { TQAction *a = it.current(); - if ( ::tqqt_cast(a) ) { - TQDesignerAction *da = (TQDesignerAction*)a; + if ( ::tqqt_cast(a) ) { + QDesignerAction *da = (QDesignerAction*)a; if ( da->supportsMenu() ) insertObject( da, item ); else insertObject( TQT_TQOBJECT(da->widget()), item ); - } else if ( ::tqqt_cast(a) ) { + } else if ( ::tqqt_cast(a) ) { insertObject( a, item ); } --it; } - } else if ( ::tqqt_cast(o) && !o->childrenListObject().isEmpty() ) { + } else if ( ::tqqt_cast(o) && !o->childrenListObject().isEmpty() ) { TQObjectList l = o->childrenListObject(); for ( TQObject *obj = l.last(); obj; obj = l.prev() ) { - if ( ::tqqt_cast(obj) ) { - TQDesignerAction *da = (TQDesignerAction*)obj; + if ( ::tqqt_cast(obj) ) { + QDesignerAction *da = (QDesignerAction*)obj; if ( da->supportsMenu() ) insertObject( da, item ); else insertObject( TQT_TQOBJECT(da->widget()), item ); - } else if ( ::tqqt_cast(obj) ) { + } else if ( ::tqqt_cast(obj) ) { insertObject( obj, item ); } } @@ -651,7 +651,7 @@ void HierarchyList::removeTabPage() if ( ::tqqt_cast(w) ) { TQTabWidget *tw = (TQTabWidget*)w; if ( tw->currentPage() ) { - TQDesignerTabWidget *dtw = (TQDesignerTabWidget*)tw; + QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). tqarg( dtw->pageTitle() ).tqarg( tw->name() ), @@ -662,7 +662,7 @@ void HierarchyList::removeTabPage() } else if ( ::tqqt_cast(w) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); if ( wiz->currentPage() ) { - TQDesignerWizard *dw = (TQDesignerWizard*)wiz; + QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). tqarg( dw->pageTitle() ).tqarg( wiz->name() ), diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index e53d0383..53706d40 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -420,7 +420,7 @@ void MainWindow::setupWorkspace() dw->setResizeEnabled( TRUE ); dw->setCloseMode( TQDockWindow::Always ); TQVBox *vbox = new TQVBox( dw ); - TQCompletionEdit *edit = new TQCompletionEdit( vbox ); + 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() ) ); @@ -995,7 +995,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast(o) ) && o->tqparent() && ( ::tqqt_cast(o->tqparent()) - || ::tqqt_cast(o->tqparent())) ) ) { + || ::tqqt_cast(o->tqparent())) ) ) { TQWidget *w = (TQWidget*)o; if ( ::tqqt_cast(w) || ::tqqt_cast(w) || @@ -1619,16 +1619,16 @@ void MainWindow::setupRMBSpecialCommands( TQValueList &ids, if ( ::tqqt_cast(w) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); - if ( ( (TQDesignerTabWidget*)w )->count() > 1) { + if ( ( (QDesignerTabWidget*)w )->count() > 1) { ids << ( id = rmbWidgets->insertItem( i18n("Delete Page"), -1, 0 ) ); commands.insert( "remove", id ); } ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) ); commands.insert( "add", id ); - } else if ( ::tqqt_cast(w) ) { + } else if ( ::tqqt_cast(w) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); - if ( ( (TQDesignerWidgetStack*)w )->count() > 1) { + if ( ( (QDesignerWidgetStack*)w )->count() > 1) { ids << ( id = rmbWidgets->insertItem( i18n("Previous Page"), -1, 0 ) ); commands.insert( "prevpage", id ); ids << ( id = rmbWidgets->insertItem( i18n("Next Page"), -1, 0 ) ); @@ -1808,7 +1808,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command cmd->execute(); } else if ( id == commands[ "remove" ] ) { if ( tw->currentPage() ) { - TQDesignerTabWidget *dtw = (TQDesignerTabWidget*)tw; + QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). tqarg( dtw->pageTitle() ).tqarg( tw->name() ), @@ -1838,7 +1838,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command } } } else if ( ::tqqt_cast(w) ) { - TQDesignerWidgetStack *ws = (TQDesignerWidgetStack*)w; + QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w; if ( id == commands[ "add" ] ) { AddWidgetStackPageCommand *cmd = new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).tqarg( ws->name() ), @@ -1948,7 +1948,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command cmd->execute(); } else if ( id == commands[ "remove" ] ) { if ( wiz->currentPage() ) { - TQDesignerWizard *dw = (TQDesignerWizard*)wiz; + QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). tqarg( dw->pageTitle() ).tqarg( wiz->name() ), @@ -1964,7 +1964,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap &command } else if ( id == commands[ "rename" ] ) { bool ok = FALSE; - TQDesignerWizard *dw = (TQDesignerWizard*)wiz; + QDesignerWizard *dw = (QDesignerWizard*)wiz; TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, dw->pageTitle(), &ok, this ); if ( ok ) { diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index b106c3db..8c16be98 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -119,7 +119,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m removable( TRUE ) { init(); - if ( /*a->name() == "qt_separator_action" ||*/ ::tqqt_cast(a) ) + if ( /*a->name() == "qt_separator_action" ||*/ ::tqqt_cast(a) ) separator = TRUE; if ( a && !a->childrenListObject().isEmpty() ) a->installEventFilter( this ); @@ -747,7 +747,7 @@ void PopupMenuEditor::mouseDoubleClickEvent( TQMouseEvent * ) { setFocusAt( mousePressPos ); if ( currentItem() == &addSeparator ) { - PopupMenuEditorItem * i = createItem( new TQSeparatorAction( 0 ) ); + PopupMenuEditorItem * i = createItem( new QSeparatorAction( 0 ) ); i->setSeparator( TRUE ); return; } @@ -771,7 +771,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) cmd.execute(); // FIXME: start rename after drop } else if ( draggedItem == &addSeparator ) { - draggedItem = createItem( new TQSeparatorAction( 0 ) ); + draggedItem = createItem( new QSeparatorAction( 0 ) ); draggedItem->setSeparator( TRUE ); } @@ -857,7 +857,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) PopupMenuEditorItemPtrDrag::decode( e, &i ); } else { if ( e->provides( "application/x-designer-actiongroup" ) ) { - TQActionGroup * g = ::tqqt_cast(ActionDrag::action()); + TQActionGroup * g = ::tqqt_cast(ActionDrag::action()); if ( g->usesDropDown() ) { i = new PopupMenuEditorItem( g, this ); TQString n = TQString( g->name() ) + "Item"; @@ -877,7 +877,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) dropInPlace( g, e->pos().y() ); } } else if ( e->provides( "application/x-designer-actions" ) ) { - TQAction *a = ::tqqt_cast(ActionDrag::action()); + TQAction *a = ::tqqt_cast(ActionDrag::action()); i = new PopupMenuEditorItem( a, this ); } } @@ -1380,7 +1380,7 @@ void PopupMenuEditor::enterEditMode( TQKeyEvent * e ) PopupMenuEditorItem * i = currentItem(); if ( i == &addSeparator ) { - i = createItem( new TQSeparatorAction( 0 ) ); + i = createItem( new QSeparatorAction( 0 ) ); } else if ( i->isSeparator() ) { return; } else if ( currentField == 0 ) { diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 4294deb5..9d9678ad 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -3023,7 +3023,7 @@ static bool tqparent_is_data_aware( TQWidget *w ) { TQWidget *p = w ? w->tqparentWidget() : 0; while ( p && !p->isTopLevel() ) { - if ( ::tqqt_cast(p) || ::tqqt_cast(p) ) + if ( ::tqqt_cast(p) || ::tqqt_cast(p) ) return TRUE; p = p->tqparentWidget(); } @@ -3057,7 +3057,7 @@ void PropertyList::setupProperties() continue; if ( unique.tqcontains( TQString::tqfromLatin1( it.current() ) ) ) continue; - if ( ::tqqt_cast(editor->widget()) || + if ( ::tqqt_cast(editor->widget()) || ::tqqt_cast(editor->widget()) ) { if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) continue; @@ -3235,7 +3235,7 @@ void PropertyList::setupProperties() } } - if ( !::tqqt_cast(w) && !::tqqt_cast(w) && !::tqqt_cast(w) && + if ( !::tqqt_cast(w) && !::tqqt_cast(w) && !::tqqt_cast(w) && w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { item = new PropertyLayoutItem( this, item, 0, "tqlayoutSpacing" ); setPropertyValue( item ); @@ -3269,7 +3269,7 @@ void PropertyList::setupProperties() } if ( !::tqqt_cast(w) && !::tqqt_cast(w) && - !::tqqt_cast(w) && !::tqqt_cast(w) ) { + !::tqqt_cast(w) && !::tqqt_cast(w) ) { item = new PropertyTextItem( this, item, 0, "toolTip", TRUE, FALSE ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "toolTip" ) ) diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 174edc63..5f89b7cf 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -832,7 +832,7 @@ void Resource::paste( const TQString &cb, TQWidget *tqparent ) formwindow->commandHistory()->addCommand( cmd ); } -void Resource::saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent ) +void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent ) { if ( obj && obj->isWidgetType() && ( (TQWidget*)obj )->isHidden() ) return; @@ -851,7 +851,7 @@ void Resource::saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStre TQString attributes; if ( grid ) { - TQDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ]; + QDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ]; attributes += TQString(" row=\"") + TQString::number(item.row) + "\""; attributes += TQString(" column=\"") + TQString::number(item.column) + "\""; if ( item.rowspan * item.colspan != 1 ) { @@ -877,13 +877,13 @@ void Resource::saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStre return; } - TQDesignerWidgetStack* ws = 0; + QDesignerWidgetStack* ws = 0; if ( ::tqqt_cast(obj) ) { TQTabWidget* tw = (TQTabWidget*) obj; TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING ); TQWidgetStack *ws = (TQWidgetStack*)tmpl->first(); - TQTabBar *tb = ( (TQDesignerTabWidget*)obj )->tabBar(); + TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); for ( int i = 0; i < tb->count(); ++i ) { TQTab *t = tb->tabAt( i ); if ( !t ) @@ -911,7 +911,7 @@ void Resource::saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStre ts << makeIndent( indent ) << "" << endl; } delete tmpl; - } else if ( (ws = ::tqqt_cast(obj)) != 0 ) { + } else if ( (ws = ::tqqt_cast(obj)) != 0 ) { for ( int i = 0; i < ws->count(); ++i ) { TQWidget *w = ws->page( i ); if ( !w ) @@ -1349,7 +1349,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) TQString closeTag; // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer TQLayout *tqlayout = 0; - TQDesignerGridLayout* grid = 0; + QDesignerGridLayout* grid = 0; if ( !::tqqt_cast(obj) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && @@ -1370,7 +1370,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) closeTag = makeIndent( indent ) + ""; ts << makeIndent( indent ) << "" << endl; ++indent; - grid = (TQDesignerGridLayout*) tqlayout; + grid = (QDesignerGridLayout*) tqlayout; break; default: break; @@ -1807,7 +1807,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL ( (TQVBoxLayout*)tqlayout )->addWidget( w ); break; case WidgetFactory::Grid: - ( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, + ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, col, col + colspan - 1 ); break; default: @@ -1882,7 +1882,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() ); } else if ( ::tqqt_cast(tqparent) ) { if ( attrib == "id" ) - ( (TQDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() ); + ( (QDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() ); } else if ( ::tqqt_cast(tqparent) ) { if ( attrib == "label" ) ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); @@ -2132,7 +2132,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL if ( ::tqqt_cast(tqlayout) ) ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() ); else - ( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, + ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, spacer->tqalignment() ); } return spacer; @@ -3005,7 +3005,7 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) TQDomElement n = e; TQAction *a = 0; if ( n.tagName() == "action" ) { - a = new TQDesignerAction( tqparent ); + a = new QDesignerAction( tqparent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3025,7 +3025,7 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) if ( !::tqqt_cast(tqparent) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new TQDesignerActionGroup( tqparent ); + a = new QDesignerActionGroup( tqparent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3079,13 +3079,13 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; indent++; saveObjectProperties( TQT_TQOBJECT(tb), ts, indent ); - TQPtrList actionList = ( (TQDesignerToolBar*)tb )->insertedActions(); + TQPtrList actionList = ( (QDesignerToolBar*)tb )->insertedActions(); for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { - if ( ::tqqt_cast(a) ) { + if ( ::tqqt_cast(a) ) { ts << makeIndent( indent ) << "" << endl; } else { - if ( ::tqqt_cast(a) && !( (TQDesignerAction*)a )->supportsMenu() ) { - TQWidget *w = ( (TQDesignerAction*)a )->widget(); + if ( ::tqqt_cast(a) && !( (QDesignerAction*)a )->supportsMenu() ) { + TQWidget *w = ( (QDesignerAction*)a )->widget(); ts << makeIndent( indent ) << "" << endl; indent++; @@ -3143,11 +3143,11 @@ void Resource::savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStrea { for ( PopupMenuEditorItem *i = pm->items()->first(); i; i = pm->items()->next() ) { TQAction *a = i->action(); - if ( ::tqqt_cast(a) ) + if ( ::tqqt_cast(a) ) ts << makeIndent( indent ) << "" << endl; - else if ( ::tqqt_cast(a) ) + else if ( ::tqqt_cast(a) ) ts << makeIndent( indent ) << "name() << "\"/>" << endl; - else if ( ::tqqt_cast(a) ) + else if ( ::tqqt_cast(a) ) ts << makeIndent( indent ) << "name() << "\"/>" << endl; PopupMenuEditor *s = i->subMenu(); if ( s && s->count() ) { @@ -3168,11 +3168,11 @@ void Resource::loadToolBars( const TQDomElement &e ) { TQDomElement n = e.firstChild().toElement(); TQMainWindow *mw = ( (TQMainWindow*)formwindow->mainContainer() ); - TQDesignerToolBar *tb = 0; + QDesignerToolBar *tb = 0; while ( !n.isNull() ) { if ( n.tagName() == "toolbar" ) { TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt(); - tb = new TQDesignerToolBar( mw, dock ); + tb = new QDesignerToolBar( mw, dock ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -3182,12 +3182,12 @@ void Resource::loadToolBars( const TQDomElement &e ) tb->addAction( a ); } } else if ( n2.tagName() == "separator" ) { - TQAction *a = new TQSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); a->addTo( tb ); tb->addAction( a ); } else if ( n2.tagName() == "widget" ) { TQWidget *w = (TQWidget*)createObject( n2, tb ); - TQDesignerAction *a = new TQDesignerAction( w, TQT_TQOBJECT(tb) ); + QDesignerAction *a = new QDesignerAction( w, TQT_TQOBJECT(tb) ); a->addTo( tb ); tb->addAction( a ); tb->installEventFilters( w ); @@ -3244,7 +3244,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) loadPopupMenu( i->subMenu(), n ); } } else if ( n.tagName() == "separator" ) { - a = new TQSeparatorAction( 0 ); + a = new QSeparatorAction( 0 ); p->insert( a ); } n = n.nextSibling().toElement(); diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index 0617d977..3dd20a22 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -44,7 +44,7 @@ class TQPalette; class FormWindow; class MainWindow; class TQDomElement; -class TQDesignerGridLayout; +class QDesignerGridLayout; class TQListViewItem; class TQMainWindow; struct LanguageInterface; @@ -86,7 +86,7 @@ public: static bool saveFormCode( FormFile *formfile, LanguageInterface *langIface ); private: - void saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent ); + void saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent ); void saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ); void saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ); void saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type t, TQTextStream &ts, int indent ); diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index fe62a4ec..8668c331 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -653,7 +653,7 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) return TQListView::eventFilter( o, e ); } -void Workspace::setBufferEdit( TQCompletionEdit *edit ) +void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), diff --git a/kdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h index b32cd16a..b3bb705e 100644 --- a/kdevdesigner/designer/workspace.h +++ b/kdevdesigner/designer/workspace.h @@ -39,7 +39,7 @@ class MainWindow; class Project; class SourceFile; class FormFile; -class TQCompletionEdit; +class QCompletionEdit; class SourceEditor; class WorkspaceItem : public TQListViewItem @@ -98,7 +98,7 @@ public: void contentsDragEnterEvent( TQDragEnterEvent *e ); void contentsDragMoveEvent( TQDragMoveEvent *e ); - void setBufferEdit( TQCompletionEdit *edit ); + void setBufferEdit( QCompletionEdit *edit ); public slots: @@ -141,7 +141,7 @@ private: MainWindow *mainWindow; Project *project; WorkspaceItem *projectItem; - TQCompletionEdit *bufferEdit; + QCompletionEdit *bufferEdit; bool blockNewForms; void updateBufferEdit(); bool completionDirty; -- cgit v1.2.3