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/designer/mainwindow.cpp | |
| 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/designer/mainwindow.cpp')
| -rw-r--r-- | kdevdesigner/designer/mainwindow.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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; |