diff options
Diffstat (limited to 'karbon')
56 files changed, 159 insertions, 159 deletions
diff --git a/karbon/commands/vcommand.h b/karbon/commands/vcommand.h index 1dbf8804..e15e8cf8 100644 --- a/karbon/commands/vcommand.h +++ b/karbon/commands/vcommand.h @@ -31,7 +31,7 @@ class VDocument; class KarbonPart; -class KAction; +class TDEAction; /** * The base class for all karbon commands. @@ -309,8 +309,8 @@ private: KarbonPart *m_part; unsigned int m_undoLimit; unsigned int m_redoLimit; - KAction *m_undo; - KAction *m_redo; + TDEAction *m_undo; + TDEAction *m_redo; TQPtrList<VCommand> m_commands; int m_savedPos; }; diff --git a/karbon/karbon_tool_factory.h b/karbon/karbon_tool_factory.h index 149d9c63..1589f065 100644 --- a/karbon/karbon_tool_factory.h +++ b/karbon/karbon_tool_factory.h @@ -32,7 +32,7 @@ public: KarbonAbstractToolFactory(); virtual ~KarbonAbstractToolFactory(); - virtual VTool * createTool( KActionCollection * ac, KarbonView* view ) = 0; + virtual VTool * createTool( TDEActionCollection * ac, KarbonView* view ) = 0; }; template<class T> class KarbonToolFactory : public KarbonAbstractToolFactory @@ -41,7 +41,7 @@ public: KarbonToolFactory() {} virtual ~KarbonToolFactory() {} - virtual VTool * createTool( KActionCollection * ac, KarbonView* view ) + virtual VTool * createTool( TDEActionCollection * ac, KarbonView* view ) { VTool * t = new T( view ); TQ_CHECK_PTR(t); diff --git a/karbon/karbon_tool_registry.cc b/karbon/karbon_tool_registry.cc index 5787dd77..6c0506ae 100644 --- a/karbon/karbon_tool_registry.cc +++ b/karbon/karbon_tool_registry.cc @@ -47,7 +47,7 @@ KarbonToolRegistry* KarbonToolRegistry::instance() return KarbonToolRegistry::m_singleton; } -void KarbonToolRegistry::createTools(KActionCollection * ac, KarbonView* view) +void KarbonToolRegistry::createTools(TDEActionCollection * ac, KarbonView* view) { Q_ASSERT(view); diff --git a/karbon/karbon_tool_registry.h b/karbon/karbon_tool_registry.h index dee24d66..a4e66932 100644 --- a/karbon/karbon_tool_registry.h +++ b/karbon/karbon_tool_registry.h @@ -23,7 +23,7 @@ #include <tqvaluevector.h> #include <koffice_export.h> -class KActionCollection; +class TDEActionCollection; class VTool; class KarbonView; class KarbonAbstractToolFactory; @@ -38,7 +38,7 @@ public: static KarbonToolRegistry* instance(); - void createTools( KActionCollection * ac, KarbonView* view ); + void createTools( TDEActionCollection * ac, KarbonView* view ); void add(KarbonAbstractToolFactory* factory); private: diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 864f695d..42d6f51b 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -229,7 +229,7 @@ KarbonView::~KarbonView() static TQt::Dock stringToDock( const TQString& attrPosition ) { - KToolBar::Dock dock = KToolBar::DockTop; + TDEToolBar::Dock dock = TDEToolBar::DockTop; if ( !attrPosition.isEmpty() ) { if ( attrPosition == "top" ) dock = TQt::DockTop; @@ -939,11 +939,11 @@ void KarbonView::initActions() { // view -----> - m_viewAction = new KSelectAction( + m_viewAction = new TDESelectAction( i18n( "View &Mode" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewModeChanged() ), actionCollection(), "view_mode" ); - m_zoomAction = new KSelectAction( + m_zoomAction = new TDESelectAction( i18n( "&Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( zoomChanged() ), actionCollection(), "view_zoom" ); @@ -978,7 +978,7 @@ KarbonView::initActions() KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT( viewZoomIn() ), actionCollection(), "view_zoom_in" ); KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( viewZoomOut() ), actionCollection(), "view_zoom_out" ); - m_showPageMargins = new KToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "view_show_margins" ); + m_showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "view_show_margins" ); connect( m_showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool))); #if KDE_IS_VERSION(3,2,90) m_showPageMargins->setCheckedState(i18n("Hide Page Margins")); @@ -998,114 +998,114 @@ KarbonView::initActions() KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_select_all" ); KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( editDeselectAll() ), actionCollection(), "edit_deselect_all" ); - new KAction( + new TDEAction( i18n( "&Import Graphic..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( fileImportGraphic() ), actionCollection(), "file_import" ); - m_deleteSelectionAction = new KAction( + m_deleteSelectionAction = new TDEAction( i18n( "D&elete" ), "editdelete", TQKeySequence( "Del" ), TQT_TQOBJECT(this), TQT_SLOT( editDeleteSelection() ), actionCollection(), "edit_delete" ); - new KAction( + new TDEAction( i18n( "&History" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( editPurgeHistory() ), actionCollection(), "edit_purge_history" ); // edit <----- // object -----> - new KAction( + new TDEAction( i18n( "&Duplicate" ), "duplicate", TQKeySequence( "Ctrl+D" ), TQT_TQOBJECT(this), TQT_SLOT( selectionDuplicate() ), actionCollection(), "object_duplicate" ); - new KAction( + new TDEAction( i18n( "Bring to &Front" ), "bring_forward", TQKeySequence( "Ctrl+Shift+]" ), TQT_TQOBJECT(this), TQT_SLOT( selectionBringToFront() ), actionCollection(), "object_move_totop" ); - new KAction( + new TDEAction( i18n( "&Raise" ), "raise", TQKeySequence( "Ctrl+]" ), TQT_TQOBJECT(this), TQT_SLOT( selectionMoveUp() ), actionCollection(), "object_move_up" ); - new KAction( + new TDEAction( i18n( "&Lower" ), "lower", TQKeySequence( "Ctrl+[" ), TQT_TQOBJECT(this), TQT_SLOT( selectionMoveDown() ), actionCollection(), "object_move_down" ); - new KAction( + new TDEAction( i18n( "Send to &Back" ), "send_backward", TQKeySequence( "Ctrl+Shift+[" ), TQT_TQOBJECT(this), TQT_SLOT( selectionSendToBack() ), actionCollection(), "object_move_tobottom" ); - new KAction( + new TDEAction( i18n( "Align Left" ), "aoleft", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignHorizontalLeft() ), actionCollection(), "object_align_horizontal_left" ); - new KAction( + new TDEAction( i18n( "Align Center Qt::Horizontal)" ), "aocenterh", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignHorizontalCenter() ), actionCollection(), "object_align_horizontal_center" ); - new KAction( + new TDEAction( i18n( "Align Right" ), "aoright", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignHorizontalRight() ), actionCollection(), "object_align_horizontal_right" ); - new KAction( + new TDEAction( i18n( "Align Top" ), "aotop", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignVerticalTop() ), actionCollection(), "object_align_vertical_top" ); - new KAction( + new TDEAction( i18n( "Align Middle Qt::Vertical)" ), "aocenterv", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignVerticalCenter() ), actionCollection(), "object_align_vertical_center" ); - new KAction( + new TDEAction( i18n( "Align Bottom" ), "aobottom", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignVerticalBottom() ), actionCollection(), "object_align_vertical_bottom" ); - new KAction( + new TDEAction( i18n( "Distribute Center Qt::Horizontal)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalCenter() ), actionCollection(), "object_distribute_horizontal_center" ); - new KAction( + new TDEAction( i18n( "Distribute Gaps Qt::Horizontal)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalGap() ), actionCollection(), "object_distribute_horizontal_gap" ); - new KAction( + new TDEAction( i18n( "Distribute Left Borders" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalLeft() ), actionCollection(), "object_distribute_horizontal_left" ); - new KAction( + new TDEAction( i18n( "Distribute Right Borders" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalRight() ), actionCollection(), "object_distribute_horizontal_right" ); - new KAction( + new TDEAction( i18n( "Distribute Center Qt::Vertical)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalCenter() ), actionCollection(), "object_distribute_vertical_center" ); - new KAction( + new TDEAction( i18n( "Distribute Gaps Qt::Vertical)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalGap() ), actionCollection(), "object_distribute_vertical_gap" ); - new KAction( + new TDEAction( i18n( "Distribute Bottom Borders" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalBottom() ), actionCollection(), "object_distribute_vertical_bottom" ); - new KAction( + new TDEAction( i18n( "Distribute Top Borders" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalTop() ), actionCollection(), "object_distribute_vertical_top" ); - m_showRulerAction = new KToggleAction( i18n( "Show Rulers" ), 0, TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_show_ruler" ); + m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_show_ruler" ); #if KDE_IS_VERSION(3,2,90) m_showRulerAction->setCheckedState(i18n("Hide Rulers")); #endif m_showRulerAction->setToolTip( i18n( "Shows or hides rulers." ) ); m_showRulerAction->setChecked( false ); - m_showGridAction = new KToggleAction( i18n( "Show Grid" ), "view_grid", TQT_TQOBJECT(this), TQT_SLOT( showGrid() ), actionCollection(), "view_show_grid" ); + m_showGridAction = new TDEToggleAction( i18n( "Show Grid" ), "view_grid", TQT_TQOBJECT(this), TQT_SLOT( showGrid() ), actionCollection(), "view_show_grid" ); #if KDE_IS_VERSION(3,2,90) m_showGridAction->setCheckedState(i18n("Hide Grid")); #endif m_showGridAction->setToolTip( i18n( "Shows or hides grid." ) ); //m_showGridAction->setChecked( true ); - m_snapGridAction = new KToggleAction( i18n( "Snap to Grid" ), 0, TQT_TQOBJECT(this), TQT_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" ); + m_snapGridAction = new TDEToggleAction( i18n( "Snap to Grid" ), 0, TQT_TQOBJECT(this), TQT_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" ); m_snapGridAction->setToolTip( i18n( "Snaps to grid." ) ); //m_snapGridAction->setChecked( true ); - m_groupObjects = new KAction( + m_groupObjects = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), TQT_TQOBJECT(this), TQT_SLOT( groupSelection() ), actionCollection(), "selection_group" ); - m_ungroupObjects = new KAction( + m_ungroupObjects = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), TQT_TQOBJECT(this), TQT_SLOT( ungroupSelection() ), actionCollection(), "selection_ungroup" ); - m_closePath = new KAction( + m_closePath = new TDEAction( i18n( "&Close Path" ), TQKeySequence( "Ctrl+U" ), TQT_TQOBJECT(this), TQT_SLOT( closePath() ), actionCollection(), "close_path" ); // object <----- @@ -1128,11 +1128,11 @@ KarbonView::initActions() m_setLineWidth->insertItem( 20.0 ); connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), TQT_TQOBJECT(this), TQT_SLOT( setLineWidth() ) ); - m_configureAction = new KAction( + m_configureAction = new TDEAction( i18n( "Configure Karbon..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( configure() ), actionCollection(), "configure" ); - new KAction( i18n( "Page &Layout..." ), 0, TQT_TQOBJECT(this), + new TDEAction( i18n( "Page &Layout..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( pageLayout() ), actionCollection(), "page_layout" ); m_contextHelpAction = new KoContextHelpAction( actionCollection(), this ); } @@ -1230,13 +1230,13 @@ KarbonView::showRuler() bool KarbonView::showPageMargins() { - return ((KToggleAction*)actionCollection()->action("view_show_margins"))->isChecked(); + return ((TDEToggleAction*)actionCollection()->action("view_show_margins"))->isChecked(); } void KarbonView::togglePageMargins(bool b) { - ((KToggleAction*)actionCollection()->action("view_show_margins"))->setChecked(b); + ((TDEToggleAction*)actionCollection()->action("view_show_margins"))->setChecked(b); m_canvas->repaintAll(); } @@ -1287,7 +1287,7 @@ KarbonView::snapToGrid() void KarbonView::showSelectionPopupMenu( const TQPoint &pos ) { - TQPtrList<KAction> actionList; + TQPtrList<TDEAction> actionList; if( m_groupObjects->isEnabled() ) actionList.append( m_groupObjects ); else if( m_ungroupObjects->isEnabled() ) diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h index 879f5bb0..a3b79465 100644 --- a/karbon/karbon_view.h +++ b/karbon/karbon_view.h @@ -34,10 +34,10 @@ class DCOPObject; class TQLabel; -class KAction; +class TDEAction; class KarbonPart; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KoContextHelpAction; class KoLineStyleAction; @@ -240,21 +240,21 @@ private: VToolBox *m_toolbox; - KAction *m_groupObjects; - KAction *m_ungroupObjects; + TDEAction *m_groupObjects; + TDEAction *m_ungroupObjects; - KAction *m_closePath; + TDEAction *m_closePath; // actions: - KSelectAction *m_zoomAction; - KSelectAction *m_viewAction; - KAction *m_configureAction; - KToggleAction *m_showRulerAction; - KToggleAction *m_showGridAction; - KToggleAction *m_snapGridAction; - KToggleAction *m_showPageMargins; + TDESelectAction *m_zoomAction; + TDESelectAction *m_viewAction; + TDEAction *m_configureAction; + TDEToggleAction *m_showRulerAction; + TDEToggleAction *m_showGridAction; + TDEToggleAction *m_snapGridAction; + TDEToggleAction *m_showPageMargins; KoContextHelpAction *m_contextHelpAction; - KAction *m_deleteSelectionAction; + TDEAction *m_deleteSelectionAction; // line width KoUnitDoubleSpinComboBox *m_setLineWidth; KoLineStyleAction *m_lineStyleAction; diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc index aa5fb3cc..78c2a66e 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.cc +++ b/karbon/plugins/flattenpath/flattenpathplugin.cc @@ -36,7 +36,7 @@ K_EXPORT_COMPONENT_FACTORY( karbon_flattenpathplugin, FlattenPathPluginFactory( FlattenPathPlugin::FlattenPathPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) { - new KAction( + new TDEAction( i18n( "&Flatten Path..." ), "14_flatten", 0, this, TQT_SLOT( slotFlattenPath() ), actionCollection(), "path_flatten" ); diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc index bc8c2001..090561a8 100644 --- a/karbon/plugins/imagetool/vimagetool.cc +++ b/karbon/plugins/imagetool/vimagetool.cc @@ -117,13 +117,13 @@ VImageTool::VInsertImageCmd::unexecute() } void -VImageTool::setup( KActionCollection *collection ) +VImageTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Image Tool" ), "14_image", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Image Tool" ), "14_image", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Image" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/plugins/imagetool/vimagetool.h b/karbon/plugins/imagetool/vimagetool.h index 65b187ea..4aa6f6be 100644 --- a/karbon/plugins/imagetool/vimagetool.h +++ b/karbon/plugins/imagetool/vimagetool.h @@ -39,7 +39,7 @@ public: virtual void activate(); virtual void deactivate(); - virtual void setup( KActionCollection *collection ); + virtual void setup( TDEActionCollection *collection ); virtual TQString uiname() { return i18n( "Image Tool" ); } virtual TQString contextHelp(); virtual TQString statusText(); diff --git a/karbon/plugins/insertknots/insertknotsplugin.cc b/karbon/plugins/insertknots/insertknotsplugin.cc index 55fcde76..19a1e4d5 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.cc +++ b/karbon/plugins/insertknots/insertknotsplugin.cc @@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( karbon_insertknotsplugin, InsertKnotsPluginFactory( InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) { - new KAction( + new TDEAction( i18n( "&Insert Knots..." ), "14_insertknots", 0, this, TQT_SLOT( slotInsertKnots() ), actionCollection(), "path_insert_knots" ); diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc index 28ede19d..1841c5eb 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.cc +++ b/karbon/plugins/roundcorners/roundcornersplugin.cc @@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( karbon_roundcornersplugin, VRoundCornersPluginFactor VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) { - new KAction( + new TDEAction( i18n( "&Round Corners..." ), "14_roundcorners", 0, this, TQT_SLOT( slotRoundCorners() ), actionCollection(), "path_round_corners" ); diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc index fc6da1da..a837e51e 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( karbon_shadoweffectplugin, ShadowEffectPluginFactory ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) { - new KAction( + new TDEAction( i18n( "&Shadow Effect..." ), "shadowRB", 0, this, TQT_SLOT( slotShadowEffect() ), actionCollection(), "object_shadow" ); diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cc b/karbon/plugins/whirlpinch/whirlpinchplugin.cc index ec8e7075..d2b91a18 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.cc +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cc @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( karbon_whirlpinchplugin, WhirlPinchPluginFactory( "k WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) { - new KAction( + new TDEAction( i18n( "&Whirl/Pinch..." ), "14_whirl", 0, this, TQT_SLOT( slotWhirlPinch() ), actionCollection(), "path_whirlpinch" ); diff --git a/karbon/plugins/zoomtool/vzoomtool.cc b/karbon/plugins/zoomtool/vzoomtool.cc index 01a80aaa..beb19a68 100644 --- a/karbon/plugins/zoomtool/vzoomtool.cc +++ b/karbon/plugins/zoomtool/vzoomtool.cc @@ -155,13 +155,13 @@ VZoomTool::recalc() } void -VZoomTool::setup( KActionCollection *collection ) +VZoomTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Zoom Tool" ), "14_zoom", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Zoom Tool" ), "14_zoom", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Zoom" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/plugins/zoomtool/vzoomtool.h b/karbon/plugins/zoomtool/vzoomtool.h index c6f1ffcd..4111ba18 100644 --- a/karbon/plugins/zoomtool/vzoomtool.h +++ b/karbon/plugins/zoomtool/vzoomtool.h @@ -39,7 +39,7 @@ public: virtual void activate(); virtual void deactivate(); - virtual void setup( KActionCollection *collection ); + virtual void setup( TDEActionCollection *collection ); virtual TQString uiname() { return i18n( "Zoom Tool" ); } virtual TQString contextHelp(); virtual TQString statusText(); diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc index b0f981af..b8855c50 100644 --- a/karbon/tools/vellipsetool.cc +++ b/karbon/tools/vellipsetool.cc @@ -262,13 +262,13 @@ VEllipseTool::showDialog() const } void -VEllipseTool::setup( KActionCollection *collection ) +VEllipseTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Ellipse" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h index f43ad7fd..4a46aad5 100644 --- a/karbon/tools/vellipsetool.h +++ b/karbon/tools/vellipsetool.h @@ -67,7 +67,7 @@ public: VEllipseTool( KarbonView *view ); virtual ~VEllipseTool(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Ellipse Tool" ); } virtual VPath *shape( bool interactive = false ) const; diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc index 95752f52..68d7972e 100644 --- a/karbon/tools/vgradienttool.cc +++ b/karbon/tools/vgradienttool.cc @@ -470,13 +470,13 @@ VGradientTool::showDialog() const } void -VGradientTool::setup( KActionCollection *collection ) +VGradientTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Gradient Tool" ), "14_gradient", TQt::Key_G, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Gradient Tool" ), "14_gradient", TQt::Key_G, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Gradient" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vgradienttool.h b/karbon/tools/vgradienttool.h index 4c107ffb..bb1f17f8 100644 --- a/karbon/tools/vgradienttool.h +++ b/karbon/tools/vgradienttool.h @@ -40,7 +40,7 @@ public: virtual void activate(); virtual void deactivate(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Gradient Tool" ); } virtual TQString statusText(); diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 11421fcc..963f1a61 100644 --- a/karbon/tools/vpatterntool.cc +++ b/karbon/tools/vpatterntool.cc @@ -453,13 +453,13 @@ VPatternTool::showDialog() const } void -VPatternTool::setup( KActionCollection *collection ) +VPatternTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Pattern Tool" ), "14_pattern", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Pattern Tool" ), "14_pattern", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Pattern" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vpatterntool.h b/karbon/tools/vpatterntool.h index c125740c..36cc88f7 100644 --- a/karbon/tools/vpatterntool.h +++ b/karbon/tools/vpatterntool.h @@ -70,7 +70,7 @@ public: virtual void activate(); virtual void deactivate(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Pattern Tool" ); } virtual TQString contextHelp(); virtual bool showDialog() const; diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc index 9f2759b3..a15dbf2d 100644 --- a/karbon/tools/vpenciltool.cc +++ b/karbon/tools/vpenciltool.cc @@ -396,13 +396,13 @@ VPencilTool::showDialog() const } void -VPencilTool::setup( KActionCollection *collection ) +VPencilTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Pencil Tool" ), "14_pencil", TQt::SHIFT+TQt::Key_P, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Pencil Tool" ), "14_pencil", TQt::SHIFT+TQt::Key_P, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Pencil" ) ); m_action->setExclusiveGroup( "freehand" ); //m_ownAction = true; diff --git a/karbon/tools/vpenciltool.h b/karbon/tools/vpenciltool.h index 0abdffe4..3667f294 100644 --- a/karbon/tools/vpenciltool.h +++ b/karbon/tools/vpenciltool.h @@ -88,7 +88,7 @@ class VPencilTool : public VTool virtual void activate(); virtual void deactivate(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Pencil Tool" ); } virtual TQString contextHelp(); virtual enumToolType toolType() { return TOOL_FREEHAND; } diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc index fdd02299..18895cea 100644 --- a/karbon/tools/vpolygontool.cc +++ b/karbon/tools/vpolygontool.cc @@ -148,15 +148,15 @@ VPolygonTool::showDialog() const } void -VPolygonTool::setup( KActionCollection *collection ) +VPolygonTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - KShortcut shortcut( TQt::Key_Plus ); - shortcut.append(KShortcut( TQt::Key_F9 ) ); - m_action = new KRadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + TDEShortcut shortcut( TQt::Key_Plus ); + shortcut.append(TDEShortcut( TQt::Key_F9 ) ); + m_action = new TDERadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Polygon" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h index cb1dabab..dead8534 100644 --- a/karbon/tools/vpolygontool.h +++ b/karbon/tools/vpolygontool.h @@ -34,7 +34,7 @@ public: VPolygonTool( KarbonView *view ); virtual ~VPolygonTool(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Polygon Tool" ); } diff --git a/karbon/tools/vpolylinetool.cc b/karbon/tools/vpolylinetool.cc index 083ee1ea..e1689419 100644 --- a/karbon/tools/vpolylinetool.cc +++ b/karbon/tools/vpolylinetool.cc @@ -480,15 +480,15 @@ VPolylineTool::accept() } void -VPolylineTool::setup( KActionCollection *collection ) +VPolylineTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - KShortcut shortcut( TQt::Key_Plus ); - shortcut.append( KShortcut( TQt::Key_F9 ) ); - m_action = new KRadioAction( i18n( "Polyline Tool" ), "14_polyline", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + TDEShortcut shortcut( TQt::Key_Plus ); + shortcut.append( TDEShortcut( TQt::Key_F9 ) ); + m_action = new TDERadioAction( i18n( "Polyline Tool" ), "14_polyline", shortcut, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Polyline" ) ); m_action->setExclusiveGroup( "freehand" ); //m_ownAction = true; diff --git a/karbon/tools/vpolylinetool.h b/karbon/tools/vpolylinetool.h index 54124e07..6743da21 100644 --- a/karbon/tools/vpolylinetool.h +++ b/karbon/tools/vpolylinetool.h @@ -55,7 +55,7 @@ class VPolylineTool : public VTool VPolylineTool( KarbonView *view ); ~VPolylineTool(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual void activate(); virtual void deactivate(); diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc index 1b9d9c0f..5b0fcffe 100644 --- a/karbon/tools/vrectangletool.cc +++ b/karbon/tools/vrectangletool.cc @@ -128,13 +128,13 @@ VRectangleTool::showDialog() const } void -VRectangleTool::setup( KActionCollection *collection ) +VRectangleTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Rectangle" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h index ce39a119..7da59745 100644 --- a/karbon/tools/vrectangletool.h +++ b/karbon/tools/vrectangletool.h @@ -36,7 +36,7 @@ public: VRectangleTool( KarbonView *view ); virtual ~VRectangleTool(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Rectangle Tool" ); } virtual VPath* shape( bool interactive = false ) const; diff --git a/karbon/tools/vrotatetool.cc b/karbon/tools/vrotatetool.cc index 5f39a293..f8d341dc 100644 --- a/karbon/tools/vrotatetool.cc +++ b/karbon/tools/vrotatetool.cc @@ -160,13 +160,13 @@ VRotateTool::recalc() } void -VRotateTool::setup( KActionCollection *collection ) +VRotateTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Rotate Tool" ), "14_rotate", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Rotate Tool" ), "14_rotate", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Rotate" ) ); m_action->setExclusiveGroup( "manipulation" ); //m_ownAction = true; diff --git a/karbon/tools/vrotatetool.h b/karbon/tools/vrotatetool.h index 1829936b..1d7e4b6c 100644 --- a/karbon/tools/vrotatetool.h +++ b/karbon/tools/vrotatetool.h @@ -32,7 +32,7 @@ public: virtual void activate(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Rotate Tool" ); } virtual enumToolType toolType() { return TOOL_MANIPULATION; } virtual TQString statusText(); diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc index c88bacd8..02f694c6 100644 --- a/karbon/tools/vroundrecttool.cc +++ b/karbon/tools/vroundrecttool.cc @@ -164,13 +164,13 @@ VRoundRectTool::showDialog() const } void -VRoundRectTool::setup( KActionCollection *collection ) +VRoundRectTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Round Rectangle" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h index 5149ff2f..27e4ca3d 100644 --- a/karbon/tools/vroundrecttool.h +++ b/karbon/tools/vroundrecttool.h @@ -40,7 +40,7 @@ public: virtual ~VRoundRectTool(); virtual bool showDialog() const; - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Round Rectangle Tool" ); } virtual VPath* shape( bool interactive = false ) const; diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc index 7ef25c5e..7123b71a 100644 --- a/karbon/tools/vselectnodestool.cc +++ b/karbon/tools/vselectnodestool.cc @@ -422,13 +422,13 @@ VSelectNodesTool::recalc() } void -VSelectNodesTool::setup( KActionCollection *collection ) +VSelectNodesTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Select Nodes Tool" ), "14_selectnodes", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Select Nodes Tool" ), "14_selectnodes", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Select Nodes" ) ); m_action->setExclusiveGroup( "select" ); //m_ownAction = true; diff --git a/karbon/tools/vselectnodestool.h b/karbon/tools/vselectnodestool.h index f3815b2d..1bc675b8 100644 --- a/karbon/tools/vselectnodestool.h +++ b/karbon/tools/vselectnodestool.h @@ -30,7 +30,7 @@ public: virtual void activate(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Select Nodes Tool" ); } virtual enumToolType toolType() { return TOOL_SELECT; } virtual TQString statusText(); diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc index e6b87f62..b2c28d66 100644 --- a/karbon/tools/vselecttool.cc +++ b/karbon/tools/vselecttool.cc @@ -597,13 +597,13 @@ VSelectTool::refreshUnit() } void -VSelectTool::setup( KActionCollection *collection ) +VSelectTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Select Tool" ), "14_select", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Select Tool" ), "14_select", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Select" ) ); m_action->setExclusiveGroup( "select" ); //m_ownAction = true; diff --git a/karbon/tools/vselecttool.h b/karbon/tools/vselecttool.h index 2785b66f..e7791172 100644 --- a/karbon/tools/vselecttool.h +++ b/karbon/tools/vselecttool.h @@ -51,7 +51,7 @@ public: VSelectTool( KarbonView *view ); virtual ~VSelectTool(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Select Tool" ); } virtual enumToolType toolType() { return TOOL_SELECT; } diff --git a/karbon/tools/vsheartool.cc b/karbon/tools/vsheartool.cc index 19e11161..d7fd40b9 100644 --- a/karbon/tools/vsheartool.cc +++ b/karbon/tools/vsheartool.cc @@ -204,13 +204,13 @@ VShearTool::recalc() } void -VShearTool::setup( KActionCollection *collection ) +VShearTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Shear Tool" ), "14_shear", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Shear Tool" ), "14_shear", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Shear" ) ); m_action->setExclusiveGroup( "manipulation" ); //m_ownAction = true; diff --git a/karbon/tools/vsheartool.h b/karbon/tools/vsheartool.h index 8a576014..ce4d5ba0 100644 --- a/karbon/tools/vsheartool.h +++ b/karbon/tools/vsheartool.h @@ -30,7 +30,7 @@ public: virtual void activate(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Shear Tool" ); } virtual enumToolType toolType() { return TOOL_MANIPULATION; } virtual uint priority() { return 1; } diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc index d38ca972..d46c4180 100644 --- a/karbon/tools/vsinustool.cc +++ b/karbon/tools/vsinustool.cc @@ -147,13 +147,13 @@ VSinusTool::showDialog() const } void -VSinusTool::setup( KActionCollection *collection ) +VSinusTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Sinus" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h index 4aa1c464..1a0ebaa4 100644 --- a/karbon/tools/vsinustool.h +++ b/karbon/tools/vsinustool.h @@ -34,7 +34,7 @@ public: VSinusTool( KarbonView *view ); virtual ~VSinusTool(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Sinus Tool" ); } diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc index e0c78e1d..e0b99c9e 100644 --- a/karbon/tools/vspiraltool.cc +++ b/karbon/tools/vspiraltool.cc @@ -198,13 +198,13 @@ VSpiralTool::showDialog() const } void -VSpiralTool::setup( KActionCollection *collection ) +VSpiralTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Spiral" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h index 072e3bea..05694267 100644 --- a/karbon/tools/vspiraltool.h +++ b/karbon/tools/vspiraltool.h @@ -37,7 +37,7 @@ public: VSpiralTool( KarbonView *view ); virtual ~VSpiralTool(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Spiral Tool" ); } diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc index 114bab75..e152ad31 100644 --- a/karbon/tools/vstartool.cc +++ b/karbon/tools/vstartool.cc @@ -231,15 +231,15 @@ VStarTool::showDialog() const } void -VStarTool::setup( KActionCollection *collection ) +VStarTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - KShortcut shortcut( TQt::Key_Plus ); - shortcut.append(KShortcut( TQt::Key_F9 ) ); - m_action = new KRadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + TDEShortcut shortcut( TQt::Key_Plus ); + shortcut.append(TDEShortcut( TQt::Key_F9 ) ); + m_action = new TDERadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Draw a star" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h index 8b5d04c0..1d35ad43 100644 --- a/karbon/tools/vstartool.h +++ b/karbon/tools/vstartool.h @@ -72,7 +72,7 @@ public: virtual ~VStarTool(); virtual bool showDialog() const; - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQString uiname() { return i18n( "Star Tool" ); } virtual VPath* shape( bool interactive = false ) const; diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index a08b7f3c..ca3ba1ea 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -332,11 +332,11 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) TQGridLayout* textLayout = new TQGridLayout( textWidget ); TQStringList list; - KFontChooser::getFontList( list, KFontChooser::SmoothScalableFonts ); + TDEFontChooser::getFontList( list, TDEFontChooser::SmoothScalableFonts ); textLayout->setMargin( 3 ); textLayout->setSpacing( 2 ); - textLayout->addMultiCellWidget( m_fontCombo = new KFontCombo( list, textWidget ), 0, 0, 0, 2 ); + textLayout->addMultiCellWidget( m_fontCombo = new TDEFontCombo( list, textWidget ), 0, 0, 0, 2 ); textLayout->addWidget( m_fontSize = new KIntNumInput( textWidget ), 1, 0 ); textLayout->addWidget( m_boldCheck = new TQCheckBox( i18n( "Bold" ), textWidget ), 1, 1 ); textLayout->addWidget( m_italicCheck = new TQCheckBox( i18n( "Italic" ), textWidget ), 1, 2 ); @@ -1142,13 +1142,13 @@ VTextTool::mouseDragShiftReleased() } void -VTextTool::setup( KActionCollection *collection ) +VTextTool::setup( TDEActionCollection *collection ) { - m_action = static_cast<KRadioAction *>(collection -> action( name() ) ); + m_action = static_cast<TDERadioAction *>(collection -> action( name() ) ); if( m_action == 0 ) { - m_action = new KRadioAction( i18n( "Text Tool" ), "14_text", TQt::SHIFT+TQt::Key_T, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Text Tool" ), "14_text", TQt::SHIFT+TQt::Key_T, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Text Tool" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h index 6cf02c11..e88142ac 100644 --- a/karbon/tools/vtexttool.h +++ b/karbon/tools/vtexttool.h @@ -35,7 +35,7 @@ #include "vtext.h" #include "vtool.h" -class KFontCombo; +class TDEFontCombo; class KIntNumInput; class TQCheckBox; class TQLineEdit; @@ -136,7 +136,7 @@ public slots: protected: TQTabWidget* m_tabWidget; - KFontCombo* m_fontCombo; + TDEFontCombo* m_fontCombo; TQCheckBox* m_boldCheck; TQCheckBox* m_italicCheck; KIntNumInput* m_fontSize; @@ -157,7 +157,7 @@ public: VTextTool( KarbonView *view ); ~VTextTool(); - virtual void setup (KActionCollection *collection ); + virtual void setup (TDEActionCollection *collection ); virtual TQString uiname() { return i18n( "Text Tool" ); } virtual TQString contextHelp(); diff --git a/karbon/vtool.h b/karbon/vtool.h index 4c2b0f3d..48533ec6 100644 --- a/karbon/vtool.h +++ b/karbon/vtool.h @@ -25,7 +25,7 @@ #include <klocale.h> #include <KoPoint.h> #include <koffice_export.h> -class KRadioAction; +class TDERadioAction; class KarbonPart; class KarbonView; class TQEvent; @@ -141,14 +141,14 @@ public: * Called after tool creation. A tool is supposed to hook its associated action * into the specified action collection here. */ - virtual void setup(KActionCollection *) {} + virtual void setup(TDEActionCollection *) {} /** * Returns the tool's associated action object. * * @return the associated action */ - KRadioAction *action() const { return m_action; } + TDERadioAction *action() const { return m_action; } /** * Draws the actual tool state. @@ -306,7 +306,7 @@ protected: bool altPressed() const { return m_altPressed; } /** The tool's action object. */ - KRadioAction *m_action; + TDERadioAction *m_action; /** Helper function. Returns the parent view's toolcontroller. */ VToolController *toolController() const; diff --git a/karbon/vtoolcontroller.cc b/karbon/vtoolcontroller.cc index 03cc9ee8..4a8eaa9f 100644 --- a/karbon/vtoolcontroller.cc +++ b/karbon/vtoolcontroller.cc @@ -104,7 +104,7 @@ VToolController::keyEvent( TQEvent* event ) } void -VToolController::setUp( KActionCollection *ac, VToolBox * toolbox ) +VToolController::setUp( TDEActionCollection *ac, VToolBox * toolbox ) { if( m_setup ) { diff --git a/karbon/vtoolcontroller.h b/karbon/vtoolcontroller.h index 47667172..658df126 100644 --- a/karbon/vtoolcontroller.h +++ b/karbon/vtoolcontroller.h @@ -48,7 +48,7 @@ public: const TQDict<VTool> &tools() { return m_tools; } - void setUp( KActionCollection *ac, VToolBox * toolbox ); + void setUp( TDEActionCollection *ac, VToolBox * toolbox ); void resetToolBox( VToolBox * toolbox ); VTool *findTool( const TQString &toolName ) const; diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc index c90c655d..22c58b43 100644 --- a/karbon/widgets/vgradienttabwidget.cc +++ b/karbon/widgets/vgradienttabwidget.cc @@ -215,7 +215,7 @@ void VGradientTabWidget::setupUI() predefLayout->setSpacing( 3 ); predefLayout->setMargin( 6 ); predefLayout->addRowSpacing( 0, 12 ); - predefLayout->addMultiCellWidget( m_predefGradientsView = new KListBox( predefGroup ), 1, 1, 0, 2 ); + predefLayout->addMultiCellWidget( m_predefGradientsView = new TDEListBox( predefGroup ), 1, 1, 0, 2 ); predefLayout->addWidget( m_predefDelete = new TQPushButton( i18n( "&Delete" ), predefGroup ), 2, 0 ); predefLayout->addWidget( m_predefImport = new TQPushButton( i18n( "&Import" ), predefGroup ), 2, 1 ); m_predefImport->setEnabled( false ); diff --git a/karbon/widgets/vgradienttabwidget.h b/karbon/widgets/vgradienttabwidget.h index aecd9950..f29e7ea0 100644 --- a/karbon/widgets/vgradienttabwidget.h +++ b/karbon/widgets/vgradienttabwidget.h @@ -29,7 +29,7 @@ class KComboBox; class VGradientWidget; -class KListBox; +class TDEListBox; class KIntNumInput; class TQPushButton; class TQGroupBox; @@ -117,7 +117,7 @@ class KARBONBASE_EXPORT VGradientTabWidget : public TQTabWidget KComboBox *m_gradientRepeat; KComboBox *m_gradientType; VGradientPreview *m_gradientPreview; - KListBox *m_predefGradientsView; + TDEListBox *m_predefGradientsView; TQPushButton *m_predefDelete; TQPushButton *m_predefImport; TQPushButton *m_addToPredefs; diff --git a/karbon/widgets/vselecttoolbar.cc b/karbon/widgets/vselecttoolbar.cc index fa01ba46..ff2d3585 100644 --- a/karbon/widgets/vselecttoolbar.cc +++ b/karbon/widgets/vselecttoolbar.cc @@ -33,7 +33,7 @@ #include "vtransformcmd.h" #include <KoRect.h> -VSelectToolBar::VSelectToolBar( KarbonView *view, const char* name ) : KToolBar( view, name ), m_view( view ) +VSelectToolBar::VSelectToolBar( KarbonView *view, const char* name ) : TDEToolBar( view, name ), m_view( view ) { setCaption( i18n( "Object Properties" ) ); TQLabel *x_label = new TQLabel( i18n( "X:" ), this, "kde toolbar widget" ); diff --git a/karbon/widgets/vselecttoolbar.h b/karbon/widgets/vselecttoolbar.h index c922d36f..17a38981 100644 --- a/karbon/widgets/vselecttoolbar.h +++ b/karbon/widgets/vselecttoolbar.h @@ -27,7 +27,7 @@ class KoUnitDoubleSpinBox; class KarbonView; -class VSelectToolBar : public KToolBar +class VSelectToolBar : public TDEToolBar { Q_OBJECT diff --git a/karbon/widgets/vtoolbox.cc b/karbon/widgets/vtoolbox.cc index d3f12b7e..e048555c 100644 --- a/karbon/widgets/vtoolbox.cc +++ b/karbon/widgets/vtoolbox.cc @@ -21,7 +21,7 @@ #include "vtoolbox.h" #include "vtool.h" -VToolBox::VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance ) : KoToolBox( mainWin, name, instance, 5 ) +VToolBox::VToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* instance ) : KoToolBox( mainWin, name, instance, 5 ) { } diff --git a/karbon/widgets/vtoolbox.h b/karbon/widgets/vtoolbox.h index 857b72e7..fd939b60 100644 --- a/karbon/widgets/vtoolbox.h +++ b/karbon/widgets/vtoolbox.h @@ -31,7 +31,7 @@ class VToolBox : public KoToolBox public: - VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance ); + VToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* instance ); virtual ~VToolBox() {} void registerTool( VTool * ); |