Rename a number of classes to enhance compatibility with KDE4

1 files changed, 35 insertions, 35 deletions

diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index a498b3c6..23b87597 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -176,26 +176,26 @@ void UMLApp::initActions() {
     createStandardStatusBarAction();
     setStandardToolBarMenuEnabled(true);
     selectAll = KStdAction::selectAll(TQT_TQOBJECT(this),  TQT_SLOT( slotSelectAll() ), actionCollection());
-    fileExportDocbook = new KAction(i18n("&Export model to DocBook"), 0,
+    fileExportDocbook = new TDEAction(i18n("&Export model to DocBook"), 0,
                                     TQT_TQOBJECT(this), TQT_SLOT( slotFileExportDocbook() ),
                                     actionCollection(), "file_export_docbook");
-    fileExportXhtml = new KAction(i18n("&Export model to XHTML"), 0,
+    fileExportXhtml = new TDEAction(i18n("&Export model to XHTML"), 0,
                                     TQT_TQOBJECT(this), TQT_SLOT( slotFileExportXhtml() ),
                                     actionCollection(), "file_export_xhtml");
 
-    classWizard = new KAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()),
+    classWizard = new TDEAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()),
                               actionCollection(),"class_wizard");
-    new KAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this),
                 TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes");
 
     preferences = KStdAction::preferences(TQT_TQOBJECT(this),  TQT_SLOT( slotPrefs() ), actionCollection());
 
-    genWizard = new KAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()),
+    genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()),
                             actionCollection(),"generation_wizard");
-    genAll = new KAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()),
+    genAll = new TDEAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()),
                          actionCollection(),"generate_all");
 
-    importClasses = new KAction(i18n("&Import Classes..."), SmallIconSet("source_cpp"), 0,
+    importClasses = new TDEAction(i18n("&Import Classes..."), SmallIconSet("source_cpp"), 0,
                                 TQT_TQOBJECT(this),TQT_SLOT(slotImportClasses()), actionCollection(),"import_class");
 
     fileNew->setToolTip(i18n("Creates a new document"));
@@ -213,64 +213,64 @@ void UMLApp::initActions() {
     editPaste->setToolTip(i18n("Pastes the contents of the clipboard"));
     preferences->setToolTip( i18n( "Set the default program preferences") );
 
-    deleteSelectedWidget = new KAction( i18n("Delete &Selected"),
+    deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"),
                                         SmallIconSet("editdelete"),
-                                        KShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
+                                        TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
                                         TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(),
                                         "delete_selected" );
 
     // The different views
-    newDiagram = new KActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view");
-    classDiagram = new KAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
+    newDiagram = new TDEActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view");
+    classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
 
 #if defined (HAVE_DOT)
-    autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
+    autolayout = new TDEAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
                              actionCollection(),"autolayout");
 #endif
-    sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
+    sequenceDiagram= new TDEAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
                                   TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
 
-    collaborationDiagram = new KAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0,
+    collaborationDiagram = new TDEAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0,
                                         TQT_TQOBJECT(this), TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" );
 
-    useCaseDiagram= new KAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0,
+    useCaseDiagram= new TDEAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0,
                                  TQT_TQOBJECT(this), TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" );
 
-    stateDiagram= new KAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0,
+    stateDiagram= new TDEAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0,
                                TQT_TQOBJECT(this), TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" );
 
-    activityDiagram= new KAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0,
+    activityDiagram= new TDEAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0,
                                   TQT_TQOBJECT(this), TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" );
 
-    componentDiagram = new KAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0,
+    componentDiagram = new TDEAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0,
                                     TQT_TQOBJECT(this), TQT_SLOT( slotComponentDiagram() ), actionCollection(),
                                     "new_component_diagram" );
 
-    deploymentDiagram = new KAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0,
+    deploymentDiagram = new TDEAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotDeploymentDiagram() ), actionCollection(),
                                      "new_deployment_diagram" );
 
-    entityRelationshipDiagram = new KAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0,
+    entityRelationshipDiagram = new TDEAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
                                 "new_entityrelationship_diagram" );
 
-    viewClearDiagram = new KAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0,
+    viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0,
                                    TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
-    viewSnapToGrid = new KToggleAction(i18n("&Snap to Grid"), 0,
+    viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0,
                                        TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
-    viewShowGrid = new KToggleAction(i18n("S&how Grid"), 0,
+    viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0,
                                      TQT_TQOBJECT(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 KAction(i18n("&Delete"), SmallIconSet("editdelete"), 0,
+    deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("editdelete"), 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
-    viewExportImage = new KAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0,
+    viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0,
                                   TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");
-    viewExportImageAll = new KAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image"), 0,
+    viewExportImageAll = new TDEAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all");
-    viewProperties = new KAction(i18n("&Properties"), SmallIconSet("info"), 0,
+    viewProperties = new TDEAction(i18n("&Properties"), SmallIconSet("info"), 0,
                                  TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties");
 
     viewSnapToGrid->setChecked(false);
@@ -286,7 +286,7 @@ void UMLApp::initActions() {
     zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9,
                  TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)),
                  actionCollection(), "popup_zoom");
-    zoom100Action = new KAction(i18n( "Z&oom to 100%" ), "viewmag1", 0,
+    zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "viewmag1", 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(),
                                 "zoom100");
 
@@ -294,12 +294,12 @@ void UMLApp::initActions() {
 
     TQString moveTabLeftString = i18n("&Move Tab Left");
     TQString moveTabRightString = i18n("&Move Tab Right");
-    moveTabLeft = new KAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString,
+    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(),
                               "move_tab_left");
-    moveTabRight = new KAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString,
+    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(),
@@ -307,10 +307,10 @@ void UMLApp::initActions() {
 
     TQString selectTabLeftString = i18n("Select Diagram on Left");
     TQString selectTabRightString = i18n("Select Diagram on Right");
-    changeTabLeft = new KAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString,
+    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");
-    changeTabRight = new KAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString,
+    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");
 
@@ -411,11 +411,11 @@ void UMLApp::initView() {
         m_tabWidget->setAutomaticResizeTabs( true );
 #endif
 
-        m_newSessionButton = new KToolBarButton("tab_new", 0, m_tabWidget);
+        m_newSessionButton = new TDEToolBarButton("tab_new", 0, m_tabWidget);
         m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) );
         m_newSessionButton->adjustSize();
         m_newSessionButton->setAutoRaise(true);
-        m_diagramMenu = new KPopupMenu(m_newSessionButton);
+        m_diagramMenu = new TDEPopupMenu(m_newSessionButton);
 
         m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Class), i18n("Class Diagram..."), this, TQT_SLOT(slotClassDiagram()) );
         m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Sequence), i18n("Sequence Diagram..."), this, TQT_SLOT(slotSequenceDiagram()) );
@@ -430,7 +430,7 @@ void UMLApp::initView() {
         //FIXME why doesn't this work?
         //m_newSessionButton->setPopup(newDiagram->popupMenu());
 
-        //m_closeDiagramButton = new KToolBarButton("tab_remove", 0, m_tabWidget);
+        //m_closeDiagramButton = new TDEToolBarButton("tab_remove", 0, m_tabWidget);
         m_closeDiagramButton = new TQToolButton(m_tabWidget);
         m_closeDiagramButton->setIconSet( SmallIcon("tab_remove") );
         m_closeDiagramButton->adjustSize();