diff options
Diffstat (limited to 'umbrello')
32 files changed, 232 insertions, 232 deletions
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index cf2a15cc..21748d48 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -32,7 +32,7 @@ #include "umlwidgetlist.h" AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) - : KToolBar(parentWindow,TQt::DockRight,false) { + : TDEToolBar(parentWindow,TQt::DockRight,false) { // load images for the buttons loadPixmaps(); diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h index 0567bee4..581a023c 100644 --- a/umbrello/umbrello/aligntoolbar.h +++ b/umbrello/umbrello/aligntoolbar.h @@ -28,7 +28,7 @@ class UMLWidget; * @author Sebastian Stein <seb.kde@hpfsc.de> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class AlignToolBar : public KToolBar { +class AlignToolBar : public TDEToolBar { Q_OBJECT public: diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 81a1bb57..e0c6a982 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -2378,13 +2378,13 @@ void AssociationWidget::slotMenuSelection(int sel) { case ListPopupMenu::mt_Change_Font: font = getFont(); - if( KFontDialog::getFont( font, false, m_pView ) ) + if( TDEFontDialog::getFont( font, false, m_pView ) ) lwSetFont(font); break; case ListPopupMenu::mt_Change_Font_Selection: font = getFont(); - if( KFontDialog::getFont( font, false, m_pView ) ) { + if( TDEFontDialog::getFont( font, false, m_pView ) ) { m_pView -> selectionSetFont( font ); m_umldoc->setModified(true); } diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp index ed7f779e..c128e027 100644 --- a/umbrello/umbrello/dialogs/activitydialog.cpp +++ b/umbrello/umbrello/dialogs/activitydialog.cpp @@ -106,7 +106,7 @@ void ActivityDialog::setupGeneralPage() { void ActivityDialog::setupFontPage() { TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pActivityWidget -> getFont() ); } diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h index 99af61e0..27b49b40 100644 --- a/umbrello/umbrello/dialogs/activitydialog.h +++ b/umbrello/umbrello/dialogs/activitydialog.h @@ -102,7 +102,7 @@ protected: /** * Font chooser widget for font page. */ - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; /** * Color page diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp index 1d5b9c77..331e3e45 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.cpp +++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp @@ -107,7 +107,7 @@ void AssocPropDlg::setupFontPage() return; TQVBox *page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser->setFont( m_pAssoc->getFont()); m_pChooser->setSampleText(i18n("Association font")); } diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h index 1970e59b..7f20c427 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.h +++ b/umbrello/umbrello/dialogs/assocpropdlg.h @@ -62,7 +62,7 @@ protected slots: private: AssocGenPage *m_pGenPage; AssocRolePage *m_pRolePage; - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; AssociationWidget *m_pAssoc; UMLDoc *m_pDoc; // is this needed?? diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp index 169de20e..ccd09bba 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.cpp +++ b/umbrello/umbrello/dialogs/classpropdlg.cpp @@ -241,7 +241,7 @@ void ClassPropDlg::setupFontPage() { if( !m_pWidget ) return; TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pWidget -> getFont() ); } diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h index e8bcb2c6..d11e0d25 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.h +++ b/umbrello/umbrello/dialogs/classpropdlg.h @@ -104,7 +104,7 @@ protected: */ void setupFontPage(); private: - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; ClassGenPage * m_pGenPage; ClassifierListPage* m_pAttPage; ClassifierListPage* m_pOpsPage; diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index 346dc44d..4de2f313 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KFontChooser" row="0" column="0"> + <widget class="TDEFontChooser" row="0" column="0"> <property name="name"> <cstring>fontChooser</cstring> </property> @@ -341,7 +341,7 @@ </widget> <customwidgets> <customwidget> - <class>KFontChooser</class> + <class>TDEFontChooser</class> <header location="global">kfontdialog.h</header> <sizehint> <width>-1</width> diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 145b0519..234f67bc 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -304,7 +304,7 @@ void SettingsDlg::setupCodeViewerPage(Settings::CodeViewerState options) { void SettingsDlg::setupFontPage() { TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_FontWidgets.chooser = new KFontChooser( page, "font", false, TQStringList(), false); + m_FontWidgets.chooser = new TDEFontChooser( page, "font", false, TQStringList(), false); m_FontWidgets.chooser->setFont( m_pOptionState->uiState.font ); } diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h index 78f8b064..98fb4549 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.h +++ b/umbrello/umbrello/dialogs/settingsdlg.h @@ -142,7 +142,7 @@ private: ;//end struct ClassWidgets struct FontWidgets { - KFontChooser * chooser; + TDEFontChooser * chooser; }; //private methods diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp index 564146ec..e49d1633 100644 --- a/umbrello/umbrello/dialogs/statedialog.cpp +++ b/umbrello/umbrello/dialogs/statedialog.cpp @@ -122,7 +122,7 @@ void StateDialog::setupFontPage() { if ( !m_pStateWidget ) return; TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pStateWidget -> getFont() ); } diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h index 873ad067..86f4eb62 100644 --- a/umbrello/umbrello/dialogs/statedialog.h +++ b/umbrello/umbrello/dialogs/statedialog.h @@ -26,7 +26,7 @@ class TQLabel; class TQLineEdit; class TQMultiLineEdit; class TQGroupBox; -class KFontChooser; +class TDEFontChooser; /** * Displays the properties for a @ref StateWidget @@ -107,7 +107,7 @@ protected: /** * Font chooser widget for font page. */ - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; /** * Color page diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 33a6a21f..804100c4 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -105,7 +105,7 @@ void UMLViewDialog::setupColorPage() { void UMLViewDialog::setupFontPage() { TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pView -> getOptionState().uiState.font ); } diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h index 8effb99c..5d466d50 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.h +++ b/umbrello/umbrello/dialogs/umlviewdialog.h @@ -31,7 +31,7 @@ class TQLineEdit; class TQGroupBox; class TQTextEdit; class TQSpinBox; -class KFontChooser; +class TDEFontChooser; class DiagramPropertiesPage; @@ -99,7 +99,7 @@ protected: Settings::OptionState m_options; - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; DiagramPropertiesPage *m_diagramProperties; ClassOptionsPage * m_pOptionsPage; UMLWidgetColorPage * m_pColorPage; diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp index 94c5ec21..f9e25f3d 100644 --- a/umbrello/umbrello/floatingtextwidget.cpp +++ b/umbrello/umbrello/floatingtextwidget.cpp @@ -134,7 +134,7 @@ void FloatingTextWidget::slotMenuSelection(int sel) { case ListPopupMenu::mt_Change_Font: { TQFont font = getFont(); - if( KFontDialog::getFont( font, false, m_pView ) ) { + if( TDEFontDialog::getFont( font, false, m_pView ) ) { if( m_Role == Uml::tr_Floating || m_Role == Uml::tr_Seq_Message ) { setFont( font ); } else if (m_pLink) { diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 95007d73..791c8ad8 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -66,9 +66,9 @@ void KPlayerPopupFrame::mouseReleaseEvent (TQMouseEvent* ev) }*/ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, - const TQString& pix, const KShortcut& shortcut, const TQObject* receiver, + const TQString& pix, const TDEShortcut& shortcut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name) - : KAction (text, pix, shortcut, parent, name) + : TDEAction (text, pix, shortcut, parent, name) { m_frame = new KPlayerPopupFrame; m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised); @@ -93,10 +93,10 @@ KPlayerPopupSliderAction::~KPlayerPopupSliderAction() Q_ASSERT (! isPlugged()); if ( ! m_slider || ! widget || isPlugged() ) return -1; - Q_ASSERT (widget -> inherits ("KToolBar")); - if ( ! widget -> inherits ("KToolBar") ) + Q_ASSERT (widget -> inherits ("TDEToolBar")); + if ( ! widget -> inherits ("TDEToolBar") ) return -1; - int retval = KAction::plug (widget, index); + int retval = TDEAction::plug (widget, index); // if ( retval >= 0 ) // m_slider -> reparent (widget, TQPoint()); return retval; @@ -107,25 +107,25 @@ void KPlayerPopupSliderAction::unplug (TQWidget* widget) Q_ASSERT (m_slider); Q_ASSERT (widget); Q_ASSERT (isPlugged()); - Q_ASSERT (widget -> inherits ("KToolBar")); - if ( ! m_slider || ! widget || ! isPlugged() || ! widget -> inherits ("KToolBar") ) + Q_ASSERT (widget -> inherits ("TDEToolBar")); + if ( ! m_slider || ! widget || ! isPlugged() || ! widget -> inherits ("TDEToolBar") ) return; //m_slider -> reparent (0, TQPoint()); - KAction::unplug (widget); + TDEAction::unplug (widget); }*/ void KPlayerPopupSliderAction::slotActivated (void) { - KAction::slotActivated(); + TDEAction::slotActivated(); TQWidget* button = 0; if ( sender() ) { //CHANGED kdDebug() << "Sender class name: " << sender() -> className() << "\n"; - if ( sender() -> inherits ("KToolBarButton") ) + if ( sender() -> inherits ("TDEToolBarButton") ) button = (TQWidget*) sender(); - else if ( sender() -> inherits ("KToolBar") ) + else if ( sender() -> inherits ("TDEToolBar") ) { - KToolBar* toolbar = (KToolBar*) sender(); + TDEToolBar* toolbar = (TDEToolBar*) sender(); int index = findContainer (toolbar); if ( index >= 0 ) button = toolbar -> getButton (itemId (index)); @@ -157,10 +157,10 @@ void KPlayerPopupSliderAction::slotActivated (void) m_slider -> setFocus(); } -KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name) +KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcut& cut, + const TQObject* receiver, const char* slot, TDEActionCollection* parent, const char* name) : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name) - //: KAction (text, 0, parent, name) + //: TDEAction (text, 0, parent, name) { setAutoSized (true); connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot); @@ -177,15 +177,15 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //Q_ASSERT (slider()); //if ( ! slider() || ! widget || isPlugged() ) // return -1; - //Q_ASSERT (widget -> inherits ("KToolBar")); - //if ( ! widget -> inherits ("KToolBar") ) + //Q_ASSERT (widget -> inherits ("TDEToolBar")); + //if ( ! widget -> inherits ("TDEToolBar") ) // return -1; - //if ( kapp && ! kapp -> authorizeKAction (name()) ) + //if ( kapp && ! kapp -> authorizeTDEAction (name()) ) // return -1; int result = KWidgetAction::plug (widget, index); if ( result < 0 ) return result; - KToolBar* toolbar = (KToolBar*) widget; + TDEToolBar* toolbar = (TDEToolBar*) widget; //int id = getToolButtonID(); //kdDebug() << "Qt::Orientation: " << toolbar -> orientation() << "\n"; //m_slider -> reparent (toolbar, TQPoint()); @@ -211,11 +211,11 @@ void KPlayerSliderAction::unplug (TQWidget* widget) { //Q_ASSERT (m_slider); //Q_ASSERT (isPlugged()); - //Q_ASSERT (widget -> inherits ("KToolBar")); + //Q_ASSERT (widget -> inherits ("TDEToolBar")); KWidgetAction::unplug (widget); if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> parent()) ) return; - //KToolBar* toolbar = (KToolBar*) widget; + //TDEToolBar* toolbar = (TDEToolBar*) widget; disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); //disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); //m_slider -> reparent (0, TQPoint()); @@ -226,7 +226,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) removeContainer (index);*/ } -/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, KToolBar* toolbar) +/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, TDEToolBar* toolbar) { if ( orientation == Qt::Horizontal ) { @@ -250,8 +250,8 @@ void KPlayerSliderAction::unplug (TQWidget* widget) void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation) { - //if ( sender() && sender() -> inherits ("KToolBar") ) - // setupToolbar (orientation, (KToolBar*) sender()); + //if ( sender() && sender() -> inherits ("TDEToolBar") ) + // setupToolbar (orientation, (TDEToolBar*) sender()); //Q_ASSERT (m_slider); //Q_ASSERT (isPlugged()); if ( slider() ) diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h index 5965a8dd..665cc621 100644 --- a/umbrello/umbrello/kplayerslideraction.h +++ b/umbrello/umbrello/kplayerslideraction.h @@ -125,15 +125,15 @@ protected: /**Action representing a popup slider activated by a toolbar button. *@author kiriuja */ -class KPlayerPopupSliderAction : public KAction +class KPlayerPopupSliderAction : public TDEAction { Q_OBJECT public: - /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction. + /** The KPlayerPopupSliderAction constructor. Parameters are passed on to TDEAction. */ - KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut, + KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const TDEShortcut& shortcut, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0); /** The KPlayerPopupSliderAction destructor. Deletes the KPlayerPopupFrame. */ @@ -172,10 +172,10 @@ class KPlayerSliderAction : public KWidgetAction public: - /** The KPlayerSliderAction constructor. Parameters are passed on to KAction. + /** The KPlayerSliderAction constructor. Parameters are passed on to TDEAction. */ - KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver, - const char* slot, KActionCollection* parent = 0, const char* name = 0); + KPlayerSliderAction (const TQString& text, const TDEShortcut&, const TQObject* receiver, + const char* slot, TDEActionCollection* parent = 0, const char* name = 0); /** The KPlayerSliderAction destructor. Does nothing. */ virtual ~KPlayerSliderAction(); diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp index 96679522..6e8f3d9a 100644 --- a/umbrello/umbrello/listpopupmenu.cpp +++ b/umbrello/umbrello/listpopupmenu.cpp @@ -38,14 +38,14 @@ //ListPopupMenu for a UMLView (diagram) ListPopupMenu::ListPopupMenu(TQWidget *parent, Menu_Type type, UMLView * view) - : KPopupMenu(parent) { + : TDEPopupMenu(parent) { init(); setupMenu(type, view); } //ListPopupMenu for the tree list view ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type) - : KPopupMenu(parent) { + : TDEPopupMenu(parent) { init(); Menu_Type mt = mt_Undefined; switch(type) @@ -207,7 +207,7 @@ ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type) //ListPopupMenu for a canvas widget ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, bool multi, bool unique) - : KPopupMenu(parent) + : TDEPopupMenu(parent) { init(); //make the right menu for the type @@ -277,7 +277,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, break; case Uml::wt_Enum: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(SmallIcon("source"), i18n("Enum Literal..."), mt_EnumLiteral); insertFileNew(); setupColor(object->getUseFillColour()); @@ -288,7 +288,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, break; case Uml::wt_Entity: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(SmallIcon("source"), i18n("Entity Attribute..."), mt_EntityAttribute); insertFileNew(); setupColor(object->getUseFillColour()); @@ -356,7 +356,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, case Uml::wt_State: pState = static_cast< StateWidget *>( object ); if( pState -> getStateType() == StateWidget::Normal ) { - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert -> insertItem(SmallIcon( "filenew"), i18n("Activity..."), mt_New_Activity); insertFileNew(); } @@ -663,7 +663,7 @@ void ListPopupMenu::makeMultiClassifierPopup(ClassifierWidget *c) Uml::Widget_Type type = c->getBaseType(); ClassifierWidget *cls = NULL; - m_pShow = new KPopupMenu(this); + m_pShow = new TDEPopupMenu(this); m_pShow->setCheckable(true); if (type == Uml::wt_Class) { cls = static_cast<ClassifierWidget*>(c); @@ -702,7 +702,7 @@ void ListPopupMenu::makeMultiClassifierPopup(ClassifierWidget *c) void ListPopupMenu::makeClassifierPopup(ClassifierWidget *c) { Uml::Widget_Type type = c->getBaseType(); - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); if (type == Uml::wt_Class) m_pInsert->insertItem(SmallIcon( "CVpublic_var" ), i18n("Attribute..."), mt_Attribute); m_pInsert->insertItem( SmallIcon( "CVpublic_meth"), i18n("Operation..."), mt_Operation); @@ -730,7 +730,7 @@ void ListPopupMenu::makeClassifierPopup(ClassifierWidget *c) void ListPopupMenu::setupColor(bool fc) { - m_pColor = new KPopupMenu(this); + m_pColor = new TDEPopupMenu(this); m_pColor -> insertItem(SmallIcon( "color_line"), i18n("Line Color..."), mt_Line_Color); m_pColor -> insertItem(SmallIcon( "color_fill"), i18n("Fill Color..."), mt_Fill_Color); m_pColor -> insertItem( i18n("Use Fill Color"), mt_Use_Fill_Color); @@ -741,7 +741,7 @@ void ListPopupMenu::setupColor(bool fc) void ListPopupMenu::setupColorSelection(bool fc) { - m_pColor = new KPopupMenu(this); + m_pColor = new TDEPopupMenu(this); m_pColor -> insertItem(SmallIcon( "color_line"), i18n("Line Color..."), mt_Line_Color_Selection); m_pColor -> insertItem(SmallIcon( "color_fill"), i18n("Fill Color..."), mt_Fill_Color_Selection); m_pColor -> insertItem( i18n("Use Fill Color"), mt_Use_Fill_Color); @@ -849,7 +849,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { switch(type) { case mt_Logical_View: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertContainerItems(true); insertSeparator(); insertStdItem(mt_Paste); @@ -861,7 +861,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Component_View: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_Component_Folder); insertStdItem(mt_Subsystem); insertStdItem(mt_Component); @@ -876,7 +876,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Deployment_View: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_Deployment_Folder); insertStdItem(mt_Node); insertStdItem(mt_Deployment_Diagram); @@ -889,7 +889,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_EntityRelationship_Model: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_EntityRelationship_Folder); insertStdItem(mt_Entity); insertStdItem(mt_EntityRelationship_Diagram); @@ -902,7 +902,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_UseCase_View: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_UseCase_Folder); insertStdItem(mt_Actor); insertStdItem(mt_UseCase); @@ -918,7 +918,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Logical_Folder: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertContainerItems(true); insertStdItems(); insertStdItem(mt_Import_Classes); @@ -929,7 +929,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Component_Folder: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_Component_Folder); insertStdItem(mt_Subsystem); insertStdItem(mt_Component); @@ -944,7 +944,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Deployment_Folder: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_Deployment_Folder); insertStdItem(mt_Node); insertStdItem(mt_Deployment_Diagram); @@ -957,7 +957,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_UseCase_Folder: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_UseCase_Folder); insertStdItem(mt_Actor); insertStdItem(mt_UseCase); @@ -971,7 +971,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_EntityRelationship_Folder: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_EntityRelationship_Folder); insertStdItem(mt_Entity); insertStdItem(mt_EntityRelationship_Diagram); @@ -1003,7 +1003,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { //FIXME a lot of these insertItem()s could be insertStandardItem()s case mt_On_UseCase_Diagram: - m_pInsert = new KPopupMenu( this ); + m_pInsert = new TDEPopupMenu( this ); m_pInsert -> insertItem(m_pixmap[pm_Actor], i18n( "Actor..." ), mt_Actor ); m_pInsert -> insertItem(m_pixmap[pm_Usecase], i18n( "Use Case..."), mt_UseCase ); insertStdItem(mt_FloatText ); @@ -1013,7 +1013,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_On_Class_Diagram: - m_pInsert = new KPopupMenu( this ); + m_pInsert = new TDEPopupMenu( this ); m_pInsert -> insertItem(m_pixmap[pm_Class], i18n("Class..."), mt_Class); m_pInsert->insertItem(m_pixmap[pm_Interface], i18n("Interface..."), mt_Interface); m_pInsert->insertItem(m_pixmap[pm_Datatype], i18n("Datatype..."), mt_Datatype); @@ -1026,7 +1026,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_On_State_Diagram: - m_pInsert = new KPopupMenu( this ); + m_pInsert = new TDEPopupMenu( this ); m_pInsert -> insertItem(m_pixmap[pm_InitialState], i18n("Initial State"), mt_Initial_State ); m_pInsert -> insertItem(m_pixmap[pm_EndState], i18n("End State"), mt_End_State ); m_pInsert -> insertItem(m_pixmap[pm_Usecase], i18n("State..."), mt_State ); @@ -1037,7 +1037,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_On_Activity_Diagram: - m_pInsert = new KPopupMenu( this ); + m_pInsert = new TDEPopupMenu( this ); m_pInsert -> insertItem(m_pixmap[pm_InitialState], i18n("Initial Activity"), mt_Initial_Activity ); m_pInsert -> insertItem(m_pixmap[pm_EndState], i18n("End Activity"), mt_End_Activity ); m_pInsert -> insertItem(m_pixmap[pm_Usecase], i18n("Activity..."), mt_Activity ); @@ -1049,7 +1049,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_On_Component_Diagram: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(m_pixmap[pm_Subsystem], i18n("Subsystem..."), mt_Subsystem); m_pInsert->insertItem(m_pixmap[pm_Component], i18n("Component..."), mt_Component); m_pInsert->insertItem(m_pixmap[pm_Artifact], i18n("Artifact..."), mt_Artifact); @@ -1059,7 +1059,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_On_Deployment_Diagram: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(m_pixmap[pm_Node], i18n("Node..."), mt_Node); insertFileNew(); insertSeparator(); @@ -1067,7 +1067,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_On_EntityRelationship_Diagram: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(m_pixmap[pm_Entity], i18n("Entity..."), mt_Entity); insertFileNew(); insertSeparator(); @@ -1076,7 +1076,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { case mt_On_Sequence_Diagram: case mt_On_Collaboration_Diagram: - m_pInsert = new KPopupMenu( this ); + m_pInsert = new TDEPopupMenu( this ); m_pInsert -> insertItem(m_pixmap[pm_Object], i18n("Object..."), mt_Object); insertStdItem(mt_FloatText); insertFileNew(); @@ -1085,7 +1085,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Class: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert -> insertItem(SmallIcon( "CVpublic_var"), i18n("Attribute"), mt_Attribute); m_pInsert -> insertItem(SmallIcon( "CVpublic_meth"), i18n("Operation"), mt_Operation); m_pInsert -> insertItem(SmallIcon("source"), i18n("Template"), mt_Template); @@ -1095,7 +1095,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Interface: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(SmallIcon("CVpublic_meth"), i18n("Operation"), mt_Operation); m_pInsert -> insertItem(SmallIcon("source"), i18n("Template"), mt_Template); insertFileNew(); @@ -1104,7 +1104,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Package: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertContainerItems(false); insertStdItems(); insertStdItem(mt_Properties); @@ -1114,7 +1114,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Subsystem: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_Subsystem); insertStdItem(mt_Component); insertStdItem(mt_Artifact); @@ -1127,7 +1127,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Component: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_Component); insertStdItem(mt_Artifact); insertFileNew(); @@ -1139,7 +1139,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Entity: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(SmallIcon("source"), i18n("Entity Attribute..."), mt_EntityAttribute); insertFileNew(); insertStdItems(); @@ -1151,7 +1151,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_Enum: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); m_pInsert->insertItem(SmallIcon("source"), i18n("Enum Literal..."), mt_EnumLiteral); insertFileNew(); insertStdItems(); @@ -1196,13 +1196,13 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { break; case mt_New_Activity: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_New_Activity); insertFileNew(); break; case mt_Activity_Selected: - m_pInsert = new KPopupMenu(this); + m_pInsert = new TDEPopupMenu(this); insertStdItem(mt_New_Activity); insertFileNew(); insertStdItem(mt_Rename); diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h index e7030090..1b61ab08 100644 --- a/umbrello/umbrello/listpopupmenu.h +++ b/umbrello/umbrello/listpopupmenu.h @@ -28,7 +28,7 @@ class ClassifierWidget; * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class ListPopupMenu : public KPopupMenu { +class ListPopupMenu : public TDEPopupMenu { public: /// This type hosts all possible menu types. @@ -321,7 +321,7 @@ private: pm_NUMBER_OF_PIXMAPS }; TQPixmap m_pixmap[pm_NUMBER_OF_PIXMAPS]; - KPopupMenu * m_pInsert, * m_pShow, * m_pColor; + TDEPopupMenu * m_pInsert, * m_pShow, * m_pColor; void setupColor(bool fc); void setupColorSelection(bool fc); void setupDiagramMenu(UMLView* view); diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index 1616751b..3c9f3043 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -36,7 +36,7 @@ using std::type_info; RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *parent, const char *name ): - KListView( parent, name ), m_doc( doc ) + TDEListView( parent, name ), m_doc( doc ) { loadPixmaps(); @@ -57,8 +57,8 @@ RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQW m_menu = new TQPopupMenu(this); connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(itemExecuted(TQListViewItem*))); - connect(this,TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this,TQT_SLOT(showContextMenu(KListView*,TQListViewItem*,const TQPoint&))); + connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this,TQT_SLOT(showContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); resize(300,400); @@ -175,7 +175,7 @@ void RefactoringAssistant::operationAdded( UMLClassifierListItem *o ) { if( folder->text(1) == "operations" ) { - item = new KListViewItem( folder, op->getName() ); + item = new TDEListViewItem( folder, op->getName() ); m_umlObjectMap[item] = op; connect( op, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); setVisibilityIcon( item, op ); @@ -217,7 +217,7 @@ void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a ) { if( folder->text(1) == "attributes" ) { - item = new KListViewItem( folder, att->getName() ); + item = new TDEListViewItem( folder, att->getName() ); m_umlObjectMap[item] = att; connect( att, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); setVisibilityIcon( item, att ); @@ -277,7 +277,7 @@ void RefactoringAssistant::editProperties( UMLObject *obj ) delete dia; } -void RefactoringAssistant::showContextMenu(KListView* ,TQListViewItem *item, const TQPoint &p) +void RefactoringAssistant::showContextMenu(TDEListView* ,TQListViewItem *item, const TQPoint &p) { m_menu->clear(); UMLObject *obj = findUMLObject( item ); @@ -359,7 +359,7 @@ void RefactoringAssistant::addBaseClassifier() kWarning()<<"Cannot find Base Folder"<<endl; return; } - item = new KListViewItem( baseFolder, super->getName() ); + item = new TDEListViewItem( baseFolder, super->getName() ); item->setPixmap(0,m_pixmaps.Generalization); item->setExpandable( true ); m_umlObjectMap[item] = super; @@ -401,7 +401,7 @@ void RefactoringAssistant::addDerivedClassifier() kWarning()<<"Cannot find Derived Folder"<<endl; return; } - item = new KListViewItem( derivedFolder, derived->getName() ); + item = new TDEListViewItem( derivedFolder, derived->getName() ); item->setPixmap(0,m_pixmaps.Subclass); item->setExpandable( true ); m_umlObjectMap[item] = derived; @@ -465,7 +465,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI } else { - classifierItem= new KListViewItem( this, classifier->getName() ); + classifierItem= new TDEListViewItem( this, classifier->getName() ); m_umlObjectMap[classifierItem] = classifier; } @@ -479,7 +479,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI connect( classifier, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), this, TQT_SLOT(attributeRemoved(UMLClassifierListItem*))); - TQListViewItem *attsFolder = new KListViewItem( classifierItem, i18n("Attributes"), "attributes" ); + TQListViewItem *attsFolder = new TDEListViewItem( classifierItem, i18n("Attributes"), "attributes" ); attsFolder->setPixmap(0,SmallIcon("folder_green_open")); attsFolder->setExpandable( true ); UMLAttributeList atts = klass->getAttributeList(); @@ -496,7 +496,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI connect( classifier, TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)), this, TQT_SLOT(operationRemoved(UMLClassifierListItem*))); - TQListViewItem *opsFolder = new KListViewItem( classifierItem, i18n("Operations"), "operations" ); + TQListViewItem *opsFolder = new TDEListViewItem( classifierItem, i18n("Operations"), "operations" ); opsFolder->setPixmap(0,SmallIcon("folder_blue_open")); opsFolder->setExpandable( true ); UMLOperationList ops(classifier->getOpList()); @@ -508,12 +508,12 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI //if add parents if(addSuper) { - TQListViewItem *superFolder = new KListViewItem( classifierItem, i18n("Base Classifiers") ); + TQListViewItem *superFolder = new TDEListViewItem( classifierItem, i18n("Base Classifiers") ); superFolder->setExpandable( true ); UMLClassifierList super = classifier->findSuperClassConcepts(); for( UMLClassifier *cl = super.first(); cl ; cl = super.next() ) { - item = new KListViewItem( superFolder, cl->getName() ); + item = new TDEListViewItem( superFolder, cl->getName() ); item->setPixmap(0,m_pixmaps.Generalization); item->setExpandable( true ); m_umlObjectMap[item] = cl; @@ -527,12 +527,12 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI if(addSub) { //add derived classifiers - TQListViewItem *derivedFolder = new KListViewItem( classifierItem, i18n("Derived Classifiers") ); + TQListViewItem *derivedFolder = new TDEListViewItem( classifierItem, i18n("Derived Classifiers") ); derivedFolder->setExpandable( true ); UMLClassifierList derived = classifier->findSubClassConcepts(); for( UMLClassifier *d = derived.first(); d ; d = derived.next() ) { - item = new KListViewItem( derivedFolder, d->getName() ); + item = new TDEListViewItem( derivedFolder, d->getName() ); item->setPixmap(0,m_pixmaps.Subclass); item->setExpandable( true ); m_umlObjectMap[item] = d; diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h index e59b8423..f14f7571 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.h +++ b/umbrello/umbrello/refactoring/refactoringassistant.h @@ -28,7 +28,7 @@ class UMLDoc; class TQPopupMenu; class TQPoint; -class RefactoringAssistant : public KListView +class RefactoringAssistant : public TDEListView { Q_OBJECT @@ -58,7 +58,7 @@ public slots: void attributeRemoved( UMLClassifierListItem *a ); void itemExecuted( TQListViewItem *item ); - void showContextMenu( KListView*, TQListViewItem*, const TQPoint&); + void showContextMenu( TDEListView*, TQListViewItem*, const TQPoint&); protected: struct { TQPixmap Public, 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(); diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index dc4dcfec..6474f422 100644 --- a/umbrello/umbrello/uml.h +++ b/umbrello/umbrello/uml.h @@ -44,14 +44,14 @@ class KPlayerPopupSliderAction; class XhtmlGenerator; // KDE forward declarations -class KActionMenu; -class KRecentFilesAction; +class TDEActionMenu; +class TDERecentFilesAction; class KStatusBarLabel; -class KToggleAction; +class TDEToggleAction; class KDockWidget; class KTabWidget; -class KToolBarButton; -class KPopupMenu; +class TDEToolBarButton; +class TDEPopupMenu; // TQt forward declarations class TQWidgetStack; @@ -65,9 +65,9 @@ class TQCustomEvent; * window and reads the config file as well as providing a menubar, toolbar * and statusbar. An instance of UMLView creates your center view, which is connected * to the window's Doc object. - * UMLApp reimplements the methods that KMainWindow provides for main window handling and supports - * full session management as well as using KActions. - * @see KMainWindow + * UMLApp reimplements the methods that TDEMainWindow provides for main window handling and supports + * full session management as well as using TDEActions. + * @see TDEMainWindow * @see TDEApplication * @see TDEConfig * @@ -103,7 +103,7 @@ public: /** * Returns a pointer to the current document connected to the - * KMainWindow instance. + * TDEMainWindow instance. * Used by the View class to access the document object's methods. */ UMLDoc *getDocument() const; @@ -352,7 +352,7 @@ protected: void readOptions(); /** - * Initializes the KActions of the application. + * Initializes the TDEActions of the application. */ void initActions(); @@ -363,33 +363,33 @@ protected: void initStatusBar(); /** - * Creates the centerwidget of the KMainWindow instance and + * Creates the centerwidget of the TDEMainWindow instance and * sets it as the view. */ void initView(); /** - * queryClose is called by KMainWindow on each closeEvent of a + * queryClose is called by TDEMainWindow on each closeEvent of a * window. Counter to the default implementation (which only * returns true), this calls saveModified() on the document object * to ask if the document shall be saved if Modified; on cancel * the closeEvent is rejected. - * @see KMainWindow#queryClose - * @see KMainWindow#closeEvent + * @see TDEMainWindow#queryClose + * @see TDEMainWindow#closeEvent * * @return True if window may be closed. */ virtual bool queryClose(); /** - * queryExit is called by KMainWindow when the last + * queryExit is called by TDEMainWindow when the last * window of the application is going to be closed during * the closeEvent(). In contrast to the default * implementation that just returns true, this calls * saveOptions() to save the settings of the last * window's properties. - * @see KMainWindow#queryExit - * @see KMainWindow#closeEvent + * @see TDEMainWindow#queryExit + * @see TDEMainWindow#closeEvent * * @return True if window may be closed. */ @@ -400,7 +400,7 @@ protected: * during session end to the session config file, * including saving the currently opened file by a * temporary filename provided by TDEApplication. - * @see KMainWindow#saveProperties + * @see TDEMainWindow#saveProperties */ virtual void saveProperties(TDEConfig *_cfg); @@ -409,7 +409,7 @@ protected: * application's state including the last opened files and * documents by reading the temporary files saved by * saveProperties() - * @see KMainWindow#readProperties + * @see TDEMainWindow#readProperties */ virtual void readProperties(TDEConfig *_cfg); @@ -911,66 +911,66 @@ private: /** Refactoring assistant. */ RefactoringAssistant* m_refactoringAssist; - //KAction pointers to enable/disable actions - KAction* fileNew; - KAction* fileOpen; - KRecentFilesAction* fileOpenRecent; - KAction* fileSave; - KAction* fileSaveAs; - KAction* fileClose; - KAction* filePrint; - KAction* fileQuit; - KAction* fileExportDocbook; - KAction* fileExportXhtml; - - KAction* editCut; - KAction* editCopy; - KAction* editPaste; - KAction* editUndo; - KAction* editRedo; - KAction* selectAll; - KAction* preferences; - - KActionMenu* newDiagram; - KAction* classDiagram; - KAction* sequenceDiagram; - KAction* collaborationDiagram; - KAction* useCaseDiagram; - KAction* stateDiagram; - KAction* activityDiagram; - KAction* componentDiagram; - KAction* deploymentDiagram; - KAction* entityRelationshipDiagram; - KAction* viewClearDiagram; - - KToggleAction* viewSnapToGrid; - KToggleAction* viewShowGrid; - KAction* viewExportImage; - KAction* viewExportImageAll; - KAction* viewProperties; - - KAction* zoom100Action; + //TDEAction pointers to enable/disable actions + TDEAction* fileNew; + TDEAction* fileOpen; + TDERecentFilesAction* fileOpenRecent; + TDEAction* fileSave; + TDEAction* fileSaveAs; + TDEAction* fileClose; + TDEAction* filePrint; + TDEAction* fileQuit; + TDEAction* fileExportDocbook; + TDEAction* fileExportXhtml; + + TDEAction* editCut; + TDEAction* editCopy; + TDEAction* editPaste; + TDEAction* editUndo; + TDEAction* editRedo; + TDEAction* selectAll; + TDEAction* preferences; + + TDEActionMenu* newDiagram; + TDEAction* classDiagram; + TDEAction* sequenceDiagram; + TDEAction* collaborationDiagram; + TDEAction* useCaseDiagram; + TDEAction* stateDiagram; + TDEAction* activityDiagram; + TDEAction* componentDiagram; + TDEAction* deploymentDiagram; + TDEAction* entityRelationshipDiagram; + TDEAction* viewClearDiagram; + + TDEToggleAction* viewSnapToGrid; + TDEToggleAction* viewShowGrid; + TDEAction* viewExportImage; + TDEAction* viewExportImageAll; + TDEAction* viewProperties; + + TDEAction* zoom100Action; KPlayerPopupSliderAction* zoomAction; - KAction* genAll; - KAction* genWizard; - KAction* importClasses; - KAction* classWizard; - KAction* deleteSelectedWidget; - KAction* deleteDiagram; + TDEAction* genAll; + TDEAction* genWizard; + TDEAction* importClasses; + TDEAction* classWizard; + TDEAction* deleteSelectedWidget; + TDEAction* deleteDiagram; #ifdef HAVE_DOT - KAction* autolayout; + TDEAction* autolayout; #endif - KAction* changeTabLeft; - KAction* changeTabRight; - KAction* moveTabLeft; - KAction* moveTabRight; - KToolBarButton* m_newSessionButton; - KPopupMenu* m_diagramMenu; + TDEAction* changeTabLeft; + TDEAction* changeTabRight; + TDEAction* moveTabLeft; + TDEAction* moveTabRight; + TDEToolBarButton* m_newSessionButton; + TDEPopupMenu* m_diagramMenu; TQToolButton* m_closeDiagramButton; - KToggleAction* viewToolBar; - KToggleAction* viewStatusBar; + TDEToggleAction* viewToolBar; + TDEToggleAction* viewStatusBar; WorkToolBar* toolsbar; TQTimer* m_clipTimer; TQTimer* m_copyTimer; diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index d3c79214..f82eb39e 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -1104,7 +1104,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) { emit sigDiagramChanged(dt_Undefined); UMLApp::app()->enablePrint(false); } - */ //FIXME sort out all the KActions for when there's no diagram + */ //FIXME sort out all the TDEActions for when there's no diagram //also remove the buttons from the WorkToolBar, then get rid of infowidget } } diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h index cdfbd72a..c9463a53 100644 --- a/umbrello/umbrello/umldoc.h +++ b/umbrello/umbrello/umldoc.h @@ -64,7 +64,7 @@ class UMLFolder; * The UMLDoc class provides a document object that can be used * in conjunction with the classes UMLApp and UMLView to create * a document-view model for standard TDE applications based on - * TDEApplication and KMainWindow. Thereby, the document object + * TDEApplication and TDEMainWindow. Thereby, the document object * is created by the UMLApp instance and contains the document * structure with the according methods for manipulation of the * document data by UMLView objects. Also, UMLDoc contains the @@ -851,7 +851,7 @@ private: * the context menu on the tabs, * plugs into umlview::slotMenuSelection() */ - KPopupMenu* m_pTabPopupMenu; + TDEPopupMenu* m_pTabPopupMenu; /** * Auxiliary variable for currentRoot(): diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index d6f23206..5bd20125 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -73,7 +73,7 @@ protected: * Reimplemented from TQToolTip for internal reasons. * At classifiers, only the method names are shown in the list view - * we use a tooltip for the full signature display. - * Once KListView's tooltip overriding mechanism works, we can kick + * Once TDEListView's tooltip overriding mechanism works, we can kick * this class out. */ virtual void maybeTip (const TQPoint& pos) { @@ -94,7 +94,7 @@ protected: UMLListView::UMLListView(TQWidget *parent, const char *name) - : KListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument()) + : TDEListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument()) { loadPixmaps(); @@ -115,7 +115,7 @@ UMLListView::UMLListView(TQWidget *parent, const char *name) addColumn(m_doc->getName()); #ifdef WANT_LVTOOLTIP - /* In KDE-3.3, we cannot use KListView's builtin mechanism for + /* In KDE-3.3, we cannot use TDEListView's builtin mechanism for overriding the tooltips. Instead, see the above class LVToolTip. setShowToolTips( true ); setTooltipColumn( 0 ); @@ -194,25 +194,25 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) { connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); }//end if right button - this->KListView::contentsMousePressEvent(me); + this->TDEListView::contentsMousePressEvent(me); } void UMLListView::contentsMouseReleaseEvent(TQMouseEvent *me) { if (me->button() != Qt::LeftButton) { - this->KListView::contentsMouseReleaseEvent(me); + this->TDEListView::contentsMouseReleaseEvent(me); return; } const TQPoint pt = this->TQScrollView::contentsToViewport( me->pos() ); UMLListViewItem *item = dynamic_cast<UMLListViewItem*>(itemAt(pt)); if (item == NULL || !Model_Utils::typeIsDiagram(item->getType())) { - this->KListView::contentsMouseReleaseEvent(me); + this->TDEListView::contentsMouseReleaseEvent(me); return; } // Switch to diagram on mouse release - not on mouse press // because the user might intend a drag-to-note. m_doc->changeCurrentView( item->getID() ); UMLApp::app()->getDocWindow()->showDocumentation(m_doc->findView(item->getID()), false); - this->KListView::contentsMouseReleaseEvent(me); + this->TDEListView::contentsMouseReleaseEvent(me); } void UMLListView::keyPressEvent(TQKeyEvent *ke) { diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h index e6d39894..9b64ae3d 100644 --- a/umbrello/umbrello/umllistview.h +++ b/umbrello/umbrello/umllistview.h @@ -41,7 +41,7 @@ class UMLView; class UMLObject; class UMLClassifierListItem; -class UMLListView : public KListView { +class UMLListView : public TDEListView { Q_OBJECT public: diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp index 3acfa781..e5a2519d 100644 --- a/umbrello/umbrello/umlwidget.cpp +++ b/umbrello/umbrello/umlwidget.cpp @@ -332,7 +332,7 @@ void UMLWidget::slotMenuSelection(int sel) { case ListPopupMenu::mt_Change_Font: font = getFont(); - if( KFontDialog::getFont( font, false, m_pView ) ) + if( TDEFontDialog::getFont( font, false, m_pView ) ) { setFont( font ); m_pDoc->setModified(true); @@ -341,7 +341,7 @@ void UMLWidget::slotMenuSelection(int sel) { case ListPopupMenu::mt_Change_Font_Selection: font = getFont(); - if( KFontDialog::getFont( font, false, m_pView ) ) + if( TDEFontDialog::getFont( font, false, m_pView ) ) { m_pView -> selectionSetFont( font ); m_pDoc->setModified(true); diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp index e973e553..80d9c810 100644 --- a/umbrello/umbrello/worktoolbar.cpp +++ b/umbrello/umbrello/worktoolbar.cpp @@ -27,7 +27,7 @@ WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) - : KToolBar(parentWindow,TQt::DockRight,false,name) { + : TDEToolBar(parentWindow,TQt::DockRight,false,name) { m_CurrentButtonID = tbb_Undefined; loadPixmaps(); m_Type = Uml::dt_Class; /* first time in just want it to load arrow, @@ -219,13 +219,13 @@ void WorkToolBar::slotResetToolBar() { } void WorkToolBar::setOldTool() { - KToolBarButton *b = (KToolBarButton*) getWidget(m_map[m_Type]); + TDEToolBarButton *b = (TDEToolBarButton*) getWidget(m_map[m_Type]); if (b) b -> animateClick(); } void WorkToolBar::setDefaultTool() { - KToolBarButton *b = (KToolBarButton*) getWidget(tbb_Arrow); + TDEToolBarButton *b = (TDEToolBarButton*) getWidget(tbb_Arrow); if (b) b -> animateClick(); } diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h index 375252e0..a7d9339c 100644 --- a/umbrello/umbrello/worktoolbar.h +++ b/umbrello/umbrello/worktoolbar.h @@ -39,7 +39,7 @@ class TQMainWindow; */ -class WorkToolBar : public KToolBar { +class WorkToolBar : public TDEToolBar { Q_OBJECT public: |