summaryrefslogtreecommitdiffstats
path: root/umbrello/umbrello
diff options
context:
space:
mode:
Diffstat (limited to 'umbrello/umbrello')
-rw-r--r--umbrello/umbrello/associationwidget.cpp2
-rw-r--r--umbrello/umbrello/dialogs/activitypage.cpp6
-rw-r--r--umbrello/umbrello/dialogs/classifierlistpage.cpp6
-rw-r--r--umbrello/umbrello/dialogs/umloperationdialog.cpp6
-rw-r--r--umbrello/umbrello/uml.cpp94
-rw-r--r--umbrello/umbrello/umlviewcanvas.cpp2
6 files changed, 58 insertions, 58 deletions
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index aa0e1683..c0ef19e5 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -2253,7 +2253,7 @@ void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) {
}//end method mouseReleaseEvent
bool AssociationWidget::showDialog() {
- AssocPropDlg dlg(static_cast<TQWidget*>(m_pView), this );
+ AssocPropDlg dlg(m_pView, this );
if (! dlg.exec())
return false;
TQString name = getName();
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 9262949e..f3036a94 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -69,10 +69,10 @@ void ActivityPage::setupPage() {
KButtonBox* buttonBox = new KButtonBox(m_pActivityGB);
- buttonBox->addButton( i18n("New Activity..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewActivity()) );
+ buttonBox->addButton( i18n("New Activity..."), this, TQT_SLOT(slotNewActivity()) );
m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"),
- TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) );
- m_pRenameButton = buttonBox->addButton( i18n("Rename"), TQT_TQOBJECT(this), TQT_SLOT(slotRename()) );
+ this, TQT_SLOT(slotDelete()) );
+ m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQT_SLOT(slotRename()) );
listVBoxLayout->addWidget(buttonBox);
mainLayout -> addWidget( m_pActivityGB );
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index b4028f18..a86273a5 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -95,10 +95,10 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
//the action buttons
KButtonBox* buttonBox = new KButtonBox(m_pItemListGB);
- buttonBox->addButton( newItemType, TQT_TQOBJECT(this), TQT_SLOT(slotNewListItem()) );
+ buttonBox->addButton( newItemType, this, TQT_SLOT(slotNewListItem()) );
m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"),
- TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) );
- m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()) );
+ this, TQT_SLOT(slotDelete()) );
+ m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQT_SLOT(slotProperties()) );
listVBoxLayout->addWidget(buttonBox);
mainLayout->addWidget(m_pItemListGB);
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index 76b224c0..cedee6b6 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -138,9 +138,9 @@ void UMLOperationDialog::setupDialog() {
buttonLayout->addWidget( m_pDownButton );
KButtonBox* buttonBox = new KButtonBox(m_pParmsGB);
- buttonBox->addButton( i18n("Ne&w Parameter..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewParameter()) );
- m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteParameter()) );
- m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this),
+ buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQT_SLOT(slotNewParameter()) );
+ m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQT_SLOT(slotDeleteParameter()) );
+ m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this,
TQT_SLOT(slotParameterProperties()) );
parmsLayout->addWidget(buttonBox);
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index a4feb485..961a66d5 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -160,43 +160,43 @@ UMLApp* UMLApp::app()
}
void UMLApp::initActions() {
- fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection());
- fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
- fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
- fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
- fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
- fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
- filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
- fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
- editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection());
- editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotEditRedo()), actionCollection());
- editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
- editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
- editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
+ fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
+ fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
+ fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
+ fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
+ fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
+ fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection());
+ filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
+ fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+ editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection());
+ editRedo = KStdAction::redo(this, TQT_SLOT(slotEditRedo()), actionCollection());
+ editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection());
+ editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
+ editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection());
+ selectAll = KStdAction::selectAll(this, TQT_SLOT( slotSelectAll() ), actionCollection());
fileExportDocbook = new TDEAction(i18n("&Export model to DocBook"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotFileExportDocbook() ),
+ this, TQT_SLOT( slotFileExportDocbook() ),
actionCollection(), "file_export_docbook");
fileExportXhtml = new TDEAction(i18n("&Export model to XHTML"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotFileExportXhtml() ),
+ this, TQT_SLOT( slotFileExportXhtml() ),
actionCollection(), "file_export_xhtml");
- classWizard = new TDEAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()),
+ classWizard = new TDEAction(i18n("&New Class Wizard..."),0,this,TQT_SLOT(slotClassWizard()),
actionCollection(),"class_wizard");
- new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, this,
TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes");
- preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection());
+ preferences = KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection());
- genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()),
+ genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,this,TQT_SLOT(generationWizard()),
actionCollection(),"generation_wizard");
- genAll = new TDEAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()),
+ genAll = new TDEAction(i18n("&Generate All Code"),0,this,TQT_SLOT(generateAllCode()),
actionCollection(),"generate_all");
importClasses = new TDEAction(i18n("&Import Classes..."), SmallIconSet("text-x-c++src"), 0,
- TQT_TQOBJECT(this),TQT_SLOT(slotImportClasses()), actionCollection(),"import_class");
+ this,TQT_SLOT(slotImportClasses()), actionCollection(),"import_class");
fileNew->setToolTip(i18n("Creates a new document"));
fileOpen->setToolTip(i18n("Opens an existing document"));
@@ -215,63 +215,63 @@ void UMLApp::initActions() {
deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"),
SmallIconSet("edit-delete"),
- TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
+ TDEShortcut(TQt::Key_Delete), this,
TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(),
"delete_selected" );
// The different views
newDiagram = new TDEActionMenu(0, SmallIconSet("document-new"), actionCollection(), "new_view");
classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
+ this, TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
#if defined (HAVE_DOT)
- autolayout = new TDEAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
+ autolayout = new TDEAction(i18n("&Autolayout..."),0,0,this,TQT_SLOT(slotAutolayout()),
actionCollection(),"autolayout");
#endif
sequenceDiagram= new TDEAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
+ this, TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
collaborationDiagram = new TDEAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" );
+ this, TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" );
useCaseDiagram= new TDEAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" );
+ this, TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" );
stateDiagram= new TDEAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" );
+ this, TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" );
activityDiagram= new TDEAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" );
+ this, TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" );
componentDiagram = new TDEAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotComponentDiagram() ), actionCollection(),
+ this, TQT_SLOT( slotComponentDiagram() ), actionCollection(),
"new_component_diagram" );
deploymentDiagram = new TDEAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotDeploymentDiagram() ), actionCollection(),
+ this, TQT_SLOT( slotDeploymentDiagram() ), actionCollection(),
"new_deployment_diagram" );
entityRelationshipDiagram = new TDEAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
+ this, TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
"new_entityrelationship_diagram" );
viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("edit-clear"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
+ this, TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
+ this, TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid");
+ this, TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid");
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
viewShowGrid->setCheckedState(i18n("&Hide Grid"));
#endif
deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
+ this, TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image-x-generic"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");
+ this, TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");
viewExportImageAll = new TDEAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image-x-generic"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all");
+ this, TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all");
viewProperties = new TDEAction(i18n("&Properties"), SmallIconSet("application-vnd.tde.info"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties");
+ this, TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties");
viewSnapToGrid->setChecked(false);
viewShowGrid->setChecked(false);
@@ -284,35 +284,35 @@ void UMLApp::initActions() {
viewProperties->setEnabled(false);
zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9,
- TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)),
+ this, TQT_SLOT(slotZoomSliderMoved(int)),
actionCollection(), "popup_zoom");
zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "zoom-original", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(),
+ this, TQT_SLOT( slotZoom100() ), actionCollection(),
"zoom100");
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() );
+ KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() );
TQString moveTabLeftString = i18n("&Move Tab Left");
TQString moveTabRightString = i18n("&Move Tab Right");
moveTabLeft = new TDEAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString,
TQApplication::reverseLayout() ? "forward" : "back",
TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left,
- TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabLeft()), actionCollection(),
+ this, TQT_SLOT(slotMoveTabLeft()), actionCollection(),
"move_tab_left");
moveTabRight = new TDEAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString,
TQApplication::reverseLayout() ? "back" : "forward",
TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right,
- TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabRight()), actionCollection(),
+ this, TQT_SLOT(slotMoveTabRight()), actionCollection(),
"move_tab_right");
TQString selectTabLeftString = i18n("Select Diagram on Left");
TQString selectTabRightString = i18n("Select Diagram on Right");
changeTabLeft = new TDEAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString,
TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
- TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab");
+ this, TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab");
changeTabRight = new TDEAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString,
TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right,
- TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab");
+ this, TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab");
initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI()
diff --git a/umbrello/umbrello/umlviewcanvas.cpp b/umbrello/umbrello/umlviewcanvas.cpp
index a505b0bd..e75d711b 100644
--- a/umbrello/umbrello/umlviewcanvas.cpp
+++ b/umbrello/umbrello/umlviewcanvas.cpp
@@ -19,7 +19,7 @@
#include "umlview.h"
-UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( TQT_TQOBJECT(pView) ) {
+UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( pView ) {
m_pView = pView;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 23:52:53 +0000