diff options
Diffstat (limited to 'kivio')
31 files changed, 225 insertions, 225 deletions
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index fd465151..f6f302e3 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -128,7 +128,7 @@ #include "objectlistpalette.h" #include "addstencilsetdialog.h" -#define TOGGLE_ACTION(X) ((KToggleAction*)actionCollection()->action(X)) +#define TOGGLE_ACTION(X) ((TDEToggleAction*)actionCollection()->action(X)) #define MOUSEPOS_TEXT 1000 #define PAGECOUNT_TEXT 0 #define INFO_TEXT 1 @@ -384,7 +384,7 @@ void KivioView::setupActions() connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateStencilSetList()), addStSet, TQT_SLOT(updateMenu())); connect(addStSet, TQT_SIGNAL(showDialog()), TQT_TQOBJECT(this), TQT_SLOT(showAddStencilSetDialog())); - m_alignAndDistribute = new KAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, TQT_TQOBJECT(this), + m_alignAndDistribute = new TDEAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, TQT_TQOBJECT(this), TQT_SLOT(alignStencilsDlg()), actionCollection(), "alignStencils" ); m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" ); @@ -395,71 +395,71 @@ void KivioView::setupActions() m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); - m_groupAction = new KAction( i18n("Group Selection"), "group", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(groupStencils()), actionCollection(), "groupStencils" ); + m_groupAction = new TDEAction( i18n("Group Selection"), "group", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(groupStencils()), actionCollection(), "groupStencils" ); m_groupAction->setWhatsThis(i18n("Group selected objects into a single stencil")); - m_ungroupAction = new KAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, TQT_TQOBJECT(this), TQT_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" ); + m_ungroupAction = new TDEAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, TQT_TQOBJECT(this), TQT_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" ); m_ungroupAction->setWhatsThis(i18n("Break up a selected group stencil")); - m_stencilToFront = new KAction( i18n("Bring to Front"), "bring_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" ); - m_stencilToBack = new KAction( i18n("Send to Back"), "send_backward", 0, TQT_TQOBJECT(this), TQT_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" ); + m_stencilToFront = new TDEAction( i18n("Bring to Front"), "bring_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" ); + m_stencilToBack = new TDEAction( i18n("Send to Back"), "send_backward", 0, TQT_TQOBJECT(this), TQT_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" ); - m_menuTextFormatAction = new KAction(i18n("&Text..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(textFormat()), + m_menuTextFormatAction = new TDEAction(i18n("&Text..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(textFormat()), actionCollection(), "textFormat"); - m_menuStencilConnectorsAction = new KAction(i18n("&Stencils && Connectors..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(stencilFormat()), + m_menuStencilConnectorsAction = new TDEAction(i18n("&Stencils && Connectors..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(stencilFormat()), actionCollection(), "stencilFormat"); - m_arrowHeadsMenuAction = new KAction(i18n("&Arrowheads..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(arrowHeadFormat()), + m_arrowHeadsMenuAction = new TDEAction(i18n("&Arrowheads..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(arrowHeadFormat()), actionCollection(), "arrowHeadFormat"); m_arrowHeadsMenuAction->setWhatsThis(i18n("Arrowheads allow you to add an arrow to the beginning and/or end of a line.")); /* Create the fg color button */ - m_setFGColor = new TKSelectColorAction( i18n("Line Color"), TKSelectColorAction::LineColor, actionCollection(), "setFGColor" ); + m_setFGColor = new TTDESelectColorAction( i18n("Line Color"), TTDESelectColorAction::LineColor, actionCollection(), "setFGColor" ); m_setFGColor->setWhatsThis(i18n("The line color allows you to choose a color for the lines of the stencils.")); connect(m_setFGColor,TQT_SIGNAL(activated()),TQT_SLOT(setFGColor())); - m_setBGColor = new TKSelectColorAction( i18n("Fill Color"), TKSelectColorAction::FillColor, actionCollection(), "setBGColor" ); + m_setBGColor = new TTDESelectColorAction( i18n("Fill Color"), TTDESelectColorAction::FillColor, actionCollection(), "setBGColor" ); m_setBGColor->setWhatsThis(i18n("You can choose a color for the background of a stencil by using this button.")); connect(m_setBGColor,TQT_SIGNAL(activated()),TQT_SLOT(setBGColor())); // Text bar - m_setFontFamily = new KFontAction( i18n( "Font Family" ), 0, actionCollection(), "setFontFamily" ); + m_setFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "setFontFamily" ); connect( m_setFontFamily, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setFontFamily(const TQString&)) ); - m_setFontSize = new KFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "setFontSize" ); + m_setFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "setFontSize" ); connect( m_setFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setFontSize(int ) ) ); - m_setTextColor = new TKSelectColorAction( i18n("Text Color"), TKSelectColorAction::TextColor, actionCollection(), "setTextColor" ); + m_setTextColor = new TTDESelectColorAction( i18n("Text Color"), TTDESelectColorAction::TextColor, actionCollection(), "setTextColor" ); connect( m_setTextColor, TQT_SIGNAL(activated()), TQT_SLOT(setTextColor()) ); - m_setBold = new KToggleAction( i18n("Toggle Bold Text"), "text_bold", 0, actionCollection(), "setFontBold" ); + m_setBold = new TDEToggleAction( i18n("Toggle Bold Text"), "text_bold", 0, actionCollection(), "setFontBold" ); connect( m_setBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontBold(bool)) ); - m_setItalics = new KToggleAction( i18n("Toggle Italics Text"), "text_italic", 0, actionCollection(), "setFontItalics" ); + m_setItalics = new TDEToggleAction( i18n("Toggle Italics Text"), "text_italic", 0, actionCollection(), "setFontItalics" ); connect( m_setItalics, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontItalics(bool)) ); - m_setUnderline = new KToggleAction( i18n("Toggle Underline Text"), "text_under", 0, actionCollection(), "setFontUnderline" ); + m_setUnderline = new TDEToggleAction( i18n("Toggle Underline Text"), "text_under", 0, actionCollection(), "setFontUnderline" ); connect( m_setUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontUnderline(bool))); - m_textAlignLeft = new KToggleAction( i18n( "Align &Left" ), "text_left", CTRL + Key_L, + m_textAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "text_left", CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), actionCollection(), "textAlignLeft" ); m_textAlignLeft->setExclusiveGroup( "align" ); - m_textAlignCenter = new KToggleAction( i18n( "Align &Center" ), "text_center", CTRL + ALT + Key_C, + m_textAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", CTRL + ALT + Key_C, TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), actionCollection(), "textAlignCenter" ); m_textAlignCenter->setExclusiveGroup( "align" ); m_textAlignCenter->setChecked( TRUE ); - m_textAlignRight = new KToggleAction( i18n( "Align &Right" ), "text_right", CTRL + ALT + Key_R, + m_textAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "text_right", CTRL + ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), actionCollection(), "textAlignRight" ); m_textAlignRight->setExclusiveGroup( "align" ); - m_textVAlignSuper = new KToggleAction( i18n( "Superscript" ), "super", 0, + m_textVAlignSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), actionCollection(), "textVAlignSuper" ); m_textVAlignSuper->setExclusiveGroup( "valign" ); - m_textVAlignSub = new KToggleAction( i18n( "Subscript" ), "sub", 0, + m_textVAlignSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), actionCollection(), "textVAlignSub" ); m_textVAlignSub->setExclusiveGroup( "valign" ); @@ -472,41 +472,41 @@ void KivioView::setupActions() m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", TQT_TQOBJECT(this), TQT_SLOT(setLineStyle(int)), actionCollection(), "setLineStyle"); - m_paperLayout = new KAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(this), TQT_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" ); - m_insertPage = new KAction( i18n("Insert Page"),"item_add", 0, TQT_TQOBJECT(this), TQT_SLOT(insertPage()), actionCollection(), "insertPage" ); - m_removePage = new KAction( i18n("Remove Page"), "item_remove",0,TQT_TQOBJECT(this), TQT_SLOT(removePage()), actionCollection(), "removePage" ); + m_paperLayout = new TDEAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(this), TQT_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" ); + m_insertPage = new TDEAction( i18n("Insert Page"),"item_add", 0, TQT_TQOBJECT(this), TQT_SLOT(insertPage()), actionCollection(), "insertPage" ); + m_removePage = new TDEAction( i18n("Remove Page"), "item_remove",0,TQT_TQOBJECT(this), TQT_SLOT(removePage()), actionCollection(), "removePage" ); - m_renamePage = new KAction( i18n("Rename Page..."), "item_rename",0,TQT_TQOBJECT(this), TQT_SLOT(renamePage()), actionCollection(), "renamePage" ); + m_renamePage = new TDEAction( i18n("Rename Page..."), "item_rename",0,TQT_TQOBJECT(this), TQT_SLOT(renamePage()), actionCollection(), "renamePage" ); - m_showPage = new KAction( i18n("Show Page..."),0 ,TQT_TQOBJECT(this),TQT_SLOT(showPage()), actionCollection(), "showPage" ); - m_hidePage = new KAction( i18n("Hide Page"),0 ,TQT_TQOBJECT(this),TQT_SLOT(hidePage()), actionCollection(), "hidePage" ); + m_showPage = new TDEAction( i18n("Show Page..."),0 ,TQT_TQOBJECT(this),TQT_SLOT(showPage()), actionCollection(), "showPage" ); + m_hidePage = new TDEAction( i18n("Hide Page"),0 ,TQT_TQOBJECT(this),TQT_SLOT(hidePage()), actionCollection(), "hidePage" ); - showPageMargins = new KToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "showPageMargins" ); + showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "showPageMargins" ); connect( showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool))); #if KDE_IS_VERSION(3,2,90) showPageMargins->setCheckedState(i18n("Hide Page Margins")); #endif - showRulers = new KToggleAction( i18n("Show Rulers"), "view_ruler", 0, actionCollection(), "showRulers" ); + showRulers = new TDEToggleAction( i18n("Show Rulers"), "view_ruler", 0, actionCollection(), "showRulers" ); connect( showRulers, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowRulers(bool))); #if KDE_IS_VERSION(3,2,90) showRulers->setCheckedState(i18n("Hide Rulers")); #endif // Grid actions - showGrid = new KToggleAction( i18n("Show Grid"), "view_grid", 0, actionCollection(), "showGrid" ); + showGrid = new TDEToggleAction( i18n("Show Grid"), "view_grid", 0, actionCollection(), "showGrid" ); connect( showGrid, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowGrid(bool))); #if KDE_IS_VERSION(3,2,90) showGrid->setCheckedState(i18n("Hide Grid")); #endif - KToggleAction* snapGrid = new KToggleAction( i18n("Snap Grid"), "view_grid", 0, actionCollection(), "snapGrid" ); + TDEToggleAction* snapGrid = new TDEToggleAction( i18n("Snap Grid"), "view_grid", 0, actionCollection(), "snapGrid" ); connect( snapGrid, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleSnapGrid(bool))); // Guides actions - showGuides = new KToggleAction( i18n("Guide Lines"), 0, actionCollection(), "showGuides" ); + showGuides = new TDEToggleAction( i18n("Guide Lines"), 0, actionCollection(), "showGuides" ); connect( showGuides, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowGuides(bool))); - KAction* addGuide = new KAction(i18n("Add Guide Line..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addGuideLine()), + TDEAction* addGuide = new TDEAction(i18n("Add Guide Line..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addGuideLine()), actionCollection(), "addGuideLine"); connect(showGuides, TQT_SIGNAL(toggled(bool)), addGuide, TQT_SLOT(setEnabled(bool))); //-- @@ -518,10 +518,10 @@ void KivioView::setupActions() KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsDialog()), actionCollection(), "options"); - (void) new KAction(i18n("Install Stencil Set..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction(i18n("Install Stencil Set..."), 0, TQT_TQOBJECT(this), TQT_SLOT(installStencilSet()), actionCollection(), "installStencilSet"); - m_editDelete = new KAction(i18n("Delete"), "editdelete", Key_Delete, + m_editDelete = new TDEAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteObject()), actionCollection(), "deleteObject"); } @@ -561,9 +561,9 @@ void KivioView::initActions() void KivioView::updateReadWrite( bool readwrite ) { - TQValueList<KAction*> actions = actionCollection()->actions(); - TQValueList<KAction*>::ConstIterator aIt = actions.begin(); - TQValueList<KAction*>::ConstIterator aEnd = actions.end(); + TQValueList<TDEAction*> actions = actionCollection()->actions(); + TQValueList<TDEAction*>::ConstIterator aIt = actions.begin(); + TQValueList<TDEAction*>::ConstIterator aEnd = actions.end(); for (; aIt != aEnd; ++aIt ) (*aIt)->setEnabled( readwrite ); if ( !readwrite ) diff --git a/kivio/kiviopart/kivio_view.h b/kivio/kiviopart/kivio_view.h index 752f0bab..18d1b329 100644 --- a/kivio/kiviopart/kivio_view.h +++ b/kivio/kiviopart/kivio_view.h @@ -30,7 +30,7 @@ class KivioStackBar; class KivioStencilSpawner; class KivioStencilSpawnerSet; class KivioTabBar; -class TKSelectColorAction; +class TTDESelectColorAction; class StencilBarDockManager; class KivioArrowHeadAction; @@ -50,13 +50,13 @@ class KivioStencilGeometryPanel; class KoDocumentEntry; class KoTabBar; -class KAction; -class KFontAction; -class KFontSizeAction; -class KToggleAction; +class TDEAction; +class TDEFontAction; +class TDEFontSizeAction; +class TDEToggleAction; -class KSelectColorAction; -class KActionMenu; +class TDESelectColorAction; +class TDEActionMenu; class TQStringList; class TQPushButton; @@ -297,30 +297,30 @@ class KIVIO_EXPORT KivioView : public KoView KivioCanvas *m_pCanvas; KoTabBar *m_pTabBar; - KAction* m_paperLayout; - KAction* m_insertPage; - KAction* m_removePage; - KAction* m_renamePage; - KAction* m_hidePage; - KAction* m_showPage; - KAction* m_arrowHeadsMenuAction; - KAction* m_menuTextFormatAction; - KAction* m_menuStencilConnectorsAction; - - TKSelectColorAction *m_setFGColor; - TKSelectColorAction *m_setBGColor; - - KFontAction *m_setFontFamily; - KFontSizeAction *m_setFontSize; - KToggleAction *m_setBold; - KToggleAction *m_setItalics; - KToggleAction *m_setUnderline; - TKSelectColorAction *m_setTextColor; - KToggleAction* m_textAlignLeft; - KToggleAction* m_textAlignCenter; - KToggleAction* m_textAlignRight; - KToggleAction* m_textVAlignSuper; - KToggleAction* m_textVAlignSub; + TDEAction* m_paperLayout; + TDEAction* m_insertPage; + TDEAction* m_removePage; + TDEAction* m_renamePage; + TDEAction* m_hidePage; + TDEAction* m_showPage; + TDEAction* m_arrowHeadsMenuAction; + TDEAction* m_menuTextFormatAction; + TDEAction* m_menuStencilConnectorsAction; + + TTDESelectColorAction *m_setFGColor; + TTDESelectColorAction *m_setBGColor; + + TDEFontAction *m_setFontFamily; + TDEFontSizeAction *m_setFontSize; + TDEToggleAction *m_setBold; + TDEToggleAction *m_setItalics; + TDEToggleAction *m_setUnderline; + TTDESelectColorAction *m_setTextColor; + TDEToggleAction* m_textAlignLeft; + TDEToggleAction* m_textAlignCenter; + TDEToggleAction* m_textAlignRight; + TDEToggleAction* m_textVAlignSuper; + TDEToggleAction* m_textVAlignSub; KivioArrowHeadAction* m_setArrowHeads; @@ -341,16 +341,16 @@ class KIVIO_EXPORT KivioView : public KoView KivioBirdEyePanel* m_pBirdEyePanel; KivioProtectionPanel* m_pProtectionPanel; Kivio::ObjectListPalette* m_objectListPalette; - KToggleAction* showPageMargins; - KToggleAction* showRulers; - KToggleAction* showGrid; - KToggleAction* showGuides; - KAction *m_selectAll; - KAction *m_selectNone; - KAction *m_editCopy; - KAction* m_editCut; - KAction* m_editPaste; - KAction* m_editDelete; + TDEToggleAction* showPageMargins; + TDEToggleAction* showRulers; + TDEToggleAction* showGrid; + TDEToggleAction* showGuides; + TDEAction *m_selectAll; + TDEAction *m_selectNone; + TDEAction *m_editCopy; + TDEAction* m_editCut; + TDEAction* m_editPaste; + TDEAction* m_editDelete; bool m_bShowPageMargins; bool m_bShowRulers; bool m_bSnapGuides; @@ -366,11 +366,11 @@ class KIVIO_EXPORT KivioView : public KoView Kivio::PluginManager* m_pluginManager; - KAction* m_groupAction; - KAction* m_ungroupAction; - KAction* m_stencilToFront; - KAction* m_stencilToBack; - KAction* m_alignAndDistribute; + TDEAction* m_groupAction; + TDEAction* m_ungroupAction; + TDEAction* m_stencilToFront; + TDEAction* m_stencilToBack; + TDEAction* m_alignAndDistribute; KoLineWidthAction* m_lineWidthAction; KoLineStyleAction* m_lineStyleAction; diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp index dde3103a..4b2757fa 100644 --- a/kivio/kiviopart/kivio_zoomaction.cpp +++ b/kivio/kiviopart/kivio_zoomaction.cpp @@ -25,7 +25,7 @@ using namespace Kivio; ZoomAction::ZoomAction(TQObject* parent, const char* name) -: TKSelectAction(parent,name) +: TTDESelectAction(parent,name) { setEditable(true); TQStringList lst; diff --git a/kivio/kiviopart/kivio_zoomaction.h b/kivio/kiviopart/kivio_zoomaction.h index 3e4738af..2cb6eac3 100644 --- a/kivio/kiviopart/kivio_zoomaction.h +++ b/kivio/kiviopart/kivio_zoomaction.h @@ -23,7 +23,7 @@ namespace Kivio { -class ZoomAction : public TKSelectAction +class ZoomAction : public TTDESelectAction { Q_OBJECT public: diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp index f4e1e217..42239517 100644 --- a/kivio/kiviopart/kivioarrowheadaction.cpp +++ b/kivio/kiviopart/kivioarrowheadaction.cpp @@ -39,13 +39,13 @@ KivioArrowHeadAction::KivioArrowHeadAction(const TQString &text, const TQString &pix, TQObject* parent, const char *name) - : KActionMenu(text, pix, parent, name) + : TDEActionMenu(text, pix, parent, name) { m_emitSignals = true; setShortcutConfigurable( false ); - m_popup = new KPopupMenu(0L,"KivioArrowHeadAction::popup"); - m_startPopup = new KPopupMenu; - m_endPopup = new KPopupMenu; + m_popup = new TDEPopupMenu(0L,"KivioArrowHeadAction::popup"); + m_startPopup = new TDEPopupMenu; + m_endPopup = new TDEPopupMenu; m_startPopup->setCheckable(true); m_endPopup->setCheckable(true); m_popup->insertItem(SmallIconSet("start_arrowhead", 16), i18n("Arrowhead at Origin"), m_startPopup); @@ -69,7 +69,7 @@ KivioArrowHeadAction::~KivioArrowHeadAction() m_popup = 0; } -KPopupMenu* KivioArrowHeadAction::popupMenu() const +TDEPopupMenu* KivioArrowHeadAction::popupMenu() const { return m_popup; } @@ -81,10 +81,10 @@ void KivioArrowHeadAction::popup( const TQPoint& global ) int KivioArrowHeadAction::plug( TQWidget* widget, int index) { - // This function is copied from KActionMenu::plug - if (kapp && !kapp->authorizeKAction(name())) + // This function is copied from TDEActionMenu::plug + if (kapp && !kapp->authorizeTDEAction(name())) return -1; - kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis + kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); @@ -104,11 +104,11 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index) return containerCount() - 1; } - else if ( widget->inherits( "KToolBar" ) ) + else if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = static_cast<KToolBar *>( widget ); + TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); - int id_ = KAction::getToolButtonID(); + int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, @@ -159,7 +159,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index) return -1; } -void KivioArrowHeadAction::loadArrowHeads(KPopupMenu* popup) +void KivioArrowHeadAction::loadArrowHeads(TDEPopupMenu* popup) { TQBitmap mask; TQPixmap pixAll = Kivio::arrowHeadPixmap(); diff --git a/kivio/kiviopart/kivioarrowheadaction.h b/kivio/kiviopart/kivioarrowheadaction.h index 9948980c..c27956c2 100644 --- a/kivio/kiviopart/kivioarrowheadaction.h +++ b/kivio/kiviopart/kivioarrowheadaction.h @@ -24,9 +24,9 @@ #include <kaction.h> -class KPopupMenu; +class TDEPopupMenu; -class KivioArrowHeadAction : public KActionMenu +class KivioArrowHeadAction : public TDEActionMenu { Q_OBJECT @@ -35,7 +35,7 @@ class KivioArrowHeadAction : public KActionMenu TQObject* parent = 0, const char *name = 0); ~KivioArrowHeadAction(); - KPopupMenu* popupMenu() const; + TDEPopupMenu* popupMenu() const; void popup( const TQPoint& global ); virtual int plug( TQWidget* widget, int index = -1 ); @@ -53,12 +53,12 @@ class KivioArrowHeadAction : public KActionMenu void endChanged(int); protected: - void loadArrowHeads(KPopupMenu* combo); + void loadArrowHeads(TDEPopupMenu* combo); protected: - KPopupMenu* m_popup; - KPopupMenu* m_startPopup; - KPopupMenu* m_endPopup; + TDEPopupMenu* m_popup; + TDEPopupMenu* m_startPopup; + TDEPopupMenu* m_endPopup; int m_currentStart; int m_currentEnd; bool m_emitSignals; diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index bccbe0aa..340d88b8 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -64,14 +64,14 @@ static const char * default_plug_xpm[] = { " ##############"}; KivioStencilSetAction::KivioStencilSetAction(const TQString &text, const TQString &pix, - KActionCollection *parent, const char *name) - : KAction(text, pix, 0, parent, name) + TDEActionCollection *parent, const char *name) + : TDEAction(text, pix, 0, parent, name) { setShortcutConfigurable( false ); m_pathList.setAutoDelete(true); - m_popup = new KPopupMenu(0L,"KivioStencilSetAction::popup"); + m_popup = new TDEPopupMenu(0L,"KivioStencilSetAction::popup"); updateMenu(); } @@ -82,7 +82,7 @@ KivioStencilSetAction::~KivioStencilSetAction() m_popup = 0; } -KPopupMenu* KivioStencilSetAction::popupMenu() const +TDEPopupMenu* KivioStencilSetAction::popupMenu() const { return m_popup; } @@ -94,10 +94,10 @@ void KivioStencilSetAction::popup( const TQPoint& global ) int KivioStencilSetAction::plug( TQWidget* widget, int index) { - // This function is copied from KActionMenu::plug - if (kapp && !kapp->authorizeKAction(name())) + // This function is copied from TDEActionMenu::plug + if (kapp && !kapp->authorizeTDEAction(name())) return -1; - kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis + kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); @@ -117,11 +117,11 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index) return containerCount() - 1; } - else if ( widget->inherits( "KToolBar" ) ) + else if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = static_cast<KToolBar *>( widget ); + TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); - int id_ = KAction::getToolButtonID(); + int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, @@ -212,11 +212,11 @@ void KivioStencilSetAction::loadCollections( const TQString& rootDirStr ) if(colFInfo->fileName() != ".." && colFInfo->fileName() != ".") { cId = KivioStencilSpawnerSet::readId(colFInfo->absFilePath()); - KPopupMenu* ch; + TDEPopupMenu* ch; int index = m_collectionIdList.findIndex(cId); if(index < 0) { - ch = new KPopupMenu; + ch = new TDEPopupMenu; connect(ch,TQT_SIGNAL(activated(int)),TQT_SLOT(slotActivated(int))); m_popup->insertItem(TQIconSet(dirtPixmap(colFInfo->absFilePath())), KivioStencilSpawnerSet::readTitle(colFInfo->absFilePath()),ch); @@ -233,7 +233,7 @@ void KivioStencilSetAction::loadCollections( const TQString& rootDirStr ) } } -void KivioStencilSetAction::loadSet( KPopupMenu* menu, const TQString& rootDirStr ) +void KivioStencilSetAction::loadSet( TDEPopupMenu* menu, const TQString& rootDirStr ) { TQDir rootDir( rootDirStr ); @@ -286,10 +286,10 @@ void KivioStencilSetAction::slotActivated(int id) void KivioStencilSetAction::clearCollectionMenuList() { - TQValueList<KPopupMenu*>::Iterator it; + TQValueList<TDEPopupMenu*>::Iterator it; for(it = m_collectionMenuList.begin(); it != m_collectionMenuList.end(); ++it) { - KPopupMenu* m = (*it); + TDEPopupMenu* m = (*it); delete m; } diff --git a/kivio/kiviopart/kiviostencilsetaction.h b/kivio/kiviopart/kiviostencilsetaction.h index 0403340e..9544359b 100644 --- a/kivio/kiviopart/kiviostencilsetaction.h +++ b/kivio/kiviopart/kiviostencilsetaction.h @@ -28,20 +28,20 @@ #include <tqvaluelist.h> #include <tqstringlist.h> -class KPopupMenu; +class TDEPopupMenu; class TQPixmap; -class KivioStencilSetAction : public KAction +class KivioStencilSetAction : public TDEAction { Q_OBJECT public: KivioStencilSetAction(const TQString &text, const TQString &pix, - KActionCollection *parent, const char *name); + TDEActionCollection *parent, const char *name); virtual ~KivioStencilSetAction(); - KPopupMenu* popupMenu() const; + TDEPopupMenu* popupMenu() const; void popup( const TQPoint& global ); virtual int plug( TQWidget* widget, int index = -1 ); @@ -59,15 +59,15 @@ class KivioStencilSetAction : public KAction protected: TQPixmap dirtPixmap( const TQString& dir ); void loadCollections( const TQString& rootDirStr ); - void loadSet( KPopupMenu* menu, const TQString& rootDirStr ); + void loadSet( TDEPopupMenu* menu, const TQString& rootDirStr ); void clearCollectionMenuList(); protected: - KPopupMenu* m_popup; + TDEPopupMenu* m_popup; uint m_ssId; TQPtrList<TQString> m_pathList; TQStringList m_collectionIdList; - TQValueList<KPopupMenu*> m_collectionMenuList; + TQValueList<TDEPopupMenu*> m_collectionMenuList; }; #endif diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp index e46e522c..b49baace 100644 --- a/kivio/kiviopart/tools/mousetoolaction.cpp +++ b/kivio/kiviopart/tools/mousetoolaction.cpp @@ -24,51 +24,51 @@ namespace Kivio { -MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut, +MouseToolAction::MouseToolAction(const TQString& text, const TDEShortcut& cut, TQObject* parent, const char* name) - : KRadioAction(text, cut, parent, name) + : TDERadioAction(text, cut, parent, name) { } -MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut, +MouseToolAction::MouseToolAction(const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name) - : KRadioAction(text, cut, receiver, slot, parent, name) + : TDERadioAction(text, cut, receiver, slot, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix, - const KShortcut& cut, + const TDEShortcut& cut, TQObject* parent, const char* name) - : KRadioAction(text, pix, cut, parent, name) + : TDERadioAction(text, pix, cut, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix, - const KShortcut& cut, + const TDEShortcut& cut, TQObject* parent, const char* name) - : KRadioAction(text, pix, cut, parent, name) + : TDERadioAction(text, pix, cut, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix, - const KShortcut& cut, + const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name) - : KRadioAction(text, pix, cut, receiver, slot, parent, name) + : TDERadioAction(text, pix, cut, receiver, slot, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix, - const KShortcut& cut, + const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name) - : KRadioAction(text, pix, cut, receiver, slot, parent, name) + : TDERadioAction(text, pix, cut, receiver, slot, parent, name) { } MouseToolAction::MouseToolAction(TQObject* parent, const char* name) - : KRadioAction(parent, name) + : TDERadioAction(parent, name) { } @@ -78,15 +78,15 @@ MouseToolAction::~MouseToolAction() int MouseToolAction::plug(TQWidget* widget, int index) { - int usedIndex = KRadioAction::plug(widget, index); + int usedIndex = TDERadioAction::plug(widget, index); if(usedIndex == -1) { return usedIndex; } - if(::tqqt_cast<KToolBar*>(widget)) { - KToolBar* toolBar = static_cast<KToolBar*>(widget); - KToolBarButton* button = toolBar->getButton(itemId(usedIndex)); + if(::tqqt_cast<TDEToolBar*>(widget)) { + TDEToolBar* toolBar = static_cast<TDEToolBar*>(widget); + TDEToolBarButton* button = toolBar->getButton(itemId(usedIndex)); connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL(doubleClicked())); } diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h index 64b322ab..f4ba5389 100644 --- a/kivio/kiviopart/tools/mousetoolaction.h +++ b/kivio/kiviopart/tools/mousetoolaction.h @@ -24,7 +24,7 @@ namespace Kivio { -class KIVIO_EXPORT MouseToolAction : public KRadioAction +class KIVIO_EXPORT MouseToolAction : public TDERadioAction { Q_OBJECT @@ -39,7 +39,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0); + MouseToolAction(const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0); /** * @param text The text that will be displayed. @@ -49,7 +49,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(const TQString& text, const KShortcut& cut, + MouseToolAction(const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0); /** @@ -59,7 +59,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), + MouseToolAction(const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0); /** @@ -69,7 +69,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), + MouseToolAction(const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0); /** @@ -81,7 +81,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut, + MouseToolAction(const TQString& text, const TQIconSet& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0); /** @@ -93,7 +93,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut, + MouseToolAction(const TQString& text, const TQString& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0); diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 572936e7..acc736ec 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -25,7 +25,7 @@ #include <tqcursor.h> #include <tqtoolbutton.h> -#define TOGGLE_ACTION(X) ((KToggleAction*)child(X)) +#define TOGGLE_ACTION(X) ((TDEToggleAction*)child(X)) KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* parent, const char* name) : KivioBirdEyePanelBase(parent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc()) diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.h b/kivio/kiviopart/ui/kivio_birdeye_panel.h index 185e40ee..d5a2ea41 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.h +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.h @@ -27,7 +27,7 @@ class KivioView; class KivioCanvas; class KivioDoc; class KivioPage; -class KAction; +class TDEAction; class KoZoomHandler; class KivioBirdEyePanel : public KivioBirdEyePanelBase @@ -58,8 +58,8 @@ private: KivioCanvas* m_pCanvas; KivioDoc* m_pDoc; - KAction* zoomIn; - KAction* zoomOut; + TDEAction* zoomIn; + TDEAction* zoomOut; TQPixmap* m_buffer; TQRect varea; diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index 1302f2be..2667dffd 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -75,11 +75,11 @@ KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* parent, const char* list->setSorting(5, false); list->installEventFilter(this); - actNew = new KAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this)); - actDel = new KAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this)); - actRename = new KAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this)); - actUp = new KAction( i18n("Move Layer Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this)); - actDown = new KAction( i18n("Move Layer Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(this)); + actNew = new TDEAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this)); + actDel = new TDEAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this)); + actRename = new TDEAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this)); + actUp = new TDEAction( i18n("Move Layer Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this)); + actDown = new TDEAction( i18n("Move Layer Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(this)); actNew->plug(bar); actDel->plug(bar); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.h b/kivio/kiviopart/ui/kivio_layer_panel.h index d4bcdb0d..cfc24a94 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.h +++ b/kivio/kiviopart/ui/kivio_layer_panel.h @@ -19,7 +19,7 @@ #ifndef KIVIOLAYERPANEL_H #define KIVIOLAYERPANEL_H -class KAction; +class TDEAction; class KivioView; class KivioLayer; @@ -73,11 +73,11 @@ class KivioLayerPanel : public KivioLayerPanelBase private: KivioView* m_pView; - KAction* actNew; - KAction* actDel; - KAction* actRename; - KAction* actUp; - KAction* actDown; + TDEAction* actNew; + TDEAction* actDel; + TDEAction* actRename; + TDEAction* actUp; + TDEAction* actDown; int id; }; diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui index 904196c2..4f6bad32 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui @@ -26,7 +26,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="KToolBar"> + <widget class="TDEToolBar"> <property name="name"> <cstring>bar</cstring> </property> @@ -46,7 +46,7 @@ </widget> <customwidgets> <customwidget> - <class>KToolBar</class> + <class>TDEToolBar</class> <header location="local">ktoolbar.h</header> <sizehint> <width>-1</width> diff --git a/kivio/kiviopart/ui/kivio_protection_panel.h b/kivio/kiviopart/ui/kivio_protection_panel.h index beadfc27..d53f140d 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel.h +++ b/kivio/kiviopart/ui/kivio_protection_panel.h @@ -19,7 +19,7 @@ #ifndef _KIVIO_PROTECTION_PANEL_H #define _KIVIO_PROTECTION_PANEL_H -class KAction; +class TDEAction; class KivioView; class KivioLayer; diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 7e2a937a..8372b1a3 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -112,7 +112,7 @@ namespace Kivio { } if(!li) { - li = new KListViewItem(m_stencilSetLView, + li = new TDEListViewItem(m_stencilSetLView, KivioStencilSpawnerSet::readTitle(colFInfo->absFilePath()), KivioStencilSpawnerSet::readId(colFInfo->absFilePath())); li->setPixmap(0, loadIcon("icon", colFInfo->absFilePath())); @@ -140,7 +140,7 @@ namespace Kivio { { if( setFInfo->fileName() != ".." && setFInfo->fileName() != "." ) { - KListViewItem* tmp = new KListViewItem(li, KivioStencilSpawnerSet::readTitle(setFInfo->absFilePath()), + TDEListViewItem* tmp = new TDEListViewItem(li, KivioStencilSpawnerSet::readTitle(setFInfo->absFilePath()), dir + "/" + setFInfo->fileName()); tmp->setPixmap(0, loadIcon("icon", setFInfo->absFilePath())); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 613f0fd4..b72d886b 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -49,7 +49,7 @@ #include <tqtabwidget.h> // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) -// : KListViewItem(parent), m_data(gd) +// : TDEListViewItem(parent), m_data(gd) // { // setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? // "guides_vertical":"guides_horizontal")); @@ -330,7 +330,7 @@ void KivioOptionsDialog::setFontText(const TQFont& f) void KivioOptionsDialog::fontDlg() { - if(KFontDialog::getFont(m_font, false, this) == TQDialog::Accepted) { + if(TDEFontDialog::getFont(m_font, false, this) == TQDialog::Accepted) { setFontText(m_font); } } diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h index df055a34..69a43be8 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.h +++ b/kivio/kiviopart/ui/kiviooptionsdialog.h @@ -37,7 +37,7 @@ class KivioGuideLineData; class TQGroupBox; class TQFont; -// class GuidesListViewItem : public KListViewItem +// class GuidesListViewItem : public TDEListViewItem // { // public: // GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u); diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui index 48de8cc4..4b84ae30 100644 --- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui +++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Stencil Set</string> diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 14c390fa..92424aaa 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -43,7 +43,7 @@ KivioTextFormatDlg::KivioTextFormatDlg(KivioView* parent, const char* name) void KivioTextFormatDlg::initFontTab() { TQFrame* tab = addPage(i18n("Font")); - m_fontChooser = new KFontChooser(tab); + m_fontChooser = new TDEFontChooser(tab); TQLabel* textColorLbl = new TQLabel(i18n("Text color:"), tab); m_textCBtn = new KColorButton(tab); TQGridLayout* gl = new TQGridLayout(tab); diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.h b/kivio/kiviopart/ui/kiviotextformatdlg.h index b095abe4..39b76929 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.h +++ b/kivio/kiviopart/ui/kiviotextformatdlg.h @@ -23,7 +23,7 @@ #include <kdialogbase.h> class KivioView; -class KFontChooser; +class TDEFontChooser; class KColorButton; class TQButtonGroup; class TQLabel; @@ -58,7 +58,7 @@ class KivioTextFormatDlg : public KDialogBase void slotDefault(); protected: - KFontChooser* m_fontChooser; + TDEFontChooser* m_fontChooser; KColorButton* m_textCBtn; TQButtonGroup* m_halignBGrp; TQButtonGroup* m_valignBGrp; diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index fbe094e5..01857617 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -37,11 +37,11 @@ namespace Kivio { -class ObjectListItem : public KListViewItem +class ObjectListItem : public TDEListViewItem { public: - ObjectListItem(KListView* parent, KivioStencil* _stencil) - : KListViewItem(parent, "") + ObjectListItem(TDEListView* parent, KivioStencil* _stencil) + : TDEListViewItem(parent, "") { m_stencil = _stencil; setPixmap(0, Kivio::generatePixmapFromStencil(22, 22, m_stencil)); @@ -87,7 +87,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2); - m_objectList = new KListView(this); + m_objectList = new TDEListView(this); m_objectList->setFullWidth(true); m_objectList->setAllColumnsShowFocus(true); m_objectList->setSorting(-1); diff --git a/kivio/kiviopart/ui/objectlistpalette.h b/kivio/kiviopart/ui/objectlistpalette.h index 82ca4827..ed22bcc0 100644 --- a/kivio/kiviopart/ui/objectlistpalette.h +++ b/kivio/kiviopart/ui/objectlistpalette.h @@ -21,7 +21,7 @@ #include <tqwidget.h> -class KListView; +class TDEListView; class KivioView; namespace Kivio { @@ -44,7 +44,7 @@ class ObjectListPalette : public TQWidget private: KivioView* m_view; - KListView* m_objectList; + TDEListView* m_objectList; bool m_blockUpdate; }; diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index 6117cf61..5dd3153e 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -52,16 +52,16 @@ SelectTool::SelectTool( KivioView* parent ) : Kivio::MouseTool(parent, "Selectio { view()->pluginManager()->setDefaultTool(this); - KShortcut selectShortCut(Key_Space); + TDEShortcut selectShortCut(Key_Space); selectShortCut.setSeq(1, TQKeySequence(Key_Escape)); - m_selectAction = new KRadioAction(i18n("&Select"), "select", selectShortCut, actionCollection(), "select"); + m_selectAction = new TDERadioAction(i18n("&Select"), "select", selectShortCut, actionCollection(), "select"); connect(m_selectAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); - m_textEditAction = new KAction(i18n("&Edit Text..."), "text", Key_F2, + m_textEditAction = new TDEAction(i18n("&Edit Text..."), "text", Key_F2, this, TQT_SLOT(editStencilText()), actionCollection(), "editText"); - (void) new KAction(i18n("Format &Stencils && Connectors..."), 0, 0, TQT_TQOBJECT(view()), TQT_SLOT(stencilFormat()), + (void) new TDEAction(i18n("Format &Stencils && Connectors..."), 0, 0, TQT_TQOBJECT(view()), TQT_SLOT(stencilFormat()), actionCollection(), "formatStencil"); - m_arrowHeadAction = new KAction(i18n("Format &Arrowheads..."), 0, 0, TQT_TQOBJECT(view()), TQT_SLOT(arrowHeadFormat()), + m_arrowHeadAction = new TDEAction(i18n("Format &Arrowheads..."), 0, 0, TQT_TQOBJECT(view()), TQT_SLOT(arrowHeadFormat()), actionCollection(), "formatConnector"); m_mode = stmNone; @@ -1107,12 +1107,12 @@ void SelectTool::endResizing(const TQPoint&) */ void SelectTool::showPopupMenu( const TQPoint &pos ) { - KPopupMenu* menu = 0; + TDEPopupMenu* menu = 0; if(view()->activePage()->selectedStencils()->count() < 1) { - menu = static_cast<KPopupMenu*>(view()->factory()->container("PagePopup", view())); + menu = static_cast<TDEPopupMenu*>(view()->factory()->container("PagePopup", view())); } else { - menu = static_cast<KPopupMenu*>(view()->factory()->container("StencilPopup", view())); + menu = static_cast<TDEPopupMenu*>(view()->factory()->container("StencilPopup", view())); m_arrowHeadAction->setEnabled(view()->activePage()->checkForStencilTypeInSelection(kstConnector)); if(view()->activePage()->checkForTextBoxesInSelection()) { diff --git a/kivio/plugins/kivioselecttool/tool_select.h b/kivio/plugins/kivioselecttool/tool_select.h index e245df05..07d4a25b 100644 --- a/kivio/plugins/kivioselecttool/tool_select.h +++ b/kivio/plugins/kivioselecttool/tool_select.h @@ -29,9 +29,9 @@ class KivioView; class KivioPage; class TQMouseEvent; class TQKeyEvent; -class KPopupMenu; -class KRadioAction; -class KAction; +class TDEPopupMenu; +class TDERadioAction; +class TDEAction; class KivioStencil; @@ -126,9 +126,9 @@ class SelectTool : public Kivio::MouseTool KoRect m_selectedRect; KoPoint m_customDragOrigPoint; - KRadioAction* m_selectAction; - KAction* m_arrowHeadAction; - KAction* m_textEditAction; + TDERadioAction* m_selectAction; + TDEAction* m_arrowHeadAction; + TDEAction* m_textEditAction; bool m_firstTime; }; diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp index 5cef094e..d2f3c4df 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp @@ -44,7 +44,7 @@ SMLConnector::SMLConnector( KivioView* view ) : Kivio::MouseTool(view, "SMLConnector") { - m_connectorAction = new KToggleAction(i18n("Polyline Connector"), "", 0, + m_connectorAction = new TDEToggleAction(i18n("Polyline Connector"), "", 0, actionCollection(), "sml_connector"); connect(m_connectorAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.h b/kivio/plugins/kiviosmlconnector/tool_connector.h index 3213bff1..87ef56c4 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.h +++ b/kivio/plugins/kiviosmlconnector/tool_connector.h @@ -25,7 +25,7 @@ class TQMouseEvent; class TQCursor; -class KToggleAction; +class TDEToggleAction; class KivioView; class KivioPage; @@ -78,7 +78,7 @@ private: KoPoint startPoint; KivioCustomDragData* m_pDragData; - KToggleAction* m_connectorAction; + TDEToggleAction* m_connectorAction; }; #endif diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui index 0e8aac77..768732aa 100644 --- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui +++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui @@ -142,7 +142,7 @@ You should have received a copy of the GNU General Public License along with thi <bool>true</bool> </property> </widget> - <widget class="KFontCombo" row="0" column="0"> + <widget class="TDEFontCombo" row="0" column="0"> <property name="name"> <cstring>m_fontCombo</cstring> </property> diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index 01a148be..22e9f63c 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -40,9 +40,9 @@ ZoomTool::ZoomTool(KivioView* parent) : Kivio::MouseTool(parent, "Zoom Mouse Tool") { - m_zoomAction = new KRadioAction(i18n("&Zoom"), "viewmag", CTRL + ALT + Key_Z, actionCollection(), "zoom"); + m_zoomAction = new TDERadioAction(i18n("&Zoom"), "viewmag", CTRL + ALT + Key_Z, actionCollection(), "zoom"); m_zoomAction->setWhatsThis(i18n("By pressing this button you can zoom in on a specific area.")); - m_panAction = new KRadioAction(i18n("&Pan Document"), "kivio_zoom_hand", CTRL + ALT + Key_H, actionCollection(), "pan"); + m_panAction = new TDERadioAction(i18n("&Pan Document"), "kivio_zoom_hand", CTRL + ALT + Key_H, actionCollection(), "pan"); m_panAction->setWhatsThis(i18n("You can drag the document by using the mouse.")); m_zoomAction->setExclusiveGroup("zoomAction"); m_panAction->setExclusiveGroup("zoomAction"); @@ -62,23 +62,23 @@ ZoomTool::ZoomTool(KivioView* parent) : Kivio::MouseTool(parent, "Zoom Mouse Too m_pMinus = KStdAction::zoomOut(this, TQT_SLOT(zoomMinus()), actionCollection(), "zoomMinus"); m_pMinus->setWhatsThis(i18n("By pressing this button you can zoom out of the document.")); - m_pZoomWidth = new KAction( i18n("Zoom Width"), "kivio_zoom_width", SHIFT+Key_F4, actionCollection(), "zoomWidth" ); + m_pZoomWidth = new TDEAction( i18n("Zoom Width"), "kivio_zoom_width", SHIFT+Key_F4, actionCollection(), "zoomWidth" ); m_pZoomWidth->setWhatsThis(i18n("You can zoom the document that it fits into the window width.")); connect(m_pZoomWidth,TQT_SIGNAL(activated()),TQT_SLOT(zoomWidth())); - m_pZoomHeight = new KAction( i18n("Zoom Height"), "kivio_zoom_height", SHIFT+Key_F5, actionCollection(), "zoomHeight" ); + m_pZoomHeight = new TDEAction( i18n("Zoom Height"), "kivio_zoom_height", SHIFT+Key_F5, actionCollection(), "zoomHeight" ); m_pZoomHeight->setWhatsThis(i18n("You can zoom the document that it fits into the window height.")); connect(m_pZoomHeight,TQT_SIGNAL(activated()),TQT_SLOT(zoomHeight())); - m_pZoomPage = new KAction( i18n("Zoom Page"), "kivio_zoom_page", SHIFT+Key_F6, actionCollection(), "zoomPage" ); + m_pZoomPage = new TDEAction( i18n("Zoom Page"), "kivio_zoom_page", SHIFT+Key_F6, actionCollection(), "zoomPage" ); m_pZoomPage->setWhatsThis(i18n("The Zoom Page button shows the entire page.")); connect(m_pZoomPage,TQT_SIGNAL(activated()),TQT_SLOT(zoomPage())); - m_pZoomSelected = new KAction( i18n("Zoom Selected"), "kivio_zoom_selected", CTRL+Key_Y, actionCollection(), "zoomSelected" ); + m_pZoomSelected = new TDEAction( i18n("Zoom Selected"), "kivio_zoom_selected", CTRL+Key_Y, actionCollection(), "zoomSelected" ); m_pZoomSelected->setWhatsThis(i18n("By pressing this button you zoom in on the document, so that all <b>selected</b> objects are visible.")); connect(m_pZoomSelected,TQT_SIGNAL(activated()),TQT_SLOT(zoomSelected())); - m_pZoomAllObjects = new KAction( i18n("Zoom All Objects"), "kivio_zoom_allobject", 0, actionCollection(), "zoomAllObjects" ); + m_pZoomAllObjects = new TDEAction( i18n("Zoom All Objects"), "kivio_zoom_allobject", 0, actionCollection(), "zoomAllObjects" ); m_pZoomAllObjects->setWhatsThis(i18n("You are able to zoom in on the document, so that all objects are visible by pressing this button.")); connect(m_pZoomAllObjects,TQT_SIGNAL(activated()),TQT_SLOT(zoomAllobjects())); @@ -318,7 +318,7 @@ void ZoomTool::zoomPage() void ZoomTool::showPopupMenu(const TQPoint& p ) { if(!m_pMenu) { - m_pMenu = static_cast<KPopupMenu*>(factory()->container("ZoomPopup", this)); + m_pMenu = static_cast<TDEPopupMenu*>(factory()->container("ZoomPopup", this)); } if(m_pMenu) { diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.h b/kivio/plugins/kiviozoomtool/tool_zoom.h index ce100aca..7e2ce69d 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.h +++ b/kivio/plugins/kiviozoomtool/tool_zoom.h @@ -24,10 +24,10 @@ class KivioView; class KivioPage; class KivioCanvas; -class KPopupMenu; +class TDEPopupMenu; -class KRadioAction; -class KAction; +class TDERadioAction; +class TDEAction; class TQCursor; @@ -64,20 +64,20 @@ class ZoomTool : public Kivio::MouseTool void operationDone(); private: - KRadioAction* m_zoomAction; - KRadioAction* m_panAction; + TDERadioAction* m_zoomAction; + TDERadioAction* m_panAction; - KPopupMenu* m_pMenu; + TDEPopupMenu* m_pMenu; - KAction* m_pMinus; - KAction* m_pPlus; - KAction* m_pZoomWidth; - KAction* m_pZoomHeight; - KAction* m_pZoomSelected; - KAction* m_pZoomPage; - KAction* m_pZoomAllObjects; + TDEAction* m_pMinus; + TDEAction* m_pPlus; + TDEAction* m_pZoomWidth; + TDEAction* m_pZoomHeight; + TDEAction* m_pZoomSelected; + TDEAction* m_pZoomPage; + TDEAction* m_pZoomAllObjects; - KAction* m_pCurrent; + TDEAction* m_pCurrent; TQCursor* m_pPlusCursor; TQCursor* m_pMinusCursor; |