diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc index 853b11a2..50ba12a5 100644 --- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc +++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc @@ -37,7 +37,7 @@ WetnessVisualisationFilter::WetnessVisualisationFilter(KisView* view) // XXX this needs to work on a per-layer basis! -void WetnessVisualisationFilter::setAction(KToggleAction* action) { +void WetnessVisualisationFilter::setAction(TDEToggleAction* action) { m_action = action; if (!m_action) return; diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h index eb54a90c..7311cd04 100644 --- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h +++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h @@ -34,7 +34,7 @@ class WetnessVisualisationFilter : public TQObject public: WetnessVisualisationFilter(KisView* view); virtual ~WetnessVisualisationFilter() {} - void setAction(KToggleAction* action); + void setAction(TDEToggleAction* action); // XXX: Figure out a way to match a filter exactly to a colorspace virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; virtual bool workWith(KisColorSpace* cs) { return (cs->id() == KisID("WET")); }; @@ -44,7 +44,7 @@ private slots: private: KisView * m_view; - KToggleAction * m_action; + TDEToggleAction * m_action; TQTimer m_timer; }; diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index 3bb8566d..04dd887d 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -105,7 +105,7 @@ WetPlugin::WetPlugin(TQObject *parent, const char *name, const TQStringList &) m_view = dynamic_cast(parent); // Wetness visualisation WetnessVisualisationFilter * wf = new WetnessVisualisationFilter(m_view); - wf->setAction(new KToggleAction(i18n("Wetness Visualisation"), 0, 0, wf, + wf->setAction(new TDEToggleAction(i18n("Wetness Visualisation"), 0, 0, wf, TQT_SLOT(slotActivated()), actionCollection(), "wetnessvisualisation")); // Create the wet palette diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index afb78fdd..66fc04cf 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -2748,7 +2748,7 @@ in the constructor, you have to call loadAsync. - + @@ -2786,7 +2786,7 @@ in the constructor, you have to call loadAsync. - + @@ -3149,60 +3149,60 @@ in the constructor, you have to call loadAsync. - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + @@ -3212,8 +3212,8 @@ in the constructor, you have to call loadAsync. - - + + @@ -53537,27 +53537,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -53567,7 +53567,7 @@ in the constructor, you have to call loadAsync. - +
@@ -53592,52 +53592,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -53647,12 +53647,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -53662,72 +53662,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -53747,52 +53747,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -53802,7 +53802,7 @@ in the constructor, you have to call loadAsync. - +
@@ -53852,12 +53852,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -54813,7 +54813,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -54833,7 +54833,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -54853,7 +54853,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -54873,7 +54873,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -54893,7 +54893,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -54933,7 +54933,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55033,7 +55033,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55053,7 +55053,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55073,7 +55073,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55093,7 +55093,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55113,7 +55113,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55133,7 +55133,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55153,7 +55153,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55173,7 +55173,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55193,7 +55193,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55213,7 +55213,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55253,7 +55253,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55273,7 +55273,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55313,7 +55313,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55333,7 +55333,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55353,7 +55353,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55373,7 +55373,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55393,7 +55393,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55413,7 +55413,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55433,7 +55433,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55453,7 +55453,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55473,7 +55473,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55493,7 +55493,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55513,7 +55513,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55533,7 +55533,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55553,7 +55553,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55573,7 +55573,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55653,7 +55653,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55673,7 +55673,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55693,7 +55693,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55713,7 +55713,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55733,7 +55733,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55753,7 +55753,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55773,7 +55773,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55793,7 +55793,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55813,7 +55813,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55833,7 +55833,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -55873,7 +55873,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -56073,7 +56073,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -56093,7 +56093,7 @@ in the constructor, you have to call loadAsync.
- +
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index 7c15e5f8..539d9cf1 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -108,7 +108,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -289,7 +289,7 @@ XXX: Should this be the basis for simple scriptability? Have every controller re - + @@ -3169,12 +3169,12 @@ MITCHELL_FILTER - + - + @@ -5249,7 +5249,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5313,7 +5313,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18831,97 +18831,97 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19475,7 +19475,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19495,7 +19495,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19515,7 +19515,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19535,7 +19535,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19555,7 +19555,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19575,7 +19575,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19595,7 +19595,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19615,7 +19615,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19635,7 +19635,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19655,7 +19655,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19675,7 +19675,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19695,7 +19695,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19715,7 +19715,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19735,7 +19735,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19755,7 +19755,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19775,7 +19775,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19795,7 +19795,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19815,7 +19815,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19835,7 +19835,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34576,7 +34576,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34590,7 +34590,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34609,7 +34609,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34951,7 +34951,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34965,7 +34965,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34984,7 +34984,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -36123,7 +36123,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -36922,7 +36922,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37595,7 +37595,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37609,7 +37609,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37628,7 +37628,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39545,7 +39545,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39559,7 +39559,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39578,7 +39578,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 6858baf2..b440e3f5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -107,13 +107,13 @@ void KisToolBrush::endPaint() } -void KisToolBrush::setup(KActionCollection *collection) +void KisToolBrush::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Brush"), + m_action = new TDERadioAction(i18n("&Brush"), "tool_freehand", TQt::Key_B, this, TQT_SLOT(activate()), collection, name()); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.h b/chalk/plugins/tools/defaulttools/kis_tool_brush.h index e0c5b3a9..bd932ae5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.h @@ -42,7 +42,7 @@ public: KisToolBrush(); virtual ~KisToolBrush(); virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 0; } TQWidget* createOptionWidget(TQWidget* parent); @@ -73,7 +73,7 @@ public: KisToolBrushFactory() : super() {}; virtual ~KisToolBrushFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolBrush(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index 3eb7468d..9f6b52ae 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -209,12 +209,12 @@ void KisToolColorPicker::displayPickedColor() } } -void KisToolColorPicker::setup(KActionCollection *collection) +void KisToolColorPicker::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Color picker")); m_action->setExclusiveGroup("tools"); m_ownAction = true; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h index d8c0459a..e7960fd3 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h @@ -40,7 +40,7 @@ public: public: virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual void buttonPress(KisButtonPressEvent *e); virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); @@ -74,7 +74,7 @@ public: KisToolColorPickerFactory() : super() {}; virtual ~KisToolColorPickerFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolColorPicker(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc index 341bbe9a..0718f116 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc @@ -83,12 +83,12 @@ void KisToolDuplicate::buttonPress(KisButtonPressEvent *e) } -void KisToolDuplicate::setup(KActionCollection *collection) +void KisToolDuplicate::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Duplicate Brush"), + m_action = new TDERadioAction(i18n("&Duplicate Brush"), "tool_duplicate", TQt::Key_C, this, TQT_SLOT(activate()), collection, name()); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h index f5636dd4..a7fd92df 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h @@ -40,7 +40,7 @@ public: KisToolDuplicate(); virtual ~KisToolDuplicate(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_FREEHAND; } virtual TQ_UINT32 priority() { return 0; } virtual void buttonPress(KisButtonPressEvent *e); @@ -77,7 +77,7 @@ public: KisToolDuplicateFactory() : super() {}; virtual ~KisToolDuplicateFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolDuplicate(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc index 65593c23..4cc7d2f6 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc @@ -163,14 +163,14 @@ void KisToolEllipse::draw(const KisPoint& start, const KisPoint& end ) p.end (); } -void KisToolEllipse::setup(KActionCollection *collection) +void KisToolEllipse::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F7)); - m_action = new KRadioAction(i18n("&Ellipse"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F7)); + m_action = new TDERadioAction(i18n("&Ellipse"), "tool_ellipse", shortcut, this, diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h index 6d61d6f6..09311a30 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h @@ -49,7 +49,7 @@ public: // KisToolPaint interface // - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_SHAPE; } virtual void buttonPress(KisButtonPressEvent *event); @@ -77,7 +77,7 @@ public: KisToolEllipseFactory() : super() {}; virtual ~KisToolEllipseFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolEllipse(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index f15bf778..93976d6a 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -212,12 +212,12 @@ void KisToolFill::slotSetFillSelection(bool state) m_checkSampleMerged->setEnabled(!state); } -void KisToolFill::setup(KActionCollection *collection) +void KisToolFill::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Fill"), + m_action = new TDERadioAction(i18n("&Fill"), "tool_color_fill", TQt::Key_F, this, diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.h b/chalk/plugins/tools/defaulttools/kis_tool_fill.h index 72d0a230..09df0851 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.h @@ -31,7 +31,7 @@ class TQWidget; class TQLabel; class TQCheckBox; class KIntNumInput; -class KActionCollection; +class TDEActionCollection; class KisToolFill : public KisToolPaint { @@ -44,7 +44,7 @@ public: KisToolFill(); virtual ~KisToolFill(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_FILL; } virtual TQ_UINT32 priority() { return 0; } @@ -92,7 +92,7 @@ public: KisToolFillFactory() : super() {}; virtual ~KisToolFillFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisToolFill * t = new KisToolFill(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 46ba1f75..6801cf40 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -290,12 +290,12 @@ void KisToolGradient::slotSetAntiAliasThreshold(double value) m_antiAliasThreshold = value; } -void KisToolGradient::setup(KActionCollection *collection) +void KisToolGradient::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Gradient"), + m_action = new TDERadioAction(i18n("&Gradient"), "tool_gradient", TQt::Key_G, this, TQT_SLOT(activate()), collection, name()); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h index 63cdf458..f5b6130f 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h @@ -54,7 +54,7 @@ public: KisToolGradient(); virtual ~KisToolGradient(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_FILL; } virtual TQ_UINT32 priority() { return 1; } @@ -109,7 +109,7 @@ public: KisToolGradientFactory() : super() {}; virtual ~KisToolGradientFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolGradient(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc index 960d19f6..5a024bf0 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc @@ -231,12 +231,12 @@ void KisToolLine::paintLine(KisCanvasPainter& gc, const TQRect&) } } -void KisToolLine::setup(KActionCollection *collection) +void KisToolLine::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Line"), + m_action = new TDERadioAction(i18n("&Line"), "tool_line", TQt::Key_L, this, TQT_SLOT(activate()), collection, name()); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.h b/chalk/plugins/tools/defaulttools/kis_tool_line.h index 117e550b..d401a797 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.h @@ -46,7 +46,7 @@ class KisToolLine : public KisToolPaint { KisToolLine(); virtual ~KisToolLine(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 1; } virtual void update(KisCanvasSubject *subject); @@ -84,7 +84,7 @@ public: KisToolLineFactory() : super() {}; virtual ~KisToolLineFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolLine(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cc index 7c8733c9..d7a2bbb6 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cc @@ -95,12 +95,12 @@ void KisToolMove::buttonRelease(KisButtonReleaseEvent *e) } } -void KisToolMove::setup(KActionCollection *collection) +void KisToolMove::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Move"), + m_action = new TDERadioAction(i18n("&Move"), "tool_move", TQt::SHIFT+TQt::Key_V, this, diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.h b/chalk/plugins/tools/defaulttools/kis_tool_move.h index 0b27b10a..59cf735d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_move.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_move.h @@ -43,7 +43,7 @@ public: virtual void update(KisCanvasSubject *subject); public: - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } virtual TQ_UINT32 priority() { return 2; } @@ -74,7 +74,7 @@ public: KisToolMoveFactory() : super() {}; virtual ~KisToolMoveFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolMove(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc index f7a92dcb..287ba2f4 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc @@ -80,12 +80,12 @@ void KisToolPan::buttonRelease(KisButtonReleaseEvent *e) } } -void KisToolPan::setup(KActionCollection *collection) +void KisToolPan::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Pan")); m_action->setExclusiveGroup("tools"); m_ownAction = true; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.h b/chalk/plugins/tools/defaulttools/kis_tool_pan.h index fa052292..e6bbc91e 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_pan.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.h @@ -40,7 +40,7 @@ public: virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_VIEW; } virtual TQ_UINT32 priority() { return 1; } @@ -66,7 +66,7 @@ public: KisToolPanFactory() : super() {}; virtual ~KisToolPanFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolPan(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc index b8387d78..abfd1362 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc @@ -166,12 +166,12 @@ void KisToolRectangle::draw(const KisPoint& start, const KisPoint& end ) p.end (); } -void KisToolRectangle::setup(KActionCollection *collection) +void KisToolRectangle::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Rectangle"), + m_action = new TDERadioAction(i18n("&Rectangle"), "tool_rectangle", TQt::Key_F6, this, diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h index 43c83e65..dc56f9e2 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h @@ -54,7 +54,7 @@ public: // KisToolPaint interface // - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 2; } virtual void buttonPress(KisButtonPressEvent *event); @@ -82,7 +82,7 @@ public: KisToolRectangleFactory() : super() {}; virtual ~KisToolRectangleFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolRectangle(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index 392fa212..02626efe 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -155,7 +155,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) } void KisToolText::setFont() { - KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); + TDEFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); } @@ -177,12 +177,12 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent) return widget; } -void KisToolText::setup(KActionCollection *collection) +void KisToolText::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("T&ext"), + m_action = new TDERadioAction(i18n("T&ext"), "tool_text", TQt::SHIFT+TQt::Key_T, this, diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.h b/chalk/plugins/tools/defaulttools/kis_tool_text.h index 5e49cbd3..9acd2465 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.h @@ -41,7 +41,7 @@ public: virtual ~KisToolText(); virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_FILL; } virtual TQ_UINT32 priority() { return 2; } virtual void buttonPress(KisButtonPressEvent*); @@ -68,7 +68,7 @@ public: KisToolTextFactory() : super() {}; virtual ~KisToolTextFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolText(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc index eda09f6e..fda422c5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc @@ -176,12 +176,12 @@ void KisToolZoom::paintOutline(KisCanvasPainter& gc, const TQRect&) } } -void KisToolZoom::setup(KActionCollection *collection) +void KisToolZoom::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Zoom")); m_action->setExclusiveGroup("tools"); m_ownAction = true; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.h b/chalk/plugins/tools/defaulttools/kis_tool_zoom.h index 7ad9c510..ca084ca3 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.h @@ -43,7 +43,7 @@ public: virtual void update(KisCanvasSubject *subject); public: - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_VIEW; } virtual TQ_UINT32 priority() { return 2; } @@ -85,7 +85,7 @@ public: KisToolZoomFactory() : super() {}; virtual ~KisToolZoomFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolZoom(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc index 85772397..139d99b9 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc @@ -202,12 +202,12 @@ void KisToolMoveSelection::buttonRelease(KisButtonReleaseEvent *e) } } -void KisToolMoveSelection::setup(KActionCollection *collection) +void KisToolMoveSelection::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Move selection"), + m_action = new TDERadioAction(i18n("&Move selection"), "tool_move", TQt::SHIFT+TQt::Key_V, this, diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h index 7ed98a53..2809cb85 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h @@ -37,7 +37,7 @@ public: virtual void update(KisCanvasSubject *subject); public: - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SELECT; } virtual TQ_UINT32 priority() { return 10; } @@ -60,7 +60,7 @@ public: KisToolMoveSelectionFactory() : super() {}; virtual ~KisToolMoveSelectionFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolMoveSelection(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index c2ca5405..478e5904 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -127,12 +127,12 @@ void KisToolSelectBrush::endPaint() } -void KisToolSelectBrush::setup(KActionCollection *collection) +void KisToolSelectBrush::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Selection Brush"), + m_action = new TDERadioAction(i18n("&Selection Brush"), "tool_brush_selection", "Ctrl+Shift+B", this, TQT_SLOT(activate()), collection, name()); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h index 581269d0..99cc98da 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h @@ -44,7 +44,7 @@ public: KisToolSelectBrush(); virtual ~KisToolSelectBrush(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 1; } virtual enumToolType toolType() { return TOOL_SELECT; } virtual TQWidget* createOptionWidget(TQWidget* parent); @@ -69,7 +69,7 @@ public: KisToolSelectBrushFactory() : super() {}; virtual ~KisToolSelectBrushFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectBrush(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index dd762a9d..397e56c7 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -137,12 +137,12 @@ void KisToolSelectContiguous::buttonPress(KisButtonPressEvent * e) } -void KisToolSelectContiguous::setup(KActionCollection *collection) +void KisToolSelectContiguous::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Contiguous Area Selection"), + m_action = new TDERadioAction(i18n("&Contiguous Area Selection"), "tool_contiguous_selection" , 0, this, diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h index 640d36cf..9dca4955 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h @@ -50,7 +50,7 @@ public: public: virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 7; } virtual enumToolType toolType() { return TOOL_SELECT; }; @@ -81,7 +81,7 @@ public: KisToolSelectContiguousFactory() : super() {}; virtual ~KisToolSelectContiguousFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectContiguous(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index 77f96c5a..2be4046c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -278,12 +278,12 @@ void KisToolSelectElliptical::slotSetAction(int action) { m_selectAction =(enumSelectionMode)action; } -void KisToolSelectElliptical::setup(KActionCollection *collection) +void KisToolSelectElliptical::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Elliptical Selection"), + m_action = new TDERadioAction(i18n("&Elliptical Selection"), "tool_elliptical_selection" , TQt::Key_J, this, diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h index 5e971d96..230de5b1 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h @@ -44,7 +44,7 @@ public: virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 4; } virtual TQWidget * createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); @@ -82,7 +82,7 @@ public: KisToolSelectEllipticalFactory() : super() {}; virtual ~KisToolSelectEllipticalFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectElliptical(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 7054f69c..87dc038a 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -114,12 +114,12 @@ void KisToolSelectEraser::endPaint() { if (m_currentImage && m_currentImage->activeDevice()) m_currentImage->activeDevice()->emitSelectionChanged(); } -void KisToolSelectEraser::setup(KActionCollection *collection) +void KisToolSelectEraser::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("Selection &Eraser"), + m_action = new TDERadioAction(i18n("Selection &Eraser"), "tool_eraser_selection", "Ctrl+Shift+E", this, TQT_SLOT(activate()), collection, name()); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h index f1f31a9e..762f24a8 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h @@ -42,7 +42,7 @@ public: KisToolSelectEraser(); virtual ~KisToolSelectEraser(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 2; } virtual enumToolType toolType() { return TOOL_SELECT; } virtual TQWidget* createOptionWidget(TQWidget* parent); @@ -67,7 +67,7 @@ public: KisToolSelectEraserFactory() : super() {}; virtual ~KisToolSelectEraserFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectEraser(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index 3788eaa5..ee869304 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -247,12 +247,12 @@ void KisToolSelectOutline::deactivate() } } -void KisToolSelectOutline::setup(KActionCollection *collection) +void KisToolSelectOutline::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Outline Selection"), + m_action = new TDERadioAction(i18n("&Outline Selection"), "tool_outline_selection", 0, this, diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h index 995e6c45..c58a32c6 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h @@ -44,7 +44,7 @@ public: virtual void update (KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 6; } virtual enumToolType toolType() { return TOOL_SELECT; } @@ -87,7 +87,7 @@ public: KisToolSelectOutlineFactory() : super() {}; virtual ~KisToolSelectOutlineFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectOutline(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index b7ad8cb6..58fc19c6 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -266,12 +266,12 @@ void KisToolSelectPolygonal::draw(KisCanvasPainter& gc) } -void KisToolSelectPolygonal::setup(KActionCollection *collection) +void KisToolSelectPolygonal::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Polygonal Selection"), + m_action = new TDERadioAction(i18n("&Polygonal Selection"), "tool_polygonal_selection" , 0, this, diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h index 74b9fad9..66ff36e0 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h @@ -49,7 +49,7 @@ public: // KisToolPaint interface // - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 5; } virtual enumToolType toolType() { return TOOL_SELECT; } virtual void buttonPress(KisButtonPressEvent *event); @@ -92,7 +92,7 @@ public: KisToolSelectPolygonalFactory() : super() {}; virtual ~KisToolSelectPolygonalFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectPolygonal(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index 316ce149..f469ce31 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -279,12 +279,12 @@ void KisToolSelectRectangular::slotSetAction(int action) { m_selectAction =(enumSelectionMode)action; } -void KisToolSelectRectangular::setup(KActionCollection *collection) +void KisToolSelectRectangular::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Rectangular Selection"), + m_action = new TDERadioAction(i18n("&Rectangular Selection"), "tool_rect_selection", TQt::Key_R, this, diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h index 232c5ba9..0289e430 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h @@ -41,7 +41,7 @@ public: virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_SELECT; } virtual TQWidget * createOptionWidget(TQWidget* parent); @@ -80,7 +80,7 @@ public: KisToolSelectRectangularFactory() : super() {}; virtual ~KisToolSelectRectangularFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectRectangular(); t->setup(ac); TQ_CHECK_PTR(t); diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index ec763b1a..ff5d98a7 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -719,12 +719,12 @@ TQWidget* KisToolCrop::optionWidget() return m_optWidget; } -void KisToolCrop::setup(KActionCollection *collection) +void KisToolCrop::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Crop"), + m_action = new TDERadioAction(i18n("&Crop"), "tool_crop", 0, this, diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.h b/chalk/plugins/tools/tool_crop/kis_tool_crop.h index 08b64f1d..3bca3442 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.h +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.h @@ -53,7 +53,7 @@ public: virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } virtual TQ_UINT32 priority() { return 1; } virtual void paint(KisCanvasPainter& gc); @@ -134,7 +134,7 @@ public: KisToolCropFactory() : super() {}; virtual ~KisToolCropFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolCrop(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc index b9d06ffe..bfa016ae 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc @@ -90,14 +90,14 @@ KisCurve::iterator KisToolBezierPaint::paintPoint (KisPainter& painter, KisCurve return point; } -void KisToolBezierPaint::setup(KActionCollection *collection) +void KisToolBezierPaint::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Bezier"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); + m_action = new TDERadioAction(i18n("&Bezier"), "tool_bezier_paint", shortcut, this, diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h index a72cae87..01922249 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h @@ -35,7 +35,7 @@ public: KisToolBezierPaint(); virtual ~KisToolBezierPaint(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 7; } @@ -51,7 +51,7 @@ public: KisToolBezierPaintFactory() : super() {}; virtual ~KisToolBezierPaintFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolBezierPaint(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc index 294bc1e7..4cc87291 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc @@ -79,14 +79,14 @@ TQValueVector KisToolBezierSelect::convertCurve() return points; } -void KisToolBezierSelect::setup(KActionCollection *collection) +void KisToolBezierSelect::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Bezier"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); + m_action = new TDERadioAction(i18n("&Bezier"), "tool_bezier_select", shortcut, this, diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h index e702fd23..7ce1c382 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h @@ -35,7 +35,7 @@ public: KisToolBezierSelect(); virtual ~KisToolBezierSelect(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SELECT; } virtual TQ_UINT32 priority() { return 10; } @@ -51,7 +51,7 @@ public: KisToolBezierSelectFactory() : super() {}; virtual ~KisToolBezierSelectFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolBezierSelect(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc index 71a34f93..91ae71b8 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc @@ -83,14 +83,14 @@ KisToolExample::~KisToolExample() } -void KisToolExample::setup(KActionCollection *collection) +void KisToolExample::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Example"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); + m_action = new TDERadioAction(i18n("&Example"), "tool_example", shortcut, this, diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.h b/chalk/plugins/tools/tool_curves/kis_tool_example.h index 0187d65a..5c01b6e3 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.h @@ -43,7 +43,7 @@ public: KisToolExample(); virtual ~KisToolExample(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } }; @@ -54,7 +54,7 @@ public: KisToolExampleFactory() : super() {}; virtual ~KisToolExampleFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolExample(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 36e94fe8..cf770196 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -784,14 +784,14 @@ TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) return m_optWidget; } -void KisToolMagnetic::setup(KActionCollection *collection) +void KisToolMagnetic::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("Magnetic Outline"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); + m_action = new TDERadioAction(i18n("Magnetic Outline"), "tool_moutline", shortcut, this, diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h index 031efa55..b9b4830f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h @@ -76,7 +76,7 @@ public: ~KisToolMagnetic(); virtual void update (KisCanvasSubject*); - virtual void setup (KActionCollection*); + virtual void setup (TDEActionCollection*); virtual enumToolType toolType() { return TOOL_SELECT; } virtual TQ_UINT32 priority() { return 9; } @@ -120,7 +120,7 @@ public: KisToolMagneticFactory() : super() {}; virtual ~KisToolMagneticFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolMagnetic(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index 5dd75d4b..3364bfce 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -60,12 +60,12 @@ KisToolFilter::~KisToolFilter() { } -void KisToolFilter::setup(KActionCollection *collection) +void KisToolFilter::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Filter Brush"), + m_action = new TDERadioAction(i18n("&Filter Brush"), "tool_filter", 0, this, TQT_SLOT(activate()), collection, name()); diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.h b/chalk/plugins/tools/tool_filter/kis_tool_filter.h index 67144b6b..e1ce4ba1 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.h +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.h @@ -43,7 +43,7 @@ public: KisToolFilter(); virtual ~KisToolFilter(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_FREEHAND; } virtual TQ_UINT32 priority() { return 1; } virtual TQWidget* createOptionWidget(TQWidget* parent); @@ -68,7 +68,7 @@ public: KisToolFilterFactory() : super() {}; virtual ~KisToolFilterFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolFilter(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 623cb848..97660392 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -465,12 +465,12 @@ void KisToolPerspectiveGrid::drawGrid() } -void KisToolPerspectiveGrid::setup(KActionCollection *collection) +void KisToolPerspectiveGrid::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Perspective Grid"), + m_action = new TDERadioAction(i18n("&Perspective Grid"), "tool_perspectivegrid" , 0, this, diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h index b10fc308..bd250637 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h @@ -49,7 +49,7 @@ public: // KisToolPaint interface // - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_VIEW; } virtual void buttonPress(KisButtonPressEvent *event); @@ -97,7 +97,7 @@ public: KisToolPerspectiveGridFactory() : super() {}; virtual ~KisToolPerspectiveGridFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolPerspectiveGrid(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc index 16a2ad54..ddd70364 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc @@ -720,12 +720,12 @@ TQWidget* KisToolPerspectiveTransform::optionWidget() return 0; } -void KisToolPerspectiveTransform::setup(KActionCollection *collection) +void KisToolPerspectiveTransform::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Perspective Transform"), + m_action = new TDERadioAction(i18n("&Perspective Transform"), "tool_perspectivetransform", 0, this, diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h index 7f278955..0f0d3e7d 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h @@ -56,7 +56,7 @@ public: virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } virtual TQ_UINT32 priority() { return 4; } virtual void paint(KisCanvasPainter& gc); @@ -117,7 +117,7 @@ public: KisToolPerspectiveTransformFactory() : super() {}; virtual ~KisToolPerspectiveTransformFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolPerspectiveTransform(); TQ_CHECK_PTR(t); t->setup(ac); return t; diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc index 56eeb5ab..1cf41f9a 100644 --- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc @@ -216,14 +216,14 @@ void KisToolPolygon::draw(KisCanvasPainter& gc) -void KisToolPolygon::setup(KActionCollection *collection) +void KisToolPolygon::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Polygon"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); + m_action = new TDERadioAction(i18n("&Polygon"), "tool_polygon", shortcut, this, diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h index 30b13373..dcbf5c37 100644 --- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h +++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h @@ -51,7 +51,7 @@ public: // KisToolPaint interface // - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 4; } virtual void buttonPress(KisButtonPressEvent *event); @@ -89,7 +89,7 @@ public: KisToolPolygonFactory() : super() {}; virtual ~KisToolPolygonFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolPolygon(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc index 405b7aa1..6eb7817d 100644 --- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc @@ -231,14 +231,14 @@ void KisToolPolyline::draw(KisCanvasPainter& gc) } } -void KisToolPolyline::setup(KActionCollection *collection) +void KisToolPolyline::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Polyline"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); + m_action = new TDERadioAction(i18n("&Polyline"), "polyline", shortcut, this, diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h index 1cfd56c2..f8522167 100644 --- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h +++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h @@ -54,7 +54,7 @@ public: // KisToolPaint interface // - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 5; } @@ -96,7 +96,7 @@ public: KisToolPolylineFactory() : super() {}; virtual ~KisToolPolylineFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolPolyline(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 9eb795ba..4827af08 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -197,12 +197,12 @@ void KisToolSelectSimilar::setPickerCursor(enumSelectionMode action) } } -void KisToolSelectSimilar::setup(KActionCollection *collection) +void KisToolSelectSimilar::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQT_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); m_action->setToolTip(i18n("Select similar colors")); m_action->setExclusiveGroup("tools"); diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h index b76f4ef4..ad61b7da 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h @@ -48,7 +48,7 @@ public: virtual ~KisToolSelectSimilar(); virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual TQ_UINT32 priority() { return 8; } virtual enumToolType toolType() { return TOOL_SELECT; } @@ -88,7 +88,7 @@ public: KisToolSelectSimilarFactory() : super() {}; virtual ~KisToolSelectSimilarFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolSelectSimilar(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 7405de7d..8ba6a172 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -173,14 +173,14 @@ void KisToolStar::draw(const KisPoint& start, const KisPoint& end ) p.end (); } -void KisToolStar::setup(KActionCollection *collection) +void KisToolStar::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Star"), + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); + m_action = new TDERadioAction(i18n("&Star"), "tool_star", shortcut, this, diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h index dd97f027..203785c9 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.h +++ b/chalk/plugins/tools/tool_star/kis_tool_star.h @@ -52,7 +52,7 @@ public: // KisToolPaint interface // - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 6; } virtual void buttonPress(KisButtonPressEvent *event); @@ -88,7 +88,7 @@ public: KisToolStarFactory() : super() {}; virtual ~KisToolStarFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolStar(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc index 51dff9a5..bfad9c6b 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc @@ -894,12 +894,12 @@ TQWidget* KisToolTransform::optionWidget() return m_optWidget; } -void KisToolTransform::setup(KActionCollection *collection) +void KisToolTransform::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Transform"), + m_action = new TDERadioAction(i18n("&Transform"), "tool_transform", 0, this, diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.h b/chalk/plugins/tools/tool_transform/kis_tool_transform.h index ba5f493b..e7a053ae 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.h +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.h @@ -51,7 +51,7 @@ public: virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } virtual TQ_UINT32 priority() { return 3; } virtual void paint(KisCanvasPainter& gc); @@ -141,7 +141,7 @@ public: KisToolTransformFactory() : super() {}; virtual ~KisToolTransformFactory(){}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolTransform(); TQ_CHECK_PTR(t); t->setup(ac); return t; diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc index e1d91bf4..c610b3a2 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/colorrange.cc @@ -58,7 +58,7 @@ ColorRange::ColorRange(TQObject *parent, const char *name, const TQStringList &) setInstance(ColorRangeFactory::instance()); setXMLFile(locate("data","chalkplugins/colorrange.rc"), true); m_view = dynamic_cast(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") ); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") ); } } diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 44beef28..ba0eff91 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -69,8 +69,8 @@ ColorSpaceConversion::ColorSpaceConversion(TQObject *parent, const char *name, c setInstance(ColorSpaceConversionFactory::instance()); setXMLFile(locate("data","chalkplugins/colorspaceconversion.rc"), true); - (void) new KAction(i18n("&Convert Image Type..."), 0, 0, this, TQT_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); - (void) new KAction(i18n("&Convert Layer Type..."), 0, 0, this, TQT_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); + (void) new TDEAction(i18n("&Convert Image Type..."), 0, 0, this, TQT_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); + (void) new TDEAction(i18n("&Convert Layer Type..."), 0, 0, this, TQT_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); } } diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc index e10b2243..62a2f5a1 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc @@ -48,7 +48,7 @@ KisDropshadowPlugin::KisDropshadowPlugin(TQObject *parent, const char *name, con setXMLFile(locate("data","chalkplugins/dropshadow.rc"), true); m_view = (KisView*) parent; - (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); + (void) new TDEAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); } } diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc index a23acb6d..337b55c0 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc @@ -59,7 +59,7 @@ ChalkFiltersGallery::ChalkFiltersGallery(TQObject *parent, const char *name, con m_view = (KisView*) parent; - (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery"); + (void) new TDEAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery"); // Add a docker with the list of filters // TQImage img; diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cc index 3f9c0e5a..95a50a45 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.cc +++ b/chalk/plugins/viewplugins/histogram/histogram.cc @@ -61,7 +61,7 @@ Histogram::Histogram(TQObject *parent, const char *name, const TQStringList &) setInstance(HistogramFactory::instance()); setXMLFile(locate("data","chalkplugins/histogram.rc"), true); - m_action = new KAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram"); + m_action = new TDEAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram"); m_view = (KisView*) parent; if (KisImageSP img = m_view->canvasSubject()->currentImg()) { diff --git a/chalk/plugins/viewplugins/histogram/histogram.h b/chalk/plugins/viewplugins/histogram/histogram.h index abba15a2..1399d185 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.h +++ b/chalk/plugins/viewplugins/histogram/histogram.h @@ -24,7 +24,7 @@ #include class KisView; -class KAction; +class TDEAction; class KisImage; class Histogram : public KParts::Plugin @@ -43,7 +43,7 @@ class Histogram : public KParts::Plugin KisImage* m_img; KisView * m_view; KisPainter * m_painter; - KAction* m_action; + TDEAction* m_action; }; diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cc index 9943b7d8..ccd81002 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/imagesize.cc @@ -66,13 +66,13 @@ ImageSize::ImageSize(TQObject *parent, const char *name, const TQStringList &) setInstance(ImageSizeFactory::instance()); setXMLFile(locate("data","chalkplugins/imagesize.rc"), true); - (void) new KAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQT_SLOT(slotImageSize()), actionCollection(), "imagesize"); - (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale"); + (void) new TDEAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQT_SLOT(slotImageSize()), actionCollection(), "imagesize"); + (void) new TDEAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale"); m_view = (KisView*) parent; // Selection manager takes ownership? - KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); + TDEAction * a = new TDEAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); TQ_CHECK_PTR(a); m_view ->canvasSubject()-> selectionManager()->addSelectionAction(a); } diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc index 95e3e4cf..8b54f7da 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc @@ -66,9 +66,9 @@ ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStr m_view = (KisView*) parent; // Selection manager takes ownership? - KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); - KAction* b = new KAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); - KAction* c = new KAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection"); + TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); + TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); + TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection"); TQ_CHECK_PTR(a); TQ_CHECK_PTR(b); diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc index 2c0ff58e..dfb0614c 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/perftest.cc @@ -86,7 +86,7 @@ PerfTest::PerfTest(TQObject *parent, const char *name, const TQStringList &) setInstance(PerfTestFactory::instance()); setXMLFile(locate("data","chalkplugins/perftest.rc"), true); - (void) new KAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test"); + (void) new TDEAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test"); m_view = (KisView*) parent; } diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc index 1903ba68..16a70764 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc @@ -59,16 +59,16 @@ RotateImage::RotateImage(TQObject *parent, const char *name, const TQStringList setInstance(RotateImageFactory::instance()); setXMLFile(locate("data","chalkplugins/rotateimage.rc"), true); m_view = (KisView*) parent; - (void) new KAction(i18n("&Rotate Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); - (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); - (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); - (void) new KAction(i18n("Rotate Image CCW"), "rotate_ccw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); + (void) new TDEAction(i18n("&Rotate Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); + (void) new TDEAction(i18n("Rotate Image CW"), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); + (void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); + (void) new TDEAction(i18n("Rotate Image CCW"), "rotate_ccw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); - (void) new KAction(i18n("&Rotate Layer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); + (void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); - (void)new KAction(i18n("Rotate 1&80"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); - (void)new KAction(i18n("Rotate CCW"), "rotate_ccw", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); - (void)new KAction(i18n("Rotate CW"), "rotate_cw", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); + (void)new TDEAction(i18n("Rotate 1&80"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); + (void)new TDEAction(i18n("Rotate CCW"), "rotate_ccw", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); + (void)new TDEAction(i18n("Rotate CW"), "rotate_cw", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); } } diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index ad92dc92..e3c4d680 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -99,10 +99,10 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name) connect( &grabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( grabTimerDone() ) ); - KAccel* accel = new KAccel(this); + TDEAccel* accel = new TDEAccel(this); TQ_CHECK_PTR(accel); - accel->insert(KStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); - accel->insert(KStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); + accel->insert(TDEStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); + accel->insert(TDEStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); accel->insert( "Print2", TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); accel->insert( "New2", TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp index e6f3b9e9..505f8de8 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp @@ -53,7 +53,7 @@ Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &) TQ_CHECK_PTR(snapshot); connect( snapshot, TQT_SIGNAL( screenGrabbed() ), TQT_SLOT( slotScreenGrabbed() ) ); - (void) new KAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQT_SLOT(slotScreenshot()), actionCollection(), "screenshot"); + (void) new TDEAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQT_SLOT(slotScreenshot()), actionCollection(), "screenshot"); } diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index 1394c521..1a795434 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -68,8 +68,8 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) // m_scriptguiclient ->setXMLFile(locate("data","chalkplugins/scripting.rc"), true); //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu setXMLFile(locate("data","chalkplugins/scripting.rc"), true); - new KAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); - new KAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); //END TODO TQWidget * w = new Kross::Api::WdgScriptsManager(m_scriptguiclient, m_view); diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc index b7703846..57e32dce 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc @@ -61,7 +61,7 @@ SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringLis setInstance(SelectOpaqueFactory::instance()); setXMLFile(locate("data","chalkplugins/selectopaque.rc"), true); m_view = dynamic_cast(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") ); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") ); } } diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc index 6c0aac8f..26650d73 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc @@ -47,7 +47,7 @@ KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *parent, const cha setInstance(KGenericFactory::instance()); setXMLFile(locate("data","chalkplugins/imageseparate.rc"), true); m_view = (KisView*) parent; - (void) new KAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate"); + (void) new TDEAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate"); } } diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cc index 48a6e774..43fdb18d 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/shearimage.cc @@ -59,8 +59,8 @@ ShearImage::ShearImage(TQObject *parent, const char *name, const TQStringList &) setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","chalkplugins/shearimage.rc"), true); - (void) new KAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage"); - (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); + (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage"); + (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); m_view = (KisView*) parent; } diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cc index b4c578aa..d46a080a 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.cc +++ b/chalk/plugins/viewplugins/substrate/substrate.cc @@ -53,7 +53,7 @@ SubstratePlugin::SubstratePlugin(TQObject *parent, const char *name, const TQStr setInstance(SubstrateFactory::instance()); setXMLFile(locate("data","chalkplugins/substrate.rc"), true); - (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); + (void) new TDEAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); m_view = (KisView*) parent; } diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cc index 53be009d..a3a084d7 100644 --- a/chalk/plugins/viewplugins/variations/variations.cc +++ b/chalk/plugins/viewplugins/variations/variations.cc @@ -57,7 +57,7 @@ Variations::Variations(TQObject *parent, const char *name, const TQStringList &) setInstance(VariationsFactory::instance()); setXMLFile(locate("data","chalkplugins/variations.rc"), true); - (void) new KAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations"); + (void) new TDEAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations"); m_view = (KisView*) parent; } diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index b75de805..2d0dd856 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -79,9 +79,9 @@ void KisPopupFrame::keyPressEvent(TQKeyEvent * e) } -KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, const char* name ) +KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, const char* name ) : TQObject(view, name) - //: KToolBar ( window, TQt::DockTop, false, name, true, true ) + //: TDEToolBar ( window, TQt::DockTop, false, name, true, true ) , m_view(view) , m_brushWidget(0) , m_patternWidget(0) @@ -102,7 +102,7 @@ KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, cons m_brushWidget = new KisIconWidget(view, "brushes"); m_brushWidget->setTextLabel( i18n("Brush Shapes") ); // XXX: An action without a slot -- that's silly, what kind of action could we use here? - KAction * action = new KWidgetAction(m_brushWidget, + TDEAction * action = new KWidgetAction(m_brushWidget, i18n("&Brush"), 0, TQT_TQOBJECT(view), diff --git a/chalk/ui/kis_controlframe.h b/chalk/ui/kis_controlframe.h index f5217b27..d052fc77 100644 --- a/chalk/ui/kis_controlframe.h +++ b/chalk/ui/kis_controlframe.h @@ -31,7 +31,7 @@ class TQWidget; class TQTabWidget; -class KToolBar; +class TDEToolBar; class KoIconItem; class KisIconWidget; @@ -73,13 +73,13 @@ private: * Control Frame - status display with access to * color selector, brushes, patterns, and preview */ -class KisControlFrame : public TQObject //: public KToolBar +class KisControlFrame : public TQObject //: public TDEToolBar { Q_OBJECT public: - KisControlFrame(KMainWindow * window, KisView * view, const char *name = 0 ); + KisControlFrame(TDEMainWindow * window, KisView * view, const char *name = 0 ); virtual ~KisControlFrame() {}; public slots: diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index 713427e2..4428b0f4 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -77,7 +77,7 @@ KisFilterManager::~KisFilterManager() //delete m_filterMapper; } -void KisFilterManager::setup(KActionCollection * ac) +void KisFilterManager::setup(TDEActionCollection * ac) { KisFilter * f = 0; int i = 0; @@ -85,8 +85,8 @@ void KisFilterManager::setup(KActionCollection * ac) // Only create the submenu's we've actually got filters for. // XXX: Make this list extensible after 1.5 - KActionMenu * other = 0; - KActionMenu * am = 0; + TDEActionMenu * other = 0; + TDEActionMenu * am = 0; m_filterList = KisFilterRegistry::instance()->listKeys(); @@ -96,63 +96,63 @@ void KisFilterManager::setup(KActionCollection * ac) TQString s = f->menuCategory(); if (s == "adjust" && !m_filterActionMenus.find("adjust")) { - am = new KActionMenu(i18n("Adjust"), ac, "adjust_filters"); + am = new TDEActionMenu(i18n("Adjust"), ac, "adjust_filters"); m_filterActionMenus.insert("adjust", am); } else if (s == "artistic" && !m_filterActionMenus.find("artistic")) { - am = new KActionMenu(i18n("Artistic"), ac, "artistic_filters"); + am = new TDEActionMenu(i18n("Artistic"), ac, "artistic_filters"); m_filterActionMenus.insert("artistic", am); } else if (s == "blur" && !m_filterActionMenus.find("blur")) { - am = new KActionMenu(i18n("Blur"), ac, "blur_filters"); + am = new TDEActionMenu(i18n("Blur"), ac, "blur_filters"); m_filterActionMenus.insert("blur", am); } else if (s == "colors" && !m_filterActionMenus.find("colors")) { - am = new KActionMenu(i18n("Colors"), ac, "color_filters"); + am = new TDEActionMenu(i18n("Colors"), ac, "color_filters"); m_filterActionMenus.insert("colors", am); } else if (s == "decor" && !m_filterActionMenus.find("decor")) { - am = new KActionMenu(i18n("Decor"), ac, "decor_filters"); + am = new TDEActionMenu(i18n("Decor"), ac, "decor_filters"); m_filterActionMenus.insert("decor", am); } else if (s == "edge" && !m_filterActionMenus.find("edge")) { - am = new KActionMenu(i18n("Edge Detection"), ac, "edge_filters"); + am = new TDEActionMenu(i18n("Edge Detection"), ac, "edge_filters"); m_filterActionMenus.insert("edge", am); } else if (s == "emboss" && !m_filterActionMenus.find("emboss")) { - am = new KActionMenu(i18n("Emboss"), ac, "emboss_filters"); + am = new TDEActionMenu(i18n("Emboss"), ac, "emboss_filters"); m_filterActionMenus.insert("emboss", am); } else if (s == "enhance" && !m_filterActionMenus.find("enhance")) { - am = new KActionMenu(i18n("Enhance"), ac, "enhance_filters"); + am = new TDEActionMenu(i18n("Enhance"), ac, "enhance_filters"); m_filterActionMenus.insert("enhance", am); } else if (s == "map" && !m_filterActionMenus.find("map")) { - am = new KActionMenu(i18n("Map"), ac, "map_filters"); + am = new TDEActionMenu(i18n("Map"), ac, "map_filters"); m_filterActionMenus.insert("map", am); } else if (s == "nonphotorealistic" && !m_filterActionMenus.find("nonphotorealistic")) { - am = new KActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters"); + am = new TDEActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters"); m_filterActionMenus.insert("nonphotorealistic", am); } else if (s == "other" && !m_filterActionMenus.find("other")) { - other = new KActionMenu(i18n("Other"), ac, "misc_filters"); + other = new TDEActionMenu(i18n("Other"), ac, "misc_filters"); m_filterActionMenus.insert("other", other); } } - m_reapplyAction = new KAction(i18n("Apply Filter Again"), + m_reapplyAction = new TDEAction(i18n("Apply Filter Again"), "Ctrl+Shift+F", this, TQT_SLOT(slotApply()), ac, "filter_apply_again"); @@ -167,17 +167,17 @@ void KisFilterManager::setup(KActionCollection * ac) if (!f) break; // Create action - KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac, + TDEAction * a = new TDEAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac, TQString("chalk_filter_%1").arg((*it) . id()).ascii()); // Add action to the right submenu - KActionMenu * m = m_filterActionMenus.find( f->menuCategory() ); + TDEActionMenu * m = m_filterActionMenus.find( f->menuCategory() ); if (m) { m->insert(a); } else { if (!other) { - other = new KActionMenu(i18n("Other"), ac, "misc_filters"); + other = new TDEActionMenu(i18n("Other"), ac, "misc_filters"); m_filterActionMenus.insert("other", am); } other->insert(a); @@ -214,7 +214,7 @@ void KisFilterManager::updateGUI() else m_reapplyAction->setText(i18n("Apply Filter Again")); - KAction * a; + TDEAction * a; int i = 0; for (a = m_filterActions.first(); a; a = m_filterActions.next() , i++) { KisFilter* filter = KisFilterRegistry::instance()->get(m_filterList[i]); diff --git a/chalk/ui/kis_filter_manager.h b/chalk/ui/kis_filter_manager.h index bfb414cc..602ebd8a 100644 --- a/chalk/ui/kis_filter_manager.h +++ b/chalk/ui/kis_filter_manager.h @@ -29,13 +29,13 @@ #include -class KAction; +class TDEAction; class KisView; class KisDoc; class KisFilter; class KisFilterConfiguration; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class KisPreviewDialog; /** @@ -51,7 +51,7 @@ public: KisFilterManager(KisView * parent, KisDoc * doc); ~KisFilterManager(); - void setup(KActionCollection * ac); + void setup(TDEActionCollection * ac); void updateGUI(); @@ -69,9 +69,9 @@ private: KisView * m_view; KisDoc * m_doc; - KAction * m_reapplyAction; + TDEAction * m_reapplyAction; - TQPtrList m_filterActions; + TQPtrList m_filterActions; KisFilterConfiguration * m_lastFilterConfig; KisFilter * m_lastFilter; @@ -81,7 +81,7 @@ private: KisIDList m_filterList; // Map the actions in the signalmapper to the filters TQSignalMapper * m_filterMapper; - TQDict m_filterActionMenus; + TQDict m_filterActionMenus; }; #endif diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index a8fdf71e..531b320e 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -38,7 +38,7 @@ KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *parent, const char* n { setMinimumHeight(30); - m_segmentMenu = new KPopupMenu(); + m_segmentMenu = new TDEPopupMenu(); m_segmentMenu->insertItem(i18n("Split Segment"), SPLIT_SEGMENT); m_segmentMenu->insertItem(i18n("Duplicate Segment"), DUPLICATE_SEGMENT); m_segmentMenu->insertItem(i18n("Mirror Segment"), MIRROR_SEGMENT); diff --git a/chalk/ui/kis_gradient_slider_widget.h b/chalk/ui/kis_gradient_slider_widget.h index f1b99ef0..e3b22ab6 100644 --- a/chalk/ui/kis_gradient_slider_widget.h +++ b/chalk/ui/kis_gradient_slider_widget.h @@ -23,7 +23,7 @@ #include #include -class KPopupMenu; +class TDEPopupMenu; class KisAutogradientResource; class KisGradientSegment; @@ -73,7 +73,7 @@ private: KisAutogradientResource* m_autogradientResource; KisGradientSegment* m_currentSegment; KisGradientSegment* m_selectedSegment; - KPopupMenu* m_segmentMenu; + TDEPopupMenu* m_segmentMenu; int m_drag; }; diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp index 5eda1cf9..83969e78 100644 --- a/chalk/ui/kis_grid_manager.cpp +++ b/chalk/ui/kis_grid_manager.cpp @@ -51,19 +51,19 @@ KisGridManager::~KisGridManager() } -void KisGridManager::setup(KActionCollection * collection) +void KisGridManager::setup(TDEActionCollection * collection) { - m_toggleGrid = new KToggleAction(i18n("Show Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_grid"); + m_toggleGrid = new TDEToggleAction(i18n("Show Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_grid"); m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Grid"))); m_toggleGrid->setChecked(false); // Fast grid config - m_gridFastConfig1x1 = new KAction(i18n("1x1"), 0, "", this, TQT_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1"); - m_gridFastConfig2x2 = new KAction(i18n("2x2"), 0, "", this, TQT_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2"); - m_gridFastConfig5x5 = new KAction(i18n("5x5"), 0, "", this, TQT_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5"); - m_gridFastConfig10x10 = new KAction(i18n("10x10"), 0, "", this, TQT_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10"); - m_gridFastConfig20x20 = new KAction(i18n("20x20"), 0, "", this, TQT_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20"); - m_gridFastConfig40x40 = new KAction(i18n("40x40"), 0, "", this, TQT_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40"); + m_gridFastConfig1x1 = new TDEAction(i18n("1x1"), 0, "", this, TQT_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1"); + m_gridFastConfig2x2 = new TDEAction(i18n("2x2"), 0, "", this, TQT_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2"); + m_gridFastConfig5x5 = new TDEAction(i18n("5x5"), 0, "", this, TQT_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5"); + m_gridFastConfig10x10 = new TDEAction(i18n("10x10"), 0, "", this, TQT_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10"); + m_gridFastConfig20x20 = new TDEAction(i18n("20x20"), 0, "", this, TQT_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20"); + m_gridFastConfig40x40 = new TDEAction(i18n("40x40"), 0, "", this, TQT_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40"); } void KisGridManager::updateGUI() diff --git a/chalk/ui/kis_grid_manager.h b/chalk/ui/kis_grid_manager.h index dcbc81a3..2493d687 100644 --- a/chalk/ui/kis_grid_manager.h +++ b/chalk/ui/kis_grid_manager.h @@ -26,9 +26,9 @@ #include "kis_types.h" class KisView; -class KActionCollection; -class KToggleAction; -class KAction; +class TDEActionCollection; +class TDEToggleAction; +class TDEAction; class KisGridManager : public TQObject { @@ -38,7 +38,7 @@ class KisGridManager : public TQObject KisGridManager(KisView * parent); ~KisGridManager(); public: - void setup(KActionCollection * collection); + void setup(TDEActionCollection * collection); void drawGrid(TQRect wr, TQPainter *p, bool openGL = false); public slots: void updateGUI(); @@ -52,14 +52,14 @@ class KisGridManager : public TQObject void fastConfig40x40(); private: KisView* m_view; - KToggleAction* m_toggleGrid; - KAction* m_gridConfig; - KAction* m_gridFastConfig1x1; - KAction* m_gridFastConfig2x2; - KAction* m_gridFastConfig5x5; - KAction* m_gridFastConfig10x10; - KAction* m_gridFastConfig20x20; - KAction* m_gridFastConfig40x40; + TDEToggleAction* m_toggleGrid; + TDEAction* m_gridConfig; + TDEAction* m_gridFastConfig1x1; + TDEAction* m_gridFastConfig2x2; + TDEAction* m_gridFastConfig5x5; + TDEAction* m_gridFastConfig10x10; + TDEAction* m_gridFastConfig20x20; + TDEAction* m_gridFastConfig40x40; }; #endif diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 03b8e2af..34a5e411 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -117,7 +117,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char connect(list(), TQT_SIGNAL(requestLayerProperties(LayerItem*)), TQT_SLOT(slotRequestLayerProperties(LayerItem*))); - m_newLayerMenu = new KPopupMenu(this); + m_newLayerMenu = new TDEPopupMenu(this); m_lst->bnAdd->setPopup(m_newLayerMenu); m_lst->bnAdd->setPopupDelay(1); m_newLayerMenu->insertItem( SmallIconSet( "filenew" ), i18n( "&New Layer..." ), PAINT_LAYER ); diff --git a/chalk/ui/kis_layerbox.h b/chalk/ui/kis_layerbox.h index eb721946..9d05601f 100644 --- a/chalk/ui/kis_layerbox.h +++ b/chalk/ui/kis_layerbox.h @@ -34,7 +34,7 @@ class TQButton; class TQPainter; class TQWidget; class KIconLoader; -class KPopupMenu; +class TDEPopupMenu; class KoDocumentEntry; class KisCompositeOp; class KisLayerList; @@ -110,7 +110,7 @@ private: KisLayerList* list() const; void markModified(KisLayer *layer); - KPopupMenu *m_newLayerMenu; + TDEPopupMenu *m_newLayerMenu; KoPartSelectAction *m_partLayerAction; KisImageSP m_image; TQValueList m_modified; diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 24ae2738..3f1ff018 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -53,7 +53,7 @@ void KisLayerList::constructMenu( LayerItem *layer ) if( layer ) { - static KPopupMenu submenu; + static TDEPopupMenu submenu; submenu.clear(); submenu.insertItem( SmallIconSet( "file" ), i18n( "&Layer..." ), MenuItems::NewLayer ); submenu.insertItem( SmallIconSet( "folder" ), i18n( "&Group Layer..." ), MenuItems::NewFolder ); diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 8997af11..9751e246 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -48,7 +48,7 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam m_canvasController(view->getCanvasController()) { #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90) - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); #endif Q_ASSERT(m_canvasController != 0); diff --git a/chalk/ui/kis_palette_view.h b/chalk/ui/kis_palette_view.h index 10e1fcd3..1f8ddb0d 100644 --- a/chalk/ui/kis_palette_view.h +++ b/chalk/ui/kis_palette_view.h @@ -23,7 +23,7 @@ #include #include "kis_palette.h" -class KListBox; +class TDEListBox; class KisPalette; class KColorCells; class KisResource; diff --git a/chalk/ui/kis_palette_widget.h b/chalk/ui/kis_palette_widget.h index 897a55ee..06530fbd 100644 --- a/chalk/ui/kis_palette_widget.h +++ b/chalk/ui/kis_palette_widget.h @@ -24,7 +24,7 @@ class TQComboBox; class TQLineEdit; -class KListBox; +class TDEListBox; class KisPalette; class KisResource; class KisColor; diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp index 6c326a3c..174e1395 100644 --- a/chalk/ui/kis_perspective_grid_manager.cpp +++ b/chalk/ui/kis_perspective_grid_manager.cpp @@ -54,13 +54,13 @@ void KisPerspectiveGridManager::updateGUI() } } -void KisPerspectiveGridManager::setup(KActionCollection * collection) +void KisPerspectiveGridManager::setup(TDEActionCollection * collection) { - kdDebug() << "KisPerspectiveGridManager::setup(KActionCollection * collection)" << endl; - m_toggleGrid = new KToggleAction(i18n("Show Perspective Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid"); + kdDebug() << "KisPerspectiveGridManager::setup(TDEActionCollection * collection)" << endl; + m_toggleGrid = new TDEToggleAction(i18n("Show Perspective Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid"); m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Perspective Grid"))); m_toggleGrid->setChecked(false); - m_gridClear = new KAction(i18n("Clear Perspective Grid"), 0, "", this, TQT_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid"); + m_gridClear = new TDEAction(i18n("Clear Perspective Grid"), 0, "", this, TQT_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid"); } void KisPerspectiveGridManager::setGridVisible(bool t) diff --git a/chalk/ui/kis_perspective_grid_manager.h b/chalk/ui/kis_perspective_grid_manager.h index acb38deb..db5147b7 100644 --- a/chalk/ui/kis_perspective_grid_manager.h +++ b/chalk/ui/kis_perspective_grid_manager.h @@ -23,9 +23,9 @@ #include -class KAction; -class KActionCollection; -class KToggleAction; +class TDEAction; +class TDEActionCollection; +class TDEToggleAction; class KisView; class KisPerspectiveGridManager : public TQObject @@ -35,7 +35,7 @@ class KisPerspectiveGridManager : public TQObject public: KisPerspectiveGridManager(KisView * parent); ~KisPerspectiveGridManager(); - void setup(KActionCollection * collection); + void setup(TDEActionCollection * collection); void drawGrid(TQRect wr, TQPainter *p, bool openGL = false); void startEdition(); void stopEdition(); @@ -48,8 +48,8 @@ class KisPerspectiveGridManager : public TQObject private: bool m_toggleEdition; KisView* m_view; - KToggleAction* m_toggleGrid; - KAction* m_gridClear; + TDEToggleAction* m_toggleGrid; + TDEAction* m_gridClear; }; #endif diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 23abb2b9..718dbf02 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -97,7 +97,7 @@ KisSelectionManager::~KisSelectionManager() } -void KisSelectionManager::setup(KActionCollection * collection) +void KisSelectionManager::setup(TDEActionCollection * collection) { // XXX: setup shortcuts! @@ -116,7 +116,7 @@ void KisSelectionManager::setup(KActionCollection * collection) collection, "paste"); - m_pasteNew = new KAction(i18n("Paste into &New Image"), + m_pasteNew = new TDEAction(i18n("Paste into &New Image"), 0, 0, this, TQT_SLOT(pasteNew()), collection, @@ -139,99 +139,99 @@ void KisSelectionManager::setup(KActionCollection * collection) collection, "clear"); - m_reselect = new KAction(i18n("&Reselect"), + m_reselect = new TDEAction(i18n("&Reselect"), 0, "Ctrl+Shift+D", this, TQT_SLOT(reselect()), collection, "reselect"); - m_invert = new KAction(i18n("&Invert"), + m_invert = new TDEAction(i18n("&Invert"), 0, "Ctrl+I", this, TQT_SLOT(invert()), collection, "invert"); - m_toNewLayer = new KAction(i18n("Copy Selection to New Layer"), + m_toNewLayer = new TDEAction(i18n("Copy Selection to New Layer"), 0, "Ctrl+J", this, TQT_SLOT(copySelectionToNewLayer()), collection, "copy_selection_to_new_layer"); - m_cutToNewLayer = new KAction(i18n("Cut Selection to New Layer"), + m_cutToNewLayer = new TDEAction(i18n("Cut Selection to New Layer"), 0, "Ctrl+Shift+J", this, TQT_SLOT(cutToNewLayer()), collection, "cut_selection_to_new_layer"); - m_feather = new KAction(i18n("Feather"), + m_feather = new TDEAction(i18n("Feather"), 0, "Ctrl+Alt+D", this, TQT_SLOT(feather()), collection, "feather"); - m_fillForegroundColor = new KAction(i18n("Fill with Foreground Color"), + m_fillForegroundColor = new TDEAction(i18n("Fill with Foreground Color"), "Alt+backspace", this, TQT_SLOT(fillForegroundColor()), collection, "fill_selection_foreground_color"); - m_fillBackgroundColor = new KAction(i18n("Fill with Background Color"), + m_fillBackgroundColor = new TDEAction(i18n("Fill with Background Color"), "backspace", this, TQT_SLOT(fillBackgroundColor()), collection, "fill_selection_background_color"); - m_fillPattern = new KAction(i18n("Fill with Pattern"), + m_fillPattern = new TDEAction(i18n("Fill with Pattern"), 0, this, TQT_SLOT(fillPattern()), collection, "fill_selection_pattern"); - m_toggleDisplaySelection = new KToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQT_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection"); + m_toggleDisplaySelection = new TDEToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQT_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection"); m_toggleDisplaySelection->setCheckedState(KGuiItem(i18n("Hide Selection"))); m_toggleDisplaySelection->setChecked(true); m_border = - new KAction(i18n("Border..."), + new TDEAction(i18n("Border..."), 0, 0, this, TQT_SLOT(border()), collection, "border"); m_expand = - new KAction(i18n("Expand..."), + new TDEAction(i18n("Expand..."), 0, 0, this, TQT_SLOT(expand()), collection, "expand"); m_smooth = - new KAction(i18n("Smooth..."), + new TDEAction(i18n("Smooth..."), 0, 0, this, TQT_SLOT(smooth()), collection, "smooth"); m_contract = - new KAction(i18n("Contract..."), + new TDEAction(i18n("Contract..."), 0, 0, this, TQT_SLOT(contract()), collection, "contract"); m_similar = - new KAction(i18n("Similar"), + new TDEAction(i18n("Similar"), 0, 0, this, TQT_SLOT(similar()), collection, "similar"); m_transform - = new KAction(i18n("Transform..."), + = new TDEAction(i18n("Transform..."), 0, 0, this, TQT_SLOT(transform()), collection, "transform_selection"); // m_load -// = new KAction(i18n("Load..."), +// = new TDEAction(i18n("Load..."), // 0, 0, // this, TQT_SLOT(load()), // collection, "load_selection"); // // // m_save -// = new KAction(i18n("Save As..."), +// = new TDEAction(i18n("Save As..."), // 0, 0, // this, TQT_SLOT(save()), // collection, "save_selection"); @@ -246,7 +246,7 @@ void KisSelectionManager::clipboardDataChanged() } -void KisSelectionManager::addSelectionAction(KAction * action) +void KisSelectionManager::addSelectionAction(TDEAction * action) { m_pluginActions.append(action); } @@ -310,7 +310,7 @@ void KisSelectionManager::updateGUI() // m_save->setEnabled(enable); - KAction * a; + TDEAction * a; for (a = m_pluginActions.first(); a; a = m_pluginActions.next()) { a->setEnabled(img != 0); } diff --git a/chalk/ui/kis_selection_manager.h b/chalk/ui/kis_selection_manager.h index 435e186d..1bec7c34 100644 --- a/chalk/ui/kis_selection_manager.h +++ b/chalk/ui/kis_selection_manager.h @@ -24,7 +24,7 @@ #include "kis_image.h" #include -class KAction; +class TDEAction; class KisView; class KisDoc; class KisClipboard; @@ -43,9 +43,9 @@ public: KisSelectionManager(KisView * parent, KisDoc * doc); virtual ~KisSelectionManager(); - void setup(KActionCollection * collection); + void setup(TDEActionCollection * collection); - void addSelectionAction(KAction * action); + void addSelectionAction(TDEAction * action); public: /** @@ -105,32 +105,32 @@ private: KisClipboard * m_clipboard; - KAction *m_copy; - KAction *m_cut; - KAction *m_paste; - KAction *m_pasteNew; - KAction *m_cutToNewLayer; - KAction *m_selectAll; - KAction *m_deselect; - KAction *m_clear; - KAction *m_reselect; - KAction *m_invert; - KAction *m_toNewLayer; - KAction *m_feather; - KAction *m_border; - KAction *m_expand; - KAction *m_smooth; - KAction *m_contract; - KAction *m_similar; - KAction *m_transform; - KAction *m_load; - KAction *m_save; - KAction *m_fillForegroundColor; - KAction *m_fillBackgroundColor; - KAction *m_fillPattern; - KToggleAction *m_toggleDisplaySelection; - - TQPtrList m_pluginActions; + TDEAction *m_copy; + TDEAction *m_cut; + TDEAction *m_paste; + TDEAction *m_pasteNew; + TDEAction *m_cutToNewLayer; + TDEAction *m_selectAll; + TDEAction *m_deselect; + TDEAction *m_clear; + TDEAction *m_reselect; + TDEAction *m_invert; + TDEAction *m_toNewLayer; + TDEAction *m_feather; + TDEAction *m_border; + TDEAction *m_expand; + TDEAction *m_smooth; + TDEAction *m_contract; + TDEAction *m_similar; + TDEAction *m_transform; + TDEAction *m_load; + TDEAction *m_save; + TDEAction *m_fillForegroundColor; + TDEAction *m_fillBackgroundColor; + TDEAction *m_fillPattern; + TDEToggleAction *m_toggleDisplaySelection; + + TQPtrList m_pluginActions; }; diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc index b2ae9f36..db5e8c46 100644 --- a/chalk/ui/kis_text_brush.cc +++ b/chalk/ui/kis_text_brush.cc @@ -57,7 +57,7 @@ KisTextBrush::KisTextBrush(TQWidget *parent, const char* name, const TQString& c void KisTextBrush::getFont() { - KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); + TDEFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); rebuildTextBrush(); } diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index cd9cc424..45f3fbd1 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -34,8 +34,8 @@ class TQEvent; class TQKeyEvent; class TQRect; class TQWidget; -class KActionCollection; -class KRadioAction; +class TDEActionCollection; +class TDERadioAction; class KDialog; class KisBrush; class KisGradient; @@ -72,7 +72,7 @@ public: virtual void paint(KisCanvasPainter& gc, const TQRect& rc) = 0; /** - * This function is called after the creation of a tool to create the KAction corresponding + * This function is called after the creation of a tool to create the TDEAction corresponding * to the tool. * * The code should look like : @@ -80,7 +80,7 @@ public: * * @endcode */ - virtual void setup(KActionCollection *collection) = 0; + virtual void setup(TDEActionCollection *collection) = 0; virtual void buttonPress(KisButtonPressEvent *e) = 0; virtual void move(KisMoveEvent *e) = 0; @@ -100,7 +100,7 @@ public: * @return the current configuration widget. */ virtual TQWidget* optionWidget(); - KRadioAction *action() const { return m_action; } + TDERadioAction *action() const { return m_action; } /** * Return true if this tool wants auto canvas-scrolling to @@ -131,7 +131,7 @@ private: KisTool& operator=(const KisTool&); protected: - KRadioAction *m_action; + TDERadioAction *m_action; bool m_ownAction; private: diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index bc478d4e..74311391 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -82,12 +82,12 @@ void KisToolDummy::buttonRelease(KisButtonReleaseEvent *e) } } -void KisToolDummy::setup(KActionCollection *collection) +void KisToolDummy::setup(TDEActionCollection *collection) { - m_action = static_cast(collection->action(name())); + m_action = static_cast(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); m_action->setExclusiveGroup("tools"); m_ownAction = true; } diff --git a/chalk/ui/kis_tool_dummy.h b/chalk/ui/kis_tool_dummy.h index 378781d6..bf4e52ef 100644 --- a/chalk/ui/kis_tool_dummy.h +++ b/chalk/ui/kis_tool_dummy.h @@ -48,7 +48,7 @@ public: virtual void update(KisCanvasSubject *subject); - virtual void setup(KActionCollection *collection); + virtual void setup(TDEActionCollection *collection); virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); @@ -71,7 +71,7 @@ public: KisToolDummyFactory() : super() {}; virtual ~KisToolDummyFactory() {}; - virtual KisTool * createTool(KActionCollection * ac) { + virtual KisTool * createTool(TDEActionCollection * ac) { KisTool * t = new KisToolDummy(); TQ_CHECK_PTR(t); t->setup(ac); diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h index 90240f0c..24cf5d72 100644 --- a/chalk/ui/kis_tool_factory.h +++ b/chalk/ui/kis_tool_factory.h @@ -32,7 +32,7 @@ public: KisToolFactory() {} virtual ~KisToolFactory() {}; - virtual KisTool * createTool(KActionCollection * ac) = 0; + virtual KisTool * createTool(TDEActionCollection * ac) = 0; virtual KisID id() { return KisID("Abstract Tool", i18n("Abstract Tool")); } }; diff --git a/chalk/ui/kis_tool_manager.cc b/chalk/ui/kis_tool_manager.cc index 458b54e2..04388058 100644 --- a/chalk/ui/kis_tool_manager.cc +++ b/chalk/ui/kis_tool_manager.cc @@ -50,7 +50,7 @@ KisToolManager::~KisToolManager() delete m_dummyTool; } -void KisToolManager::setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, KActionCollection * actionCollection) +void KisToolManager::setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, TDEActionCollection * actionCollection) { if (setup) { resetToolBox( toolbox ); @@ -241,7 +241,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev vKisTool& oldTools = (*vit).second; for (vKisTool::iterator it = oldTools.begin(); it != oldTools.end(); ++it) { KisTool *tool = *it; - KAction *toolAction = tool->action(); + TDEAction *toolAction = tool->action(); toolAction->disconnect(TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); } } @@ -261,7 +261,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev for (vKisTool::iterator it = tools.begin(); it != tools.end(); ++it) { KisTool *tool = *it; - KAction *toolAction = tool->action(); + TDEAction *toolAction = tool->action(); connect(toolAction, TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); } } diff --git a/chalk/ui/kis_tool_manager.h b/chalk/ui/kis_tool_manager.h index e19d0b07..4b937881 100644 --- a/chalk/ui/kis_tool_manager.h +++ b/chalk/ui/kis_tool_manager.h @@ -52,7 +52,7 @@ public: public: - void setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, KActionCollection * collection); + void setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, TDEActionCollection * collection); // Called when the toolbox is deleted because the view was made inactive in favour of another view void youAintGotNoToolBox(); @@ -86,7 +86,7 @@ private: KisCanvasController * m_controller; KoPaletteManager * m_paletteManager; - KActionCollection * m_actionCollection; + TDEActionCollection * m_actionCollection; KoToolBox * m_toolBox; diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index d96f8ef4..32e57e12 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -78,7 +78,7 @@ KisToolRegistry* KisToolRegistry::instance() -vKisTool KisToolRegistry::createTools(KActionCollection * ac, KisCanvasSubject *subject) const +vKisTool KisToolRegistry::createTools(TDEActionCollection * ac, KisCanvasSubject *subject) const { Q_ASSERT(subject); @@ -100,7 +100,7 @@ vKisTool KisToolRegistry::createTools(KActionCollection * ac, KisCanvasSubject * return tools; } -KisTool * KisToolRegistry::createTool(KActionCollection * ac, KisCanvasSubject * subject, KisID & id) const +KisTool * KisToolRegistry::createTool(TDEActionCollection * ac, KisCanvasSubject * subject, KisID & id) const { KisToolFactorySP f = get(id); KisTool * t = f->createTool(ac); diff --git a/chalk/ui/kis_tool_registry.h b/chalk/ui/kis_tool_registry.h index fe477131..2717b989 100644 --- a/chalk/ui/kis_tool_registry.h +++ b/chalk/ui/kis_tool_registry.h @@ -25,7 +25,7 @@ #include "kis_generic_registry.h" #include -class KActionCollection; +class TDEActionCollection; class KisCanvasSubject; class TQStringList; @@ -45,8 +45,8 @@ public: static KisToolRegistry* instance(); - vKisTool createTools(KActionCollection * ac, KisCanvasSubject *subject) const; - KisTool * createTool(KActionCollection * ac, KisCanvasSubject * subject, KisID & id) const; + vKisTool createTools(TDEActionCollection * ac, KisCanvasSubject *subject) const; + KisTool * createTool(TDEActionCollection * ac, KisCanvasSubject * subject, KisID & id) const; private: KisToolRegistry(); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 6c8303d7..357be9d2 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -362,7 +362,7 @@ KisView::~KisView() 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; @@ -603,83 +603,83 @@ void KisView::setupActions() m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this ); connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool ))); - m_imgProperties = new KAction(i18n("Image Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties"); - m_imgScan = 0; // How the hell do I get a KAction to the scan plug-in?!? - m_imgResizeToLayer = new KAction(i18n("Resize Image to Size of Current Layer"), 0, TQT_TQOBJECT(this), TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); + m_imgProperties = new TDEAction(i18n("Image Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties"); + m_imgScan = 0; // How the hell do I get a TDEAction to the scan plug-in?!? + m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, TQT_TQOBJECT(this), TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); // view actions m_zoomIn = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); m_zoomOut = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); - m_actualPixels = new KAction(i18n("Actual Pixels"), "Ctrl+0", TQT_TQOBJECT(this), TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels"); + m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", TQT_TQOBJECT(this), TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels"); m_actualSize = KStdAction::actualSize(TQT_TQOBJECT(this), TQT_SLOT(slotActualSize()), actionCollection(), "actual_size"); m_actualSize->setEnabled(false); m_fitToCanvas = KStdAction::fitToPage(TQT_TQOBJECT(this), TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas"); // layer actions - m_layerAdd = new KAction(i18n("&Add..."), "Ctrl+Shift+N", TQT_TQOBJECT(this), TQT_SLOT(layerAdd()), actionCollection(), "insert_layer"); + m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", TQT_TQOBJECT(this), TQT_SLOT(layerAdd()), actionCollection(), "insert_layer"); m_actionPartLayer = new KoPartSelectAction( i18n( "&Object Layer" ), "frame_query", TQT_TQOBJECT(this), TQT_SLOT( addPartLayer() ), actionCollection(), "insert_part_layer" ); - m_actionAdjustmentLayer = new KAction( i18n( "&Adjustment Layer" ), 0, + m_actionAdjustmentLayer = new TDEAction( i18n( "&Adjustment Layer" ), 0, TQT_TQOBJECT(this), TQT_SLOT( addAdjustmentLayer() ), actionCollection(), "insert_adjustment_layer" ); - m_layerRm = new KAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerRemove()), actionCollection(), "remove_layer"); - m_layerDup = new KAction(i18n("Duplicate"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); - m_layerHide = new KToggleAction(i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); + m_layerRm = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerRemove()), actionCollection(), "remove_layer"); + m_layerDup = new TDEAction(i18n("Duplicate"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); + m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); m_layerHide->setCheckedState(KGuiItem(i18n("&Show"))); m_layerHide->setChecked(false); - m_layerRaise = new KAction(i18n("Raise"), "raise", "Ctrl+]", TQT_TQOBJECT(this), TQT_SLOT(layerRaise()), actionCollection(), "raiselayer"); - m_layerLower = new KAction(i18n("Lower"), "lower", "Ctrl+[", TQT_TQOBJECT(this), TQT_SLOT(layerLower()), actionCollection(), "lowerlayer"); - m_layerTop = new KAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", TQT_TQOBJECT(this), TQT_SLOT(layerFront()), actionCollection(), "toplayer"); - m_layerBottom = new KAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", TQT_TQOBJECT(this), TQT_SLOT(layerBack()), actionCollection(), "bottomlayer"); - m_layerProperties = new KAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerProperties()), actionCollection(), "layer_properties"); - (void)new KAction(i18n("I&nsert Image as Layer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); - m_layerSaveAs = new KAction(i18n("Save Layer as Image..."), "filesave", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); - (void)new KAction(i18n("Flip on &X Axis"), "view_left_right", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); - (void)new KAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); - - m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this), + m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", TQT_TQOBJECT(this), TQT_SLOT(layerRaise()), actionCollection(), "raiselayer"); + m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", TQT_TQOBJECT(this), TQT_SLOT(layerLower()), actionCollection(), "lowerlayer"); + m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", TQT_TQOBJECT(this), TQT_SLOT(layerFront()), actionCollection(), "toplayer"); + m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", TQT_TQOBJECT(this), TQT_SLOT(layerBack()), actionCollection(), "bottomlayer"); + m_layerProperties = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerProperties()), actionCollection(), "layer_properties"); + (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); + m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "filesave", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); + (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); + (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); + + m_createMask = new TDEAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask"); - m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), + m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskFromSelection()), actionCollection(), "mask_fromsel"); - m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), + m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); - m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()), + m_applyMask = new TDEAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()), actionCollection(), "apply_mask"); - m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this), + m_removeMask = new TDEAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); - m_showMask = new KToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this), + m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowMask()), actionCollection(), "show_mask"); - m_editMask = new KToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this), + m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask"); // image actions - m_imgFlatten = new KAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image"); - m_imgMergeLayer = new KAction(i18n("&Merge with Layer Below"), "Ctrl+E", TQT_TQOBJECT(this), TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer"); + m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image"); + m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", TQT_TQOBJECT(this), TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer"); // setting actions KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection(), "preferences"); - m_RulerAction = new KToggleAction( i18n( "Show Rulers" ), "Ctrl+R", TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" ); + m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" ); m_RulerAction->setChecked(cfg.showRulers()); m_RulerAction->setCheckedState(i18n("Hide Rulers")); m_RulerAction->setWhatsThis( i18n("The rulers show the horizontal and vertical positions of the mouse on the image " "and can be used to position your mouse at the right place on the canvas.

Uncheck this to disable " "the rulers from being displayed." ) ); - //m_guideAction = new KToggleAction( i18n( "Guide Lines" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); + //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); // Add new palette - new KAction(i18n("Add New Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPalette()), + new TDEAction(i18n("Add New Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPalette()), actionCollection(), "add_palette"); - new KAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()), + new TDEAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()), actionCollection(), "edit_palette"); // XXX: This triggers a repaint of the image, but way too early @@ -2569,7 +2569,7 @@ void KisView::canvasGotDropEvent(TQDropEvent *event) cancelId }; - KPopupMenu popup(this, "drop_popup"); + TDEPopupMenu popup(this, "drop_popup"); if (urls.count() == 1) { if (currentImg() != 0) { diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h index 514f789f..61d44ac4 100644 --- a/chalk/ui/kis_view.h +++ b/chalk/ui/kis_view.h @@ -61,11 +61,11 @@ class TQPopup; class TQPopupMenu; class DCOPObject; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class KPrinter; -class KToggleAction; -class KToolBar; +class TDEToggleAction; +class TDEToolBar; class KoPartSelectAction; class KoDocumentEntry; @@ -540,44 +540,44 @@ private: TQ_INT32 m_hScrollBarExtent; // Actions - KAction *m_imgFlatten; - KAction *m_imgMergeLayer; - KAction *m_imgRename; - KAction *m_imgResizeToLayer; - KAction *m_imgScan; + TDEAction *m_imgFlatten; + TDEAction *m_imgMergeLayer; + TDEAction *m_imgRename; + TDEAction *m_imgResizeToLayer; + TDEAction *m_imgScan; KoPartSelectAction * m_actionPartLayer; - KAction * m_actionAdjustmentLayer; - KAction *m_layerAdd; - KAction *m_layerBottom; - KAction *m_layerDup; - KToggleAction *m_layerHide; - KAction *m_layerLower; - KAction *m_layerProperties; - KAction *m_layerRaise; - KAction *m_layerRm; - KAction *m_layerSaveAs; - KAction *m_layerTop; - - KAction *m_createMask; - KAction *m_maskFromSelection; - KAction *m_maskToSelection; - KAction *m_applyMask; - KAction *m_removeMask; - KToggleAction *m_editMask; - KToggleAction *m_showMask; - - KAction *m_zoomIn; - KAction *m_zoomOut; - KAction *m_actualPixels; - KAction *m_actualSize; - KAction *m_fitToCanvas; - - KAction *m_fullScreen; - KAction *m_imgProperties; - - KToggleAction *m_RulerAction; - KToggleAction *m_guideAction; + TDEAction * m_actionAdjustmentLayer; + TDEAction *m_layerAdd; + TDEAction *m_layerBottom; + TDEAction *m_layerDup; + TDEToggleAction *m_layerHide; + TDEAction *m_layerLower; + TDEAction *m_layerProperties; + TDEAction *m_layerRaise; + TDEAction *m_layerRm; + TDEAction *m_layerSaveAs; + TDEAction *m_layerTop; + + TDEAction *m_createMask; + TDEAction *m_maskFromSelection; + TDEAction *m_maskToSelection; + TDEAction *m_applyMask; + TDEAction *m_removeMask; + TDEToggleAction *m_editMask; + TDEToggleAction *m_showMask; + + TDEAction *m_zoomIn; + TDEAction *m_zoomOut; + TDEAction *m_actualPixels; + TDEAction *m_actualSize; + TDEAction *m_fitToCanvas; + + TDEAction *m_fullScreen; + TDEAction *m_imgProperties; + + TDEToggleAction *m_RulerAction; + TDEToggleAction *m_guideAction; DCOPObject *m_dcop; diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 033e0c19..3db739d4 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -71,8 +71,8 @@ KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener, m_page->view->installEventFilter(this); m_page->view->setBackgroundMode(TQt::NoBackground); - m_zoomIn = new KAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomPlus()), TQT_TQOBJECT(this), "zoomIn" ); - m_zoomOut = new KAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomMinus()), TQT_TQOBJECT(this), "zoomOut" ); + m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomPlus()), TQT_TQOBJECT(this), "zoomIn" ); + m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomMinus()), TQT_TQOBJECT(this), "zoomOut" ); l->addWidget(m_page); diff --git a/chalk/ui/kobirdeyepanel.h b/chalk/ui/kobirdeyepanel.h index 61b85fb0..c93fc78e 100644 --- a/chalk/ui/kobirdeyepanel.h +++ b/chalk/ui/kobirdeyepanel.h @@ -28,7 +28,7 @@ #include class TQPixmap; -class KAction; +class TDEAction; class KoDocument; class WdgBirdEye; @@ -247,8 +247,8 @@ private: KoThumbnailAdapter * m_thumbnailProvider; KoCanvasAdapter * m_canvas; - KAction* m_zoomIn; - KAction* m_zoomOut; + TDEAction* m_zoomIn; + TDEAction* m_zoomOut; TQPixmap m_viewBuffer; TQPixmap m_thumbnail; diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 19f49200..790765b4 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -80,7 +80,7 @@ public: bool previewsShown; int itemHeight; TQValueList properties; - KPopupMenu contextMenu; + TDEPopupMenu contextMenu; LayerToolTip *tooltip; Private( TQWidget *parent, LayerList *list ); @@ -456,7 +456,7 @@ bool LayerList::property( int id, const TQString &name ) const return l->property( name ); } -KPopupMenu *LayerList::contextMenu() const +TDEPopupMenu *LayerList::contextMenu() const { return &( d->contextMenu ); } diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h index 39cd0214..b51a1c68 100644 --- a/chalk/ui/layerlist.h +++ b/chalk/ui/layerlist.h @@ -26,12 +26,12 @@ class TQMouseEvent; class TQString; -class KPopupMenu; +class TDEPopupMenu; class LayerItem; class LayerFolder; template class TQPtrList; -class LayerList: public KListView +class LayerList: public TDEListView { Q_OBJECT @@ -68,7 +68,7 @@ public: { enum { NewLayer = 0, NewFolder, RemoveLayer, LayerProperties, COUNT }; }; - KPopupMenu *contextMenu() const; + TDEPopupMenu *contextMenu() const; public slots: void setFoldersCanBeActive( bool can ); @@ -143,7 +143,7 @@ protected slots: virtual void menuActivated( int id, LayerItem *layer ); private: - typedef KListView super; + typedef TDEListView super; friend class LayerItem; friend class LayerToolTIp; @@ -166,7 +166,7 @@ protected: virtual void findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after ); }; -class LayerItem: public KListViewItem +class LayerItem: public TDEListViewItem { public: LayerItem( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 ); @@ -240,7 +240,7 @@ protected: virtual TQImage tooltipPreview() const; private: - typedef KListViewItem super; + typedef TDEListViewItem super; friend class LayerList; friend class LayerToolTip; diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 506e2803..0f18a51b 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -182,7 +182,7 @@ - + toolbar @@ -266,7 +266,7 @@ - KToolBar + TDEToolBar

ktoolbar.h
20 diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook index 6c78c8ce..029af8d7 100644 --- a/doc/chalk/developers-plugins.docbook +++ b/doc/chalk/developers-plugins.docbook @@ -385,8 +385,8 @@ View plugins do not have to register themselves, and they get access to a setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","chalkplugins/shearimage.rc"), true); - (void) new KAction(i18n("&Shear Image..."), 0, 0, this, SLOT(slotShearImage()), actionCollection(), "shearimage"); - (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, SLOT(slotShearLayer()), actionCollection(), "shearlayer"); + (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, SLOT(slotShearImage()), actionCollection(), "shearimage"); + (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, SLOT(slotShearLayer()), actionCollection(), "shearlayer"); m_view = (KisView*) parent; } @@ -1061,14 +1061,14 @@ to the action collection. However, everything seems to work, so why worry? -void KisToolStar::setup(KActionCollection *collection) +void KisToolStar::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(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); - m_action = new KRadioAction(i18n("&Star"), + TDEShortcut shortcut(Qt::Key_Plus); + shortcut.append(TDEShortcut(Qt::Key_F9)); + m_action = new TDERadioAction(i18n("&Star"), "tool_star", shortcut, this, diff --git a/example/example_view.cc b/example/example_view.cc index fe15ba4f..eab4fd7f 100644 --- a/example/example_view.cc +++ b/example/example_view.cc @@ -39,7 +39,7 @@ ExampleView::ExampleView( ExamplePart* part, TQWidget* parent, const char* name KStdAction::copy(this, TQT_SLOT( copy() ), actionCollection(), "copy" ); KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/example/example_view.h b/example/example_view.h index 30ff9132..527fe9a4 100644 --- a/example/example_view.h +++ b/example/example_view.h @@ -22,7 +22,7 @@ #include -class KAction; +class TDEAction; class TQPaintEvent; class ExamplePart; @@ -44,7 +44,7 @@ protected: virtual void updateReadWrite( bool readwrite ); private: - //KAction* m_cut; + //TDEAction* m_cut; }; #endif diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index 88d24dc6..e624cec8 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -284,7 +284,7 @@ &Selection of page - + listPages diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc index 9ddf240f..0c91952c 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cc +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc @@ -176,13 +176,13 @@ void KSpreadKexiImportDialog::populateTables() for ( it = tids.begin(); it != tids.end(); ++it ) { - (void) new KListViewItem(m_sourceList,"Table", conn->tableSchema(*it)->name()); + (void) new TDEListViewItem(m_sourceList,"Table", conn->tableSchema(*it)->name()); kdDebug() << "Table ID:" << (*it) << " " << conn->tableSchema(*it)->name()<< endl; } for ( it = qids.begin(); it != qids.end(); ++it ) { - (void) new KListViewItem(m_sourceList,"Query", conn->querySchema(*it)->name()); + (void) new TDEListViewItem(m_sourceList,"Query", conn->querySchema(*it)->name()); kdDebug() << "Query ID:" << (*it) << " " << conn->querySchema(*it)->name() << endl; } diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.h b/filters/kspread/kexi/kspread_kexiimportdialog.h index a7561525..36d51a2d 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.h +++ b/filters/kspread/kexi/kspread_kexiimportdialog.h @@ -48,7 +48,7 @@ namespace KSpread class View; } -class KListViewItem; +class TDEListViewItem; class KSpreadKexiImportDialog : public KSpreadKexiImportDialogBase { diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index fad0e0be..b58a8678 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -49,7 +49,7 @@ Table/Query - + Type diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 741a9c7e..85477aa2 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -410,7 +410,7 @@ Add - + langUsedList @@ -423,7 +423,7 @@ - + languagesList diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 741a9c7e..85477aa2 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -410,7 +410,7 @@ Add - + langUsedList @@ -423,7 +423,7 @@ - + languagesList diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index aa16c723..56f7a2e0 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -148,7 +148,7 @@ void XSLTExportDia::chooseSlot() if(dialog->exec() == TQDialog::Accepted) { u = dialog->selectedURL(); - KRecentDocument::add(dialog->selectedURL().url(), !dialog->selectedURL().isLocalFile()); + TDERecentDocument::add(dialog->selectedURL().url(), !dialog->selectedURL().isLocalFile()); } else //revert state { //if (bEmpty) openEmpty(); diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index b2e948cc..e232d26e 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -145,7 +145,7 @@ void XSLTImportDia::chooseSlot() if(dialog->exec() == TQDialog::Accepted) { u = dialog->selectedURL(); - KRecentDocument::add(dialog->selectedURL().url(), !dialog->selectedURL().isLocalFile()); + TDERecentDocument::add(dialog->selectedURL().url(), !dialog->selectedURL().isLocalFile()); } else //revert state { //if (bEmpty) openEmpty(); 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 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 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 #include -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 actionList; + TQPtrList 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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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(collection -> action( name() ) ); + m_action = static_cast(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 #include #include -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 &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 -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 * ); diff --git a/kchart/ChangeLog b/kchart/ChangeLog index 542c9a27..5d38df2f 100644 --- a/kchart/ChangeLog +++ b/kchart/ChangeLog @@ -208,7 +208,7 @@ Disable "Import Data" if inside KSpread * kchart_view.{h,cc} (m_importData): New member - (KChartView): Disable the KAction if data is unchangeable. + (KChartView): Disable the TDEAction if data is unchangeable. 2005-04-10 Inge Wallin @@ -224,7 +224,7 @@ * csvimportdialogui.ui: new file * Makefile.am: Add files above * kchart.rc (File menu): Add Action import_data - * kchart_view.cc (import_data): new KAction + * kchart_view.cc (import_data): new TDEAction (importData): new slot diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc index 30f1b275..c4b2cbc1 100644 --- a/kchart/kchartColorConfigPage.cc +++ b/kchart/kchartColorConfigPage.cc @@ -129,7 +129,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, TQHBox* dataColorHB = new TQHBox( gb ); grid->addMultiCellWidget( dataColorHB, 0, row, 2, 2 ); - _dataColorLB = new KListBox(dataColorHB); + _dataColorLB = new TDEListBox(dataColorHB); _dataColorCB = new KColorButton( dataColorHB); wtstr = i18n( "Choose a row/column in the list on the left and change its color using this button."); TQWhatsThis::add( _dataColorCB, wtstr ); diff --git a/kchart/kchartColorConfigPage.h b/kchart/kchartColorConfigPage.h index 21dfd969..cbafcdea 100644 --- a/kchart/kchartColorConfigPage.h +++ b/kchart/kchartColorConfigPage.h @@ -27,7 +27,7 @@ #include "koChart.h" #include "kchartcolorarray.h" -class KListBox; +class TDEListBox; namespace KChart @@ -118,7 +118,7 @@ private: // KColorButton* _edgeCB; // KColorButton* _dataCB[NUMDATACOLORS]; - KListBox* _dataColorLB; + TDEListBox* _dataColorLB; KColorButton* _dataColorCB; KChartColorArray extColor; uint index; diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc index d2a444b9..e5fdde2f 100644 --- a/kchart/kchartFontConfigPage.cc +++ b/kchart/kchartFontConfigPage.cc @@ -102,7 +102,7 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params, #if 0 // FIXME: Integrate the font chooser instead? Well, maybe later. - KFontChooser *fontChooser = new KFontChooser(this, "fontChooser"); + TDEFontChooser *fontChooser = new TDEFontChooser(this, "fontChooser"); grid->addMultiCellWidget(fontChooser, 0, 2, 1, 1); #endif @@ -170,18 +170,18 @@ void KChartFontConfigPage::changeLabelFont() = (xAxisIsRelative == yAxisIsRelative) ? (xAxisIsRelative ? TQButton::On : TQButton::Off) : TQButton::NoChange; - if (KFontDialog::getFontDiff( newFont, + if (TDEFontDialog::getFontDiff( newFont, flags, false, this, true, &newState ) != TQDialog::Rejected) { - if ( KFontChooser::FamilyList & flags ) { + if ( TDEFontChooser::FamilyList & flags ) { xAxis.setFamily( newFont.family() ); yAxis.setFamily( newFont.family() ); } - if ( KFontChooser::StyleList & flags ) { + if ( TDEFontChooser::StyleList & flags ) { xAxis.setWeight( newFont.weight() ); xAxis.setItalic( newFont.italic() ); xAxis.setUnderline( newFont.underline() ); @@ -193,13 +193,13 @@ void KChartFontConfigPage::changeLabelFont() yAxis.setStrikeOut( newFont.strikeOut() ); } - if ( KFontChooser::SizeList & flags ) { + if ( TDEFontChooser::SizeList & flags ) { xAxis.setPointSize( newFont.pointSize() ); yAxis.setPointSize( newFont.pointSize() ); } // CharSet settings are ignored since we are not TQt 2.x compatible - // if( KFontChooser::CharsetList & flags ) { + // if( TDEFontChooser::CharsetList & flags ) { // } if ( TQButton::NoChange != newState ) { @@ -211,7 +211,7 @@ void KChartFontConfigPage::changeLabelFont() else if ( font && state ) { TQFont newFont( *font ); TQButton::ToggleState newState = *state; - if (KFontDialog::getFont( newFont, + if (TDEFontDialog::getFont( newFont, false, this, true, diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc index e6c6c99b..36412a45 100644 --- a/kchart/kchartHeaderFooterConfigPage.cc +++ b/kchart/kchartHeaderFooterConfigPage.cc @@ -158,7 +158,7 @@ void KChartHeaderFooterConfigPage::apply() void KChartHeaderFooterConfigPage::changeTitleFont() { TQButton::ToggleState state = titleFontIsRelative; - if ( KFontDialog::getFont( titleFont,false,this, true,&state ) != TQDialog::Rejected + if ( TDEFontDialog::getFont( titleFont,false,this, true,&state ) != TQDialog::Rejected && TQButton::NoChange != state ) titleFontIsRelative = state; } @@ -166,7 +166,7 @@ void KChartHeaderFooterConfigPage::changeTitleFont() void KChartHeaderFooterConfigPage::changeSubtitleFont() { TQButton::ToggleState state = subtitleFontIsRelative; - if ( KFontDialog::getFont( subtitleFont,false,this, true,&state ) != TQDialog::Rejected + if ( TDEFontDialog::getFont( subtitleFont,false,this, true,&state ) != TQDialog::Rejected && TQButton::NoChange != state ) subtitleFontIsRelative = state; } @@ -174,7 +174,7 @@ void KChartHeaderFooterConfigPage::changeSubtitleFont() void KChartHeaderFooterConfigPage::changeFooterFont() { TQButton::ToggleState state = footerFontIsRelative; - if ( KFontDialog::getFont( footerFont,false,this, true,&state ) != TQDialog::Rejected + if ( TDEFontDialog::getFont( footerFont,false,this, true,&state ) != TQDialog::Rejected && TQButton::NoChange != state ) footerFontIsRelative = state; } diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc index 58d9acf2..154ce2a7 100644 --- a/kchart/kchartLegendConfigPage.cc +++ b/kchart/kchartLegendConfigPage.cc @@ -282,7 +282,7 @@ void KChartLegendConfigPage::init() void KChartLegendConfigPage::changeTitleLegendFont() { TQButton::ToggleState state = titleLegendIsRelative; - if ( KFontDialog::getFont( titleLegend,false,this, true,&state ) != TQDialog::Rejected + if ( TDEFontDialog::getFont( titleLegend,false,this, true,&state ) != TQDialog::Rejected && TQButton::NoChange != state ) titleLegendIsRelative = state; } @@ -290,7 +290,7 @@ void KChartLegendConfigPage::changeTitleLegendFont() void KChartLegendConfigPage::changeTextLegendFont() { TQButton::ToggleState state = textLegendIsRelative; - if ( KFontDialog::getFont( textLegend,false,this, true,&state ) != TQDialog::Rejected + if ( TDEFontDialog::getFont( textLegend,false,this, true,&state ) != TQDialog::Rejected && TQButton::NoChange != state ) textLegendIsRelative = state; } diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc index 396264d8..9ac1a265 100644 --- a/kchart/kchartWizardLabelsLegendPage.cc +++ b/kchart/kchartWizardLabelsLegendPage.cc @@ -204,39 +204,39 @@ KChartWizardLabelsLegendPage::~KChartWizardLabelsLegendPage() void KChartWizardLabelsLegendPage::changeLegendTextFont() { - if (KFontDialog::getFont( _legendTextFont,false,this ) == TQDialog::Rejected ) + if (TDEFontDialog::getFont( _legendTextFont,false,this ) == TQDialog::Rejected ) return; } void KChartWizardLabelsLegendPage::changeLegendTitleFont() { - if (KFontDialog::getFont( _legendTitleFont,false,this ) == TQDialog::Rejected ) + if (TDEFontDialog::getFont( _legendTitleFont,false,this ) == TQDialog::Rejected ) return; } void KChartWizardLabelsLegendPage::changeXLabelFont() { - if (KFontDialog::getFont( xlabel,false,this ) == TQDialog::Rejected ) + if (TDEFontDialog::getFont( xlabel,false,this ) == TQDialog::Rejected ) return; } void KChartWizardLabelsLegendPage::changeYLabelFont() { - if (KFontDialog::getFont( ylabel ,false,this ) == TQDialog::Rejected ) + if (TDEFontDialog::getFont( ylabel ,false,this ) == TQDialog::Rejected ) return; } #if 0 void KChartWizardLabelsLegendPage::changeY2LabelFont() { - if (KFontDialog::getFont( ylabel2, false, this ) == TQDialog::Rejected ) + if (TDEFontDialog::getFont( ylabel2, false, this ) == TQDialog::Rejected ) return; } #endif void KChartWizardLabelsLegendPage::changeTitleFont() { - if (KFontDialog::getFont( title ,false,this ) == TQDialog::Rejected ) + if (TDEFontDialog::getFont( title ,false,this ) == TQDialog::Rejected ) return; } diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc index 76be1f0d..cf0e4a09 100644 --- a/kchart/kchartWizardSetupAxesPage.cc +++ b/kchart/kchartWizardSetupAxesPage.cc @@ -223,7 +223,7 @@ void KChartWizardSetupAxesPage::changeGridColor(const TQColor &_color) void KChartWizardSetupAxesPage::changeLabelFont() { - if( KFontDialog::getFont( ylabel,false,this ) == TQDialog::Rejected ) + if( TDEFontDialog::getFont( ylabel,false,this ) == TQDialog::Rejected ) return; } diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc index 00606e81..62fd3825 100644 --- a/kchart/kchart_view.cc +++ b/kchart/kchart_view.cc @@ -64,100 +64,100 @@ KChartView::KChartView( KChartPart* part, TQWidget* parent, const char* name ) m_dcop = 0; dcopObject(); // build it - m_importData = new KAction( i18n( "Import Data..." ), 0, + m_importData = new TDEAction( i18n( "Import Data..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( importData() ), actionCollection(), "import_data" ); #if 0 - KAction * actionExtraCreateTemplate = + TDEAction * actionExtraCreateTemplate = #endif - new KAction( i18n( "&Create Template From Document..." ), 0, + new TDEAction( i18n( "&Create Template From Document..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); - m_wizard = new KAction( i18n("Customize with &Wizard..."), + m_wizard = new TDEAction( i18n("Customize with &Wizard..."), "wizard", 0, TQT_TQOBJECT(this), TQT_SLOT( wizard() ), actionCollection(), "wizard"); - m_edit = new KAction( i18n("Edit &Data..."), "edit", 0, + m_edit = new TDEAction( i18n("Edit &Data..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( editData() ), actionCollection(), "editdata"); - m_config = new KAction( i18n( "&Chart..." ), "configure", 0, + m_config = new TDEAction( i18n( "&Chart..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfig() ), actionCollection(), "config" ); - // One KToggleAction per chart type - m_chartbars = new KToggleAction( i18n("&Bar"), "chart_bar_3d", 0, TQT_TQOBJECT(this), + // One TDEToggleAction per chart type + m_chartbars = new TDEToggleAction( i18n("&Bar"), "chart_bar_3d", 0, TQT_TQOBJECT(this), TQT_SLOT( barsChart() ), actionCollection(), "barschart"); m_chartbars->setExclusiveGroup( "charttypes" ); m_chartbars->setChecked( true ); - m_chartline = new KToggleAction( i18n("&Line"), "chart_line", 0, TQT_TQOBJECT(this), + m_chartline = new TDEToggleAction( i18n("&Line"), "chart_line", 0, TQT_TQOBJECT(this), TQT_SLOT( lineChart() ), actionCollection(), "linechart"); m_chartline->setExclusiveGroup( "charttypes" ); - m_chartareas = new KToggleAction( i18n("&Area"), "chart_area", 0, TQT_TQOBJECT(this), + m_chartareas = new TDEToggleAction( i18n("&Area"), "chart_area", 0, TQT_TQOBJECT(this), TQT_SLOT( areasChart() ), actionCollection(), "areaschart"); m_chartareas->setExclusiveGroup( "charttypes" ); - m_charthilo = new KToggleAction( i18n("&HiLo"), "chart_hilo", 0, TQT_TQOBJECT(this), + m_charthilo = new TDEToggleAction( i18n("&HiLo"), "chart_hilo", 0, TQT_TQOBJECT(this), TQT_SLOT( hiLoChart() ), actionCollection(), "hilochart"); m_charthilo->setExclusiveGroup( "charttypes" ); - m_chartbw = new KToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, TQT_TQOBJECT(this), + m_chartbw = new TDEToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, TQT_TQOBJECT(this), TQT_SLOT( bwChart() ), actionCollection(), "bwchart"); m_chartbw->setExclusiveGroup( "charttypes" ); - m_chartpie = new KToggleAction( i18n("&Pie"), "chart_pie", 0, TQT_TQOBJECT(this), + m_chartpie = new TDEToggleAction( i18n("&Pie"), "chart_pie", 0, TQT_TQOBJECT(this), TQT_SLOT( pieChart() ), actionCollection(), "piechart"); m_chartpie->setExclusiveGroup( "charttypes" ); - m_chartring = new KToggleAction( i18n("&Ring"), "chart_ring", 0, TQT_TQOBJECT(this), + m_chartring = new TDEToggleAction( i18n("&Ring"), "chart_ring", 0, TQT_TQOBJECT(this), TQT_SLOT( ringChart() ), actionCollection(), "ringchart"); m_chartring->setExclusiveGroup( "charttypes" ); - m_chartpolar = new KToggleAction( i18n("&Polar"), "chart_polar", 0, TQT_TQOBJECT(this), + m_chartpolar = new TDEToggleAction( i18n("&Polar"), "chart_polar", 0, TQT_TQOBJECT(this), TQT_SLOT( polarChart() ), actionCollection(), "polarchart"); m_chartpolar->setExclusiveGroup( "charttypes" ); - // Configuration KActions - m_colorConfig = new KAction( i18n( "&Colors..." ), 0, + // Configuration TDEActions + m_colorConfig = new TDEAction( i18n( "&Colors..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigColor() ), actionCollection(), "color_config" ); - m_fontConfig = new KAction( i18n( "&Font..." ), 0, + m_fontConfig = new TDEAction( i18n( "&Font..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigFont() ), actionCollection(), "font_config" ); - m_backConfig = new KAction( i18n( "&Background..." ), 0, + m_backConfig = new TDEAction( i18n( "&Background..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigBack() ), actionCollection(), "back_config" ); - m_legendConfig = new KAction( i18n( "&Legend..." ), 0, + m_legendConfig = new TDEAction( i18n( "&Legend..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigLegend() ), actionCollection(), "legend_config" ); - m_subTypeChartConfig = new KAction( i18n( "Chart &Sub-type..." ), 0, + m_subTypeChartConfig = new TDEAction( i18n( "Chart &Sub-type..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigSubTypeChart() ), actionCollection(), "legend_subtype" ); - m_dataFormatConfig = new KAction( i18n( "&Data Format..." ), 0, + m_dataFormatConfig = new TDEAction( i18n( "&Data Format..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigDataFormat() ), actionCollection(), "data_format" ); - m_headerFooterConfig = new KAction( i18n( "&Header && Footer..." ), 0, + m_headerFooterConfig = new TDEAction( i18n( "&Header && Footer..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigHeaderFooterChart() ), actionCollection(), "headerfooter_subtype" ); - m_pageLayoutConfig = new KAction( i18n( "Page Layout..." ), 0, + m_pageLayoutConfig = new TDEAction( i18n( "Page Layout..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigPageLayout() ), actionCollection(), "page_layout" ); diff --git a/kchart/kchart_view.h b/kchart/kchart_view.h index dc41acf6..c8d5784e 100644 --- a/kchart/kchart_view.h +++ b/kchart/kchart_view.h @@ -10,8 +10,8 @@ #include #include "kdchart/KDChartAxisParams.h" -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class TQPaintEvent; class DCOPObject; @@ -77,30 +77,30 @@ protected: void updateButton(); private: - KAction *m_importData; - KAction *m_wizard; - KAction *m_edit; - KAction *m_config; - KAction *m_saveconfig; - KAction *m_loadconfig; - KAction *m_defaultconfig; - KAction *m_colorConfig; - KAction *m_fontConfig; - KAction *m_backConfig; - KAction *m_legendConfig; - KAction *m_dataFormatConfig; - KAction *m_subTypeChartConfig; - KAction *m_headerFooterConfig; - KAction *m_pageLayoutConfig; - - KToggleAction *m_chartpie; - KToggleAction *m_chartareas; - KToggleAction *m_chartbars; - KToggleAction *m_chartline; - KToggleAction *m_charthilo; - KToggleAction *m_chartring; - KToggleAction *m_chartpolar; - KToggleAction *m_chartbw; + TDEAction *m_importData; + TDEAction *m_wizard; + TDEAction *m_edit; + TDEAction *m_config; + TDEAction *m_saveconfig; + TDEAction *m_loadconfig; + TDEAction *m_defaultconfig; + TDEAction *m_colorConfig; + TDEAction *m_fontConfig; + TDEAction *m_backConfig; + TDEAction *m_legendConfig; + TDEAction *m_dataFormatConfig; + TDEAction *m_subTypeChartConfig; + TDEAction *m_headerFooterConfig; + TDEAction *m_pageLayoutConfig; + + TDEToggleAction *m_chartpie; + TDEToggleAction *m_chartareas; + TDEToggleAction *m_chartbars; + TDEToggleAction *m_chartline; + TDEToggleAction *m_charthilo; + TDEToggleAction *m_chartring; + TDEToggleAction *m_chartpolar; + TDEToggleAction *m_chartbw; DCOPObject *m_dcop; diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index 851a4d3a..72004434 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -29,16 +29,16 @@ #include #include -KAction_setEnabled_Helper::KAction_setEnabled_Helper(KexiActionProxy* proxy) - : TQObject(0,"KAction_setEnabled_Helper") +TDEAction_setEnabled_Helper::TDEAction_setEnabled_Helper(KexiActionProxy* proxy) + : TQObject(0,"TDEAction_setEnabled_Helper") , m_proxy( proxy ) { } -void KAction_setEnabled_Helper::slotSetEnabled(bool enabled) +void TDEAction_setEnabled_Helper::slotSetEnabled(bool enabled) { - if (sender()->inherits("KAction")) { - const KAction *a = static_cast(sender()); + if (sender()->inherits("TDEAction")) { + const TDEAction *a = static_cast(sender()); m_proxy->setAvailable(a->name(), enabled); } } @@ -81,7 +81,7 @@ KexiActionProxy::KexiActionProxy(TQObject *receiver, KexiSharedActionHost *host) , m_signals(47) , m_actionProxyParent(0) , m_signal_parent( 0, "signal_parent" ) - , m_KAction_setEnabled_helper( new KAction_setEnabled_Helper(this) ) + , m_TDEAction_setEnabled_helper( new TDEAction_setEnabled_Helper(this) ) , m_focusedChild(0) { m_signals.setAutoDelete(true); @@ -103,7 +103,7 @@ KexiActionProxy::~KexiActionProxy() m_host->takeActionProxyFor(m_receiver); - delete m_KAction_setEnabled_helper; + delete m_TDEAction_setEnabled_helper; } void KexiActionProxy::plugSharedAction(const char *action_name, TQObject* receiver, const char *slot) @@ -130,7 +130,7 @@ void KexiActionProxy::unplugSharedAction(const char *action_name) int KexiActionProxy::plugSharedAction(const char *action_name, TQWidget* w) { - KAction *a = sharedAction(action_name); + TDEAction *a = sharedAction(action_name); if (!a) { kdWarning() << "KexiActionProxy::plugSharedAction(): NO SUCH ACTION: " << action_name << endl; return -1; @@ -140,7 +140,7 @@ int KexiActionProxy::plugSharedAction(const char *action_name, TQWidget* w) void KexiActionProxy::unplugSharedAction(const char *action_name, TQWidget* w) { - KAction *a = sharedAction(action_name); + TDEAction *a = sharedAction(action_name); if (!a) { kdWarning() << "KexiActionProxy::unplugSharedAction(): NO SUCH ACTION: " << action_name << endl; return; @@ -148,16 +148,16 @@ void KexiActionProxy::unplugSharedAction(const char *action_name, TQWidget* w) a->unplug(w); } -KAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w) +TDEAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w) { - KAction *a = sharedAction(action_name); + TDEAction *a = sharedAction(action_name); if (!a) { kdWarning() << "KexiActionProxy::plugSharedAction(): NO SUCH ACTION: " << action_name << endl; return 0; } TQCString altName = a->name(); altName += "_alt"; - KAction *alt_act = new KAction(alternativeText, a->iconSet(), a->shortcut(), + TDEAction *alt_act = new TDEAction(alternativeText, a->iconSet(), a->shortcut(), 0, 0, a->parent(), altName); TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate())); alt_act->plug(w); @@ -170,7 +170,7 @@ KAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQStri void KexiActionProxy::plugSharedActionToExternalGUI(const char *action_name, KXMLGUIClient *client) { - KAction *a = client->action(action_name); + TDEAction *a = client->action(action_name); if (!a) return; plugSharedAction(a->name(), a, TQT_SLOT(activate())); @@ -178,7 +178,7 @@ void KexiActionProxy::plugSharedActionToExternalGUI(const char *action_name, KXM //update availability setAvailable(a->name(), a->isEnabled()); //changes will be signaled - TQObject::connect(a, TQT_SIGNAL(enabled(bool)), m_KAction_setEnabled_helper, TQT_SLOT(slotSetEnabled(bool))); + TQObject::connect(a, TQT_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQT_SLOT(slotSetEnabled(bool))); } void KexiActionProxy::plugSharedActionsToExternalGUI( @@ -208,7 +208,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe return true; } -KAction* KexiActionProxy::sharedAction(const char* action_name) +TDEAction* KexiActionProxy::sharedAction(const char* action_name) { return m_host->mainWindow()->actionCollection()->action(action_name); } diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h index 163efced..d9868976 100644 --- a/kexi/core/kexiactionproxy.h +++ b/kexi/core/kexiactionproxy.h @@ -32,9 +32,9 @@ #include "kexisharedactionhost.h" class TQSignal; -class KAction; +class TDEAction; class KXMLGUIClient; -class KAction_setEnabled_Helper; +class TDEAction_setEnabled_Helper; class KexiActionProxy; //! Abstract helper class used to connect shared actions from outside of shared-action-aware object. @@ -122,7 +122,7 @@ class KEXICORE_EXPORT KexiActionProxy Does nothing if no action found, so generally this is safer than just caling e.g. action("myaction")->plug(myPopup); \return index of inserted item, or -1 if there is not action with name \a action_name. - \sa action(), KAction::plug(TQWidget*, int) */ + \sa action(), TDEAction::plug(TQWidget*, int) */ int plugSharedAction(const char *action_name, TQWidget* w); void plugSharedActionToExternalGUI(const char *action_name, KXMLGUIClient *client); @@ -139,10 +139,10 @@ class KEXICORE_EXPORT KexiActionProxy specified by \a action_name is activated. The aternative action has autmatically set name as: action_name + "_alt". \return newly created action or 0 if \a action_name not found. */ - KAction* plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w); + TDEAction* plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w); /*! \return action named with \a name or NULL if there is no such action. */ - virtual KAction* sharedAction(const char* action_name); + virtual TDEAction* sharedAction(const char* action_name); inline TQObject *receiver() const { return m_receiver; } @@ -165,14 +165,14 @@ class KEXICORE_EXPORT KexiActionProxy TQPtrList m_sharedActionChildren; - TQPtrList m_alternativeActions; + TQPtrList m_alternativeActions; KexiActionProxy* m_actionProxyParent; TQObject m_signal_parent; //!< it's just to have common parent for owned signals //! For internal use by plugSharedActionToExternalGUI() - KAction_setEnabled_Helper *m_KAction_setEnabled_helper; + TDEAction_setEnabled_Helper *m_TDEAction_setEnabled_helper; public: //! For internal use by addActionProxyChild(). \a parent can be 0. @@ -182,7 +182,7 @@ class KEXICORE_EXPORT KexiActionProxy KexiActionProxy *m_focusedChild; friend class KexiSharedActionHost; - friend class KAction_setEnabled_Helper; + friend class TDEAction_setEnabled_Helper; friend class KexiSharedActionConnector; }; diff --git a/kexi/core/kexiactionproxy_p.h b/kexi/core/kexiactionproxy_p.h index 07931b9c..57d351ce 100644 --- a/kexi/core/kexiactionproxy_p.h +++ b/kexi/core/kexiactionproxy_p.h @@ -25,12 +25,12 @@ class KexiActionProxy; //! Helper class for KexiActionProxy::plugSharedActionToExternalGUI() method. -class KAction_setEnabled_Helper : public TQObject +class TDEAction_setEnabled_Helper : public TQObject { Q_OBJECT public: - KAction_setEnabled_Helper(KexiActionProxy* proxy); + TDEAction_setEnabled_Helper(KexiActionProxy* proxy); public slots: void slotSetEnabled(bool enabled); diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h index cf455885..ae1169a9 100644 --- a/kexi/core/kexidialogbase.h +++ b/kexi/core/kexidialogbase.h @@ -34,7 +34,7 @@ class TQWidgetStack; class KexiMainWindow; class KexiViewBase; -class KActionCollection; +class TDEActionCollection; class KexiContextHelpInfo; namespace KexiPart { class Part; diff --git a/kexi/core/keximainwindow.h b/kexi/core/keximainwindow.h index 4dbb6b18..1f14e0d6 100644 --- a/kexi/core/keximainwindow.h +++ b/kexi/core/keximainwindow.h @@ -75,7 +75,7 @@ class KEXICORE_EXPORT KexiMainWindow : public KMdiMainFrm, public KexiSharedActi /*! \return a list of all actions defined by application. Not all of them are shared. Don't use plug these actions in your windows by hand but user methods from KexiViewBase! */ - virtual KActionPtrList allActions() const = 0; + virtual TDEActionPtrList allActions() const = 0; /*! \return currently active dialog (window) od 0 if there is no active dialog. */ virtual KexiDialogBase* currentDialog() const = 0; diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index 49f1aeab..e1ed78fe 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -126,11 +126,11 @@ void Part::createGUIClients(KexiMainWindow *win) m_guiClient = new GUIClient(m_mainWin, this, false, "part"); //default actions for part's gui client: - KAction *act = new KAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, + TDEAction *act = new TDEAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, TQT_SLOT(slotCreate()), m_mainWin->actionCollection(), KexiPart::nameForCreateAction(*info())); act->plug( m_mainWin->findPopupMenu("insert") ); -// new KAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, +// new TDEAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, // TQT_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1()); //let init specific actions for parts // initPartActions( m_guiClient->actionCollection() ); @@ -161,14 +161,14 @@ void Part::createGUIClients(KexiMainWindow *win) } } -KActionCollection* Part::actionCollectionForMode(int viewMode) const +TDEActionCollection* Part::actionCollectionForMode(int viewMode) const { KXMLGUIClient *cli = m_instanceGuiClients[viewMode]; return cli ? cli->actionCollection() : 0; } -KAction* Part::createSharedAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, +TDEAction* Part::createSharedAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName) { GUIClient *instanceGuiClient = m_instanceGuiClients[mode]; @@ -180,8 +180,8 @@ KAction* Part::createSharedAction(int mode, const TQString &text, instanceGuiClient->actionCollection(), subclassName); } -KAction* Part::createSharedPartAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, +TDEAction* Part::createSharedPartAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName) { if (!m_guiClient) @@ -190,19 +190,19 @@ KAction* Part::createSharedPartAction(const TQString &text, m_guiClient->actionCollection(), subclassName); } -KAction* Part::createSharedToggleAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name) +TDEAction* Part::createSharedToggleAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name) { - return createSharedAction(mode, text, pix_name, cut, name, "KToggleAction"); + return createSharedAction(mode, text, pix_name, cut, name, "TDEToggleAction"); } -KAction* Part::createSharedPartToggleAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name) +TDEAction* Part::createSharedPartToggleAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name) { - return createSharedPartAction(text, pix_name, cut, name, "KToggleAction"); + return createSharedPartAction(text, pix_name, cut, name, "TDEToggleAction"); } -/*KAction* Part::sharedAction(int mode, const char* name, const char *classname) +/*TDEAction* Part::sharedAction(int mode, const char* name, const char *classname) { GUIClient *instanceGuiClient = m_instanceGuiClients[mode]; if (!instanceGuiClient) { @@ -212,7 +212,7 @@ KAction* Part::createSharedPartToggleAction(const TQString &text, return instanceGuiClient->actionCollection()->action(name, classname); } -KAction* Part::sharedPartAction(int mode, const char* name, const char *classname) +TDEAction* Part::sharedPartAction(int mode, const char* name, const char *classname) { if (!m_guiClient) return 0; @@ -223,7 +223,7 @@ void Part::setActionAvailable(const char *action_name, bool avail) { TQIntDictIterator it( m_instanceGuiClients ); for (;it.current();++it) { - KAction *act = it.current()->actionCollection()->action(action_name); + TDEAction *act = it.current()->actionCollection()->action(action_name); if (act) { act->setEnabled(avail); return; @@ -438,10 +438,10 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName() +"part"+(partInstanceClient?"inst":"")+"ui.rc"); -// new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this, +// new TDEAction(part->m_names["new"], part->info()->itemIcon(), 0, this, // TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); -// new KAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, +// new TDEAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, // TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); // win->guiFactory()->addClient(this); diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h index 752140d1..1d800854 100644 --- a/kexi/core/kexipart.h +++ b/kexi/core/kexipart.h @@ -28,13 +28,13 @@ #include "kexi.h" #include "keximainwindow.h" -class KActionCollection; +class TDEActionCollection; class KexiDialogBase; class KexiDialogTempData; class KexiViewBase; class KexiMainWindowImpl; -class KAction; -class KShortcut; +class TDEAction; +class TDEShortcut; class KTabWidget; namespace KexiPart @@ -184,7 +184,7 @@ class KEXICORE_EXPORT Part : public TQObject #endif /*! \return action collection for mode \a viewMode. */ - KActionCollection* actionCollectionForMode(int viewMode) const; + TDEActionCollection* actionCollectionForMode(int viewMode) const; const Kexi::ObjectStatus& lastOperationStatus() const { return m_status; } @@ -222,14 +222,14 @@ class KEXICORE_EXPORT Part : public TQObject void createGUIClients(KexiMainWindow *win); #if 0 - /*! For reimplementation. Create here all part actions (KAction or similar). + /*! For reimplementation. Create here all part actions (TDEAction or similar). "Part action" is an action that is bound to given part, not for dialogs created with this part, eg. "Open external project" action for Form part. Default implementation does nothing. */ - virtual void initPartActions( KActionCollection * ) {}; + virtual void initPartActions( TDEActionCollection * ) {}; - /*! For reimplementation. You should here create all instance actions (KAction or similar) + /*! For reimplementation. You should here create all instance actions (TDEAction or similar) for \a mode (this method called for every value given by Kexi::ViewMode enum, and in special cases, in the future - for user-defined part-specific modes). Actions should be bound to action collection \a col. @@ -241,7 +241,7 @@ class KEXICORE_EXPORT Part : public TQObject all supported views. Default implementation does nothing. */ - virtual void initInstanceActions( int mode, KActionCollection *col ) {}; + virtual void initInstanceActions( int mode, TDEActionCollection *col ) {}; #endif virtual void initPartActions(); @@ -255,29 +255,29 @@ class KEXICORE_EXPORT Part : public TQObject /*! Creates shared action for action collection declared for 'instance actions' of this part. See KexiSharedActionHost::createSharedAction() for details. - Pass desired KAction subclass with \a subclassName (e.g. "KToggleAction") to have - that subclass allocated instead just KAction (what is the default). */ - KAction* createSharedAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, + Pass desired TDEAction subclass with \a subclassName (e.g. "TDEToggleAction") to have + that subclass allocated instead just TDEAction (what is the default). */ + TDEAction* createSharedAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName = 0); /*! Convenience version of above method - creates shared toggle action. */ - KAction* createSharedToggleAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name); + TDEAction* createSharedToggleAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name); /*! Creates shared action for action collection declared for 'part actions' of this part. See KexiSharedActionHost::createSharedAction() for details. - Pass desired KAction subclass with \a subclassName (e.g. "KToggleAction") to have - that subclass allocated instead just KAction (what is the default). */ - KAction* createSharedPartAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, + Pass desired TDEAction subclass with \a subclassName (e.g. "TDEToggleAction") to have + that subclass allocated instead just TDEAction (what is the default). */ + TDEAction* createSharedPartAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName = 0); /*! Convenience version of above method - creates shared toggle action for 'part actions' of this part. */ - KAction* createSharedPartToggleAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name); + TDEAction* createSharedPartToggleAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name); void setActionAvailable(const char *action_name, bool avail); diff --git a/kexi/core/kexipartinfo.h b/kexi/core/kexipartinfo.h index b7ad6f29..2159377d 100644 --- a/kexi/core/kexipartinfo.h +++ b/kexi/core/kexipartinfo.h @@ -150,7 +150,7 @@ class KEXICORE_EXPORT Info Private *d; }; -/*! \return "create" KAction's name for part defined by \a info. +/*! \return "create" TDEAction's name for part defined by \a info. The result is like "tablepart_create". Used in Part::createGUIClients() and KexiBrowser. */ KEXICORE_EXPORT TQCString nameForCreateAction(const Info& info); diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 4c7bc9ea..550cfe7c 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -80,7 +80,7 @@ void KexiSharedActionHost::setAsDefaultHost() //-------------------------------------------------- -KexiSharedActionHost::KexiSharedActionHost(KMainWindow* mainWin) +KexiSharedActionHost::KexiSharedActionHost(TDEMainWindow* mainWin) : d( new KexiSharedActionHostPrivate(this) ) { d->mainWin = mainWin; @@ -98,7 +98,7 @@ KexiSharedActionHost::~KexiSharedActionHost() void KexiSharedActionHost::setActionAvailable(const char *action_name, bool avail) { - KAction *act = d->mainWin->actionCollection()->action(action_name); + TDEAction *act = d->mainWin->actionCollection()->action(action_name); if (act) { act->setEnabled(avail); } @@ -132,7 +132,7 @@ void KexiSharedActionHost::plugActionProxy(KexiActionProxy *proxy) d->actionProxies.insert( proxy->receiver(), proxy ); } -KMainWindow* KexiSharedActionHost::mainWindow() const +TDEMainWindow* KexiSharedActionHost::mainWindow() const { return d->mainWin; } @@ -144,12 +144,12 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o) bool insideDialogBase = o && (o->inherits("KexiDialogBase") || 0!=KexiUtils::findParent(o, "KexiDialogBase")); KexiActionProxy *p = o ? d->actionProxies[ o ] : 0; - for (KActionPtrList::ConstIterator it=d->sharedActions.constBegin(); it!=d->sharedActions.constEnd(); ++it) { + for (TDEActionPtrList::ConstIterator it=d->sharedActions.constBegin(); it!=d->sharedActions.constEnd(); ++it) { // setActionAvailable((*it)->name(),p && p->isAvailable((*it)->name())); - KAction *a = *it; + TDEAction *a = *it; if (!insideDialogBase && d->mainWin->actionCollection()!=a->parentCollection()) { //o is not KexiDialogBase or its child: - // only invalidate action if it comes from mainwindow's KActionCollection + // only invalidate action if it comes from mainwindow's TDEActionCollection // (thus part-actions are untouched when the focus is e.g. in the Property Editor) continue; } @@ -157,7 +157,7 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o) KexiVolatileActionData *va = d->volatileActions[ a ]; if (va != 0) { if (p && p->isSupported(a->name())) { - TQPtrList actions_list; + TQPtrList actions_list; actions_list.append( a ); if (!va->plugged) { va->plugged=true; @@ -212,7 +212,7 @@ TQWidget* KexiSharedActionHost::focusWindow() return fw; } -KAction* KexiSharedActionHost::createSharedActionInternal( KAction *action ) +TDEAction* KexiSharedActionHost::createSharedActionInternal( TDEAction *action ) { TQObject::connect(action,TQT_SIGNAL(activated()), &d->actionMapper, TQT_SLOT(map())); d->actionMapper.setMapping(action, action->name()); @@ -220,63 +220,63 @@ KAction* KexiSharedActionHost::createSharedActionInternal( KAction *action ) return action; } -KActionPtrList KexiSharedActionHost::sharedActions() const +TDEActionPtrList KexiSharedActionHost::sharedActions() const { return d->sharedActions; } -/*class KexiAction : public KAction +/*class KexiAction : public TDEAction { public: KexiAction(const TQString &text, const TQIconSet &pix, - const KShortcut &cut, const TQObject *receiver, - const char *slot, KActionCollection *parent, const char *name) - : KAction(text,pix,cut,receiver,slot,parent,name) + const TDEShortcut &cut, const TQObject *receiver, + const char *slot, TDEActionCollection *parent, const char *name) + : TDEAction(text,pix,cut,receiver,slot,parent,name) { } TQPtrDict unplugged; };*/ -KAction* KexiSharedActionHost::createSharedAction(const TQString &text, const TQString &pix_name, - const KShortcut &cut, const char *name, KActionCollection* col, const char *subclassName) +TDEAction* KexiSharedActionHost::createSharedAction(const TQString &text, const TQString &pix_name, + const TDEShortcut &cut, const char *name, TDEActionCollection* col, const char *subclassName) { if (subclassName==0) return createSharedActionInternal( - new KAction(text, pix_name, + new TDEAction(text, pix_name, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name) ); - else if (tqstricmp(subclassName,"KToggleAction")==0) + else if (tqstricmp(subclassName,"TDEToggleAction")==0) return createSharedActionInternal( - new KToggleAction(text, pix_name, + new TDEToggleAction(text, pix_name, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name) ); - else if (tqstricmp(subclassName,"KActionMenu")==0) + else if (tqstricmp(subclassName,"TDEActionMenu")==0) return createSharedActionInternal( - new KActionMenu(text, pix_name, col ? col : d->mainWin->actionCollection(), name) + new TDEActionMenu(text, pix_name, col ? col : d->mainWin->actionCollection(), name) ); -//TODO: more KAction subclasses +//TODO: more TDEAction subclasses return 0; } -KAction* KexiSharedActionHost::createSharedAction( KStdAction::StdAction id, const char *name, - KActionCollection* col) +TDEAction* KexiSharedActionHost::createSharedAction( KStdAction::StdAction id, const char *name, + TDEActionCollection* col) { return createSharedActionInternal( KStdAction::create( id, name, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection() ) ); } -KAction* KexiSharedActionHost::createSharedAction(const KGuiItem& guiItem, const KShortcut &cut, - const char *name, KActionCollection* col) +TDEAction* KexiSharedActionHost::createSharedAction(const KGuiItem& guiItem, const TDEShortcut &cut, + const char *name, TDEActionCollection* col) { return createSharedActionInternal( - new KAction(guiItem, cut, 0/*receiver*/, 0/*slot*/, + new TDEAction(guiItem, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name)); } -void KexiSharedActionHost::setActionVolatile( KAction *a, bool set ) +void KexiSharedActionHost::setActionVolatile( TDEAction *a, bool set ) { if (!set) { d->volatileActions.remove( a ); diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h index c7fcb181..5b2046d6 100644 --- a/kexi/core/kexisharedactionhost.h +++ b/kexi/core/kexisharedactionhost.h @@ -28,9 +28,9 @@ #include #include -class KShortcut; +class TDEShortcut; class KGuiItem; -class KMainWindow; +class TDEMainWindow; class KexiActionProxy; class KexiSharedActionHostPrivate; @@ -40,7 +40,7 @@ namespace KexiPart { //! Acts as application-wide host that offers shared actions. /*! - You can inherit this class together with KMainWindow (or any KMainWindow). + You can inherit this class together with TDEMainWindow (or any TDEMainWindow). Call setAsDefaultHost() to make the host default for all shared actions that have not explicitly specified host. @@ -54,7 +54,7 @@ class KEXICORE_EXPORT KexiSharedActionHost public: /*! Constructs host for main window \a mainWin. */ - KexiSharedActionHost(KMainWindow* mainWin); + KexiSharedActionHost(TDEMainWindow* mainWin); virtual ~KexiSharedActionHost(); @@ -86,10 +86,10 @@ class KEXICORE_EXPORT KexiSharedActionHost static KexiSharedActionHost& defaultHost(); /*! \return shared actions list. */ - KActionPtrList sharedActions() const; + TDEActionPtrList sharedActions() const; /*! PROTOTYPE, DO NOT USE YET */ - void setActionVolatile( KAction *a, bool set ); + void setActionVolatile( TDEAction *a, bool set ); protected: @@ -100,7 +100,7 @@ class KEXICORE_EXPORT KexiSharedActionHost Otherwise the action is disabled. If \a o is not KexiDialogBase or its child, - actions are only invalidated if these come from mainwindow's KActionCollection + actions are only invalidated if these come from mainwindow's TDEActionCollection (thus part-actions are untouched when the focus is e.g. in the Property Editor. Call this method when it is known that some actions need invalidation @@ -118,28 +118,28 @@ class KEXICORE_EXPORT KexiSharedActionHost void updateActionAvailable(const char *action_name, bool avail, TQObject *obj); /*! \return main window for which this host is defined. */ - KMainWindow* mainWindow() const; + TDEMainWindow* mainWindow() const; /*! Creates shared action using \a text, \a pix_name pixmap, shortcut \a cut, optional \a name. You can pass your own action collection as \a col. If \a col action collection is null, main window's action will be used. - Pass desired KAction subclass with \a subclassName (e.g. "KToggleAction") to have - that subclass allocated instead just KAction (what is the default). + Pass desired TDEAction subclass with \a subclassName (e.g. "TDEToggleAction") to have + that subclass allocated instead just TDEAction (what is the default). Created action's data is owned by the main window. */ - KAction* createSharedAction(const TQString &text, const TQString &pix_name, - const KShortcut &cut, const char *name, KActionCollection* col = 0, + TDEAction* createSharedAction(const TQString &text, const TQString &pix_name, + const TDEShortcut &cut, const char *name, TDEActionCollection* col = 0, const char *subclassName = 0); /*! Like above - creates shared action, but from standard action identified by \a id. Action's data is owned by the main window. */ - KAction* createSharedAction( KStdAction::StdAction id, const char *name, - KActionCollection* col = 0); + TDEAction* createSharedAction( KStdAction::StdAction id, const char *name, + TDEActionCollection* col = 0); /*! Creates shared action with name \a name and shortcut \a cut by copying all properties of \a guiItem. If \a col action collection is null, main window's action will be used. */ - KAction* createSharedAction(const KGuiItem& guiItem, const KShortcut &cut, const char *name, - KActionCollection* col = 0); + TDEAction* createSharedAction(const KGuiItem& guiItem, const TDEShortcut &cut, const char *name, + TDEActionCollection* col = 0); /*! \return action proxy for object \a o, or NULL if this object has no plugged shared actions. */ @@ -151,7 +151,7 @@ class KEXICORE_EXPORT KexiSharedActionHost private: /*! Helper function for createSharedAction(). */ - KAction* createSharedActionInternal( KAction *action ); + TDEAction* createSharedActionInternal( TDEAction *action ); KexiSharedActionHostPrivate *d; diff --git a/kexi/core/kexisharedactionhost_p.h b/kexi/core/kexisharedactionhost_p.h index 605cc681..eef28a19 100644 --- a/kexi/core/kexisharedactionhost_p.h +++ b/kexi/core/kexisharedactionhost_p.h @@ -34,7 +34,7 @@ class KexiVolatileActionData { public: KexiVolatileActionData() { plugged=false; } -// KAction *kaction; +// TDEAction *kaction; bool plugged : 1; }; @@ -52,8 +52,8 @@ class KEXICORE_EXPORT KexiSharedActionHostPrivate : public TQObject public: TQPtrDict actionProxies; - KMainWindow *mainWin; - KActionPtrList sharedActions; + TDEMainWindow *mainWin; + TDEActionPtrList sharedActions; TQSignalMapper actionMapper; TQPtrDict volatileActions; TQAsciiDict enablers; diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index b0966463..5a79929e 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -11,8 +11,8 @@ #include "keximainwindow.h" #include "kexiuseraction.h" -KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap) - : KAction(text, pixmap, KShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1()) +KexiUserAction::KexiUserAction(KexiMainWindow *win, TDEActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap) + : TDEAction(text, pixmap, TDEShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1()) { m_win = win; m_method = 0; @@ -59,7 +59,7 @@ KexiUserAction::execute() } KexiUserAction * -KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c) +KexiUserAction::fromCurrentRecord(KexiMainWindow *context, TDEActionCollection *parent, KexiDB::Cursor *c) { if(!c || c->bof() || c->eof()) return 0; diff --git a/kexi/core/kexiuseraction.h b/kexi/core/kexiuseraction.h index 57b82984..602d5751 100644 --- a/kexi/core/kexiuseraction.h +++ b/kexi/core/kexiuseraction.h @@ -16,7 +16,7 @@ typedef TQValueVector Arguments; the actions can have some predefined \ref Methods which are described in \ref KexiUserActionMethod e.g. OpenObject, ExecuteScript ... those methods take different arguments also described in \ref KexiUserActionMethod */ -class KEXICORE_EXPORT KexiUserAction : public KAction +class KEXICORE_EXPORT KexiUserAction : public TDEAction { Q_OBJECT @@ -48,7 +48,7 @@ class KEXICORE_EXPORT KexiUserAction : public KAction /*! constructs an action \note methods are associated using setMethod() */ - KexiUserAction(KexiMainWindow *context, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap); + KexiUserAction(KexiMainWindow *context, TDEActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap); ~KexiUserAction(); /*! sets execution information associated with this action this will mostly look like @@ -64,11 +64,11 @@ class KEXICORE_EXPORT KexiUserAction : public KAction /*! creates a KexiUserAction from current record in \a c mostly needed for creation from kexi__useractions table */ - static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c); + static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, TDEActionCollection *parent, KexiDB::Cursor *c); protected slots: /*! actually executes the associated method - \note KexiUserAction automatically connects KAction::activated() to KexiUserAction::execute() + \note KexiUserAction automatically connects TDEAction::activated() to KexiUserAction::execute() */ void execute(); diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp index 65f2e68f..c4eb3eaa 100644 --- a/kexi/core/kexiviewbase.cpp +++ b/kexi/core/kexiviewbase.cpp @@ -289,12 +289,12 @@ void KexiViewBase::setFocus() m_mainWin->invalidateSharedActions(TQT_TQOBJECT(this)); } -KAction* KexiViewBase::sharedAction( const char *action_name ) +TDEAction* KexiViewBase::sharedAction( const char *action_name ) { if (part()) { - KActionCollection *ac; + TDEActionCollection *ac; if ( (ac = part()->actionCollectionForMode( viewMode() )) ) { - KAction* a = ac->action( action_name ); + TDEAction* a = ac->action( action_name ); if (a) return a; } @@ -305,8 +305,8 @@ KAction* KexiViewBase::sharedAction( const char *action_name ) void KexiViewBase::setAvailable(const char* action_name, bool set) { if (part()) { - KActionCollection *ac; - KAction* a; + TDEActionCollection *ac; + TDEAction* a; if ( (ac = part()->actionCollectionForMode( viewMode() )) && (a = ac->action( action_name )) ) { a->setEnabled(set); //why? return; diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h index b0984157..adca7622 100644 --- a/kexi/core/kexiviewbase.h +++ b/kexi/core/kexiviewbase.h @@ -97,7 +97,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy \return shared action with name \a action_name for this view. If there's no such action declared in Kexi Part (part()), global shared action is returned (if exists). */ - virtual KAction* sharedAction( const char *action_name ); + virtual TDEAction* sharedAction( const char *action_name ); /*! Enables or disables shared action declared in Kexi Part (part()). If there's no such action, global shared action is enabled or disabled (if exists). */ diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index c5779c17..6584f5ff 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -2128,7 +2128,7 @@ Form Designer - autocaption is set properly for field editor on design time - field editor's labelCaption is no longer needed - propeditor: preserve "changed" flags (marked with BOLD) between property set switching -- KAcceleratorManager::setNoAccel(QWidget*) is used for widgets in design mode +- TDEAcceleratorManager::setNoAccel(QWidget*) is used for widgets in design mode to avoid adding accelerators (for FormIO and for new widgets inserting) - factories: isPropertyVisibleInternal() is now called for superclass when needed (thus, properties like "iconText" are properly hidden) @@ -3394,7 +3394,7 @@ Parser Core - KexiSharedActionHost::invalidateSharedActions(QObject *o) if o is not KexiDialogBase or its child, - only invalidate actions if these come from mainwindow's KActionCollection + only invalidate actions if these come from mainwindow's TDEActionCollection (thus part-actions are untouched when the focus is e.g. in the Property Editor. - KexiViewBase::setDirty() -do not signal 'dirty' flag's changes if no change - ObjectStatus now also stores related KexiDB::Obeject's, for more verbose errors @@ -3776,8 +3776,8 @@ Core - KexiDialogBase now has activate(), deactivate() handlers, KexiViewBase::updateActions(bool activated) is called for a current view - Workaround found for integrating katepart's actions with Kexi's shared actions: - - katepart KXMLGUIClient's KActions are now pluggable to KexiActionProxy - - KXMLGUIClient's KAction::enabled(bool) signals are now automatically mapped + - katepart KXMLGUIClient's TDEActions are now pluggable to KexiActionProxy + - KXMLGUIClient's TDEAction::enabled(bool) signals are now automatically mapped to KexiActionProxy::setAvailable(bool) : introduce KexiSharedXMLGUIClient class: ctor: KexiSharedXMLGUIClient(KexiSharedActionHost *host, KXMLGUIClient *client). @@ -3786,7 +3786,7 @@ Core (ie. when given KexiViewBase object that is activated asks for this) and detached when not needed. showOnlyActions(QCStringList) - declares custom action list that will only be available - In any time, no KActions will be created if these already are available globally + In any time, no TDEActions will be created if these already are available globally within KexiMainWindow. SQL View @@ -4298,7 +4298,7 @@ Main Window : some top level polishing -'save' action now works int the current dialog context -message about more not impelmented features added -proper quitting and project closing - -KMainWindow::queryExit() and queryClose() impelmented instad of closeEvent() + -TDEMainWindow::queryExit() and queryClose() impelmented instad of closeEvent() -"Create" menu is disabled when no project is loaded -On last dialog closing, guiclient is removed (so dead toolbar are hidden now) -Main Window: dock windows are disabled on project closing, for sanity @@ -5620,7 +5620,7 @@ TODO: add drag from browser - moving TableViews back from outside of scroll view area automatically shrinks scroll view's area to smallest possible size - field that we drag over now is highlighted -TODO: fix KListView::viewportPaintEvent() like in KexiRelationViewTable::drawItemHighlighter() +TODO: fix TDEListView::viewportPaintEvent() like in KexiRelationViewTable::drawItemHighlighter() and commit to cvs (tdeui) - KexiRelationViewTableContainer got now focus/unfocus/z-order functionality. Colors of table headers are consistent with focusing and OS settings @@ -5651,7 +5651,7 @@ TODO: like above: "Print" and "Print to" 2003-07-18 - " " prepended to Project Browsers' list items' texts for better look (maybe add this feature - to KListView or make its generic subclass?) + to TDEListView or make its generic subclass?) - Some fixes with text positioning in tableview cells: float and date type y-offset, date type editor frames removed TODO: maybe optionally use KDateWidget (this needs to extend and improve this class)? @@ -5683,13 +5683,13 @@ TODO: move this submenu after 'Error report' Entry (requires changes to koffice_ - project browser's groups items (tables, queries,..) are now non-selectable as these are rather special constant containers - added convenient hidden(), shown() signals to KexiDialogBase -- added KexiDialogBase::plugToggleAction(KToggleAction *toggle_action) for syncing window +- added KexiDialogBase::plugToggleAction(TDEToggleAction *toggle_action) for syncing window visibility with toggle action's state 2003-07-15 - Kexi/win32 synced with cvs again after plugins/ rearrangement. - New Kexi icon updated for win32 -- menubar and popupmenu entries in Query Part merged using KexiPartItemAction (new KAction subclass); +- menubar and popupmenu entries in Query Part merged using KexiPartItemAction (new TDEAction subclass); The same for Tables Part. KexiPartPopupMenu now collaborates with KexiPartItemAction to reuse its action's information (avoid redundancy). TODO: add delete_item action icon (equal "button_cancel" in crystalsvg) to the koffice/actions icons diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 98582bfc..d7274acb 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -256,7 +256,7 @@ I am using update_kexi_po to recreate kexi.po file. THis will run cd koffice/ && - signal on situation when user e.g. pressed alpha key when only numeric chars is allowed - signal when null/empty value forcell isn't permitted - signal when repeated value isn't permitted - - add support for cut, copy & paste of cell's contents (get shortcuts from KStdAccel) + - add support for cut, copy & paste of cell's contents (get shortcuts from TDEStdAccel) HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem the problem was with repainting when hscrollbar disapperars.... - KexiTableView loads all data from the table: very slow and consumes a lot of memory: @@ -269,7 +269,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem - add more cell types & options: http://mfc.dundas.com/mfc/grid/index.aspx?section=Grid&body=celltypes.htm --including: red corner with a note; sliders; radio buttons -- highlight sorted column's cells slightly darker, like in current KListView's impl. +- highlight sorted column's cells slightly darker, like in current TDEListView's impl. - clicking on a header section (to sort), it ensures current cell is visible, but only y-position should be changed, not x - add support for crossed out rows - that can be used for results of DELETE queries @@ -344,7 +344,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem - KTextEdit doesn't allow to set custom cursor (also in Qt Designer) - support for multiple widgets selection in the property editor (requires changes to kexiproperty) - handle older and newer formats in FormIO::loadFormFromDom() -- KAcceleratorManager::setNoAccel(QWidget*) - use it in data mode, +- TDEAcceleratorManager::setNoAccel(QWidget*) - use it in data mode, define "auto accels" form's property and if it's false - find a way to create more meaningfull default names for widgets than button1, button2. Maybe convert widget text (if available) using string2Identifier()? diff --git a/kexi/doc/plan/kexi-announce.txt b/kexi/doc/plan/kexi-announce.txt index 4975fff7..ea12380b 100644 --- a/kexi/doc/plan/kexi-announce.txt +++ b/kexi/doc/plan/kexi-announce.txt @@ -34,7 +34,7 @@ * It (will be) still properly integrated with other KOffice compontents (KWord mailmerge, KChart graphs, Kugar reports, KSpread tables ...) and/or reuse them -* Work on moving Kexi-as-KoMainWindow/KoDocument-driven application to Kexi-as-KMainWindow/KexiDB-driven application is stared by Kexi Team +* Work on moving Kexi-as-KoMainWindow/KoDocument-driven application to Kexi-as-TDEMainWindow/KexiDB-driven application is stared by Kexi Team %%% diff --git a/kexi/formeditor/TODO b/kexi/formeditor/TODO index 611d5c0c..bb435414 100644 --- a/kexi/formeditor/TODO +++ b/kexi/formeditor/TODO @@ -1,6 +1,6 @@ ^^^^^^^^^^^^^^^ IMPORTANT ^^^^^^^^^^^^^^^^^^^^^^ **** New Features : ****** -* KMainWindow support : Make an action editor + a toolbar editor (as in MozillaFirebird ?) + a menu editor +* TDEMainWindow support : Make an action editor + a toolbar editor (as in MozillaFirebird ?) + a menu editor (see Gambas and askk other devs if they already have done this) * Automatically set label name to the text * Create an event editor and manage signals/slots (EventBuffer ?) @@ -61,6 +61,6 @@ * Manage label buddies using a popup menu (24/05/04) * dragging with CTRL key can cause object's copying (25/05/04) * Create a PixmapCollection with an editor which allow to choose pixmaps by path or from KDE icons, no inline saving of pixmaps (9/06/04) -* Make actions toggable (with KToggleAction) (js 11/06/04) +* Make actions toggable (with TDEToggleAction) (js 11/06/04) * Make FormWidget pure virtual (17/06/04) * Resize label to fit the text (22/06/04) diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 929624ab..fece5065 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -748,7 +748,7 @@ InsertWidgetCommand::execute() //! @todo allow setting this for data view mode as well if (m_form->designMode()) { //don't generate accelerators for widgets in design mode - KAcceleratorManager::setNoAccel(w); + TDEAcceleratorManager::setNoAccel(w); } #endif @@ -902,7 +902,7 @@ CreateLayoutCommand::execute() if (w) { if (m_form->designMode()) { //don't generate accelerators for widgets in design mode - KAcceleratorManager::setNoAccel(w); + TDEAcceleratorManager::setNoAccel(w); } } #endif diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 281e5604..0287135e 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -87,7 +87,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) vlayout->addStretch(); //// The listview /////////// - m_listview = new KListView(m_contents, "editlistview_listview"); + m_listview = new TDEListView(m_contents, "editlistview_listview"); m_listview->setItemsRenameable(true); m_listview->setItemsMovable(true); m_listview->setDragEnabled(true); @@ -148,7 +148,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) vbox->addStretch(); // The listbox with columns name ///// - m_listbox = new KListBox(m_column, "editlistview_columns"); + m_listbox = new TDEListBox(m_column, "editlistview_columns"); m_listbox->setFocus(); hbox->insertWidget(0, m_listbox); hbox->addWidget(m_editor); @@ -364,12 +364,12 @@ void EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *parent) { TQListViewItem *newItem; - if(listview->inherits("KListView")) + if(listview->inherits("TDEListView")) { if(parent) - newItem = new KListViewItem(parent); + newItem = new TDEListViewItem(parent); else - newItem = new KListViewItem(listview); + newItem = new TDEListViewItem(listview); } else { @@ -406,14 +406,14 @@ EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, T void EditListViewDialog::newRow() { - KListViewItem *parent = (KListViewItem*)m_listview->selectedItem(); + TDEListViewItem *parent = (TDEListViewItem*)m_listview->selectedItem(); if(parent) - parent = (KListViewItem*)parent->parent(); - KListViewItem *item; + parent = (TDEListViewItem*)parent->parent(); + TDEListViewItem *item; if(parent) - item = new KListViewItem(parent, m_listview->selectedItem()); + item = new TDEListViewItem(parent, m_listview->selectedItem()); else - item = new KListViewItem(m_listview, m_listview->selectedItem()); + item = new TDEListViewItem(m_listview, m_listview->selectedItem()); item->setText(0, i18n("New Item")); m_listview->setCurrentItem(item); } @@ -421,12 +421,12 @@ EditListViewDialog::newRow() void EditListViewDialog::newChildRow() { - KListViewItem *parent = (KListViewItem*)m_listview->currentItem(); - KListViewItem *item; + TDEListViewItem *parent = (TDEListViewItem*)m_listview->currentItem(); + TDEListViewItem *item; if(parent) - item = new KListViewItem(parent); + item = new TDEListViewItem(parent); else - item = new KListViewItem(m_listview, m_listview->currentItem()); + item = new TDEListViewItem(m_listview, m_listview->currentItem()); item->setText(0, i18n("Sub Item")); m_listview->setCurrentItem(item); diff --git a/kexi/formeditor/editlistviewdialog.h b/kexi/formeditor/editlistviewdialog.h index 0eb3017b..cfbaadbb 100644 --- a/kexi/formeditor/editlistviewdialog.h +++ b/kexi/formeditor/editlistviewdialog.h @@ -27,9 +27,9 @@ class TQFrame; class TQListView; class TQListViewItem; -class KListViewItem; -class KListView; -class KListBox; +class TDEListViewItem; +class TDEListView; +class TDEListBox; class TQListBoxItem; namespace KoProperty { @@ -40,12 +40,12 @@ namespace KoProperty { namespace KFormDesigner { -//! A dialog to edit the contents of a listvuew (KListView or TQListView) +//! A dialog to edit the contents of a listvuew (TDEListView or TQListView) /*! The dialog contains two pages, one to edit columns and one to edit ist items. KoProperty::Editor is used in columns to edit column properties (there are two properties not supported by TQt Designer: 'width' and 'resizable'). The user can enter list contents inside the list - using KListViewItem::setRenameable(). Pixmaps are not yet supported. */ + using TDEListViewItem::setRenameable(). Pixmaps are not yet supported. */ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase { Q_OBJECT @@ -84,8 +84,8 @@ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase KoProperty::Editor *m_editor; KoProperty::Set *m_propSet; TQFrame *m_contents, *m_column; - KListBox *m_listbox; - KListView *m_listview; + TDEListBox *m_listbox; + TDEListView *m_listview; TQIntDict m_buttons; }; diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index be97d921..1669b329 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -217,7 +217,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wListBox = new KFormDesigner::WidgetInfo(this); wListBox->setPixmap("listbox"); - wListBox->setClassName("KListBox"); + wListBox->setClassName("TDEListBox"); wListBox->addAlternateClassName(TQLISTBOX_OBJECT_NAME_STRING); wListBox->setIncludeFileName("klistbox.h"); wListBox->setName(i18n("List Box")); @@ -239,7 +239,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wListView = new KFormDesigner::WidgetInfo(this); wListView->setPixmap("listview"); - wListView->setClassName("KListView"); + wListView->setClassName("TDEListView"); wListView->addAlternateClassName(TQLISTVIEW_OBJECT_NAME_STRING); wListView->setIncludeFileName("klistview.h"); wListView->setName(i18n("List View")); @@ -411,18 +411,18 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, else if(c == "KComboBox") w = new KComboBox(p, n); - else if(c == "KListBox") - w = new KListBox(p, n); + else if(c == "TDEListBox") + w = new TDEListBox(p, n); else if(c == "KTextEdit") w = new KTextEdit(/*i18n("Enter your text here")*/text, TQString(), p, n); - else if(c == "KListView") + else if(c == "TDEListView") { - w = new KListView(p, n); + w = new TDEListView(p, n); if(container->form()->interactiveMode()) - ((KListView*)w)->addColumn(i18n("Column 1")); - ((KListView*)w)->setRootIsDecorated(true); + ((TDEListView*)w)->addColumn(i18n("Column 1")); + ((TDEListView*)w)->setRootIsDecorated(true); } else if(c == TQSLIDER_OBJECT_NAME_STRING) w = new TQSlider(Qt::Horizontal, p, n); @@ -475,7 +475,7 @@ StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPo menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); return true; } - else if(classname == "KListView") + else if(classname == "TDEListView") { menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQT_SLOT(editListContents())); return true; @@ -538,12 +538,12 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes createEditor(classname, check->text(), check, container, editorRect, TQt::AlignAuto); return true; } - else if((classname == "KComboBox") || (classname == "KListBox")) + else if((classname == "KComboBox") || (classname == "TDEListBox")) { TQStringList list; - if(classname == "KListBox") + if(classname == "TDEListBox") { - KListBox *listbox = (KListBox*)w; + TDEListBox *listbox = (TDEListBox*)w; for(uint i=0; i < listbox->count(); i++) list.append(listbox->text(i)); } @@ -556,10 +556,10 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes if(editList(w, list)) { - if(classname == "KListBox") + if(classname == "TDEListBox") { - ((KListBox*)w)->clear(); - ((KListBox*)w)->insertStringList(list); + ((TDEListBox*)w)->clear(); + ((TDEListBox*)w)->insertStringList(list); } else if(classname == "KComboBox") { @@ -582,10 +582,10 @@ StdWidgetFactory::clearWidgetContent(const TQCString &classname, TQWidget *w) { if(classname == "KLineEdit") ((KLineEdit*)w)->clear(); - else if(classname == "KListBox") - ((KListBox*)w)->clear(); - else if(classname == "KListView") - ((KListView*)w)->clear(); + else if(classname == "TDEListBox") + ((TDEListBox*)w)->clear(); + else if(classname == "TDEListView") + ((TDEListView*)w)->clear(); else if(classname == "KComboBox") ((KComboBox*)w)->clear(); else if(classname == "KTextEdit") @@ -680,9 +680,9 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString } return true; } - else if(name == "list_items" && classname == "KListBox") + else if(name == "list_items" && classname == "TDEListBox") { - KListBox *listbox = (KListBox*)w; + TDEListBox *listbox = (TDEListBox*)w; for(uint i=0; i < listbox->count(); i++) { TQDomElement item = domDoc.createElement("item"); @@ -691,9 +691,9 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString } return true; } - else if(name == "list_contents" && classname == "KListView") + else if(name == "list_contents" && classname == "TDEListView") { - KListView *listview = (KListView*)w; + TDEListView *listview = (TDEListView*)w; // First we save the columns for(int i = 0; i < listview->columns(); i++) { @@ -755,9 +755,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & return true; } - if((tag == "item") && (classname == "KListBox")) + if((tag == "item") && (classname == "TDEListBox")) { - KListBox *listbox = (KListBox*)w; + TDEListBox *listbox = (TDEListBox*)w; TQVariant val = KFormDesigner::FormIO::readPropertyValue(node.firstChild().firstChild(), TQT_TQOBJECT(w), name); if(val.canCast(TQVariant::Pixmap)) listbox->insertItem(val.toPixmap()); @@ -766,9 +766,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & return true; } - if((tag == "column") && (classname == "KListView")) + if((tag == "column") && (classname == "TDEListView")) { - KListView *listview = (KListView*)w; + TDEListView *listview = (TDEListView*)w; int id=0; for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { @@ -787,9 +787,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & } return true; } - else if((tag == "item") && (classname == "KListView")) + else if((tag == "item") && (classname == "TDEListView")) { - KListView *listview = (KListView*)w; + TDEListView *listview = (TDEListView*)w; readListItem(node, 0, listview); return true; } @@ -798,13 +798,13 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & } void -StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview) +StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, TDEListView *listview) { TQListViewItem *item; if(parent) - item = new KListViewItem(parent); + item = new TDEListViewItem(parent); else - item = new KListViewItem(listview); + item = new TDEListViewItem(listview); // We need to move the item at the end of the list TQListViewItem *last; @@ -919,9 +919,9 @@ StdWidgetFactory::autoSaveProperties(const TQCString &classname) l << "pixmap"; else if(classname == "KComboBox") l << "list_items"; - else if(classname == "KListBox") + else if(classname == "TDEListBox") l << "list_items"; - else if(classname == "KListView") + else if(classname == "TDEListView") l << "list_contents"; else if(classname == "Line") l << "orientation"; diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h index a99bf6a8..32898782 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.h +++ b/kexi/formeditor/factories/stdwidgetfactory.h @@ -92,7 +92,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory virtual bool changeText(const TQString &newText); virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname); void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc); - void readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview); + void readListItem(TQDomElement &node, TQListViewItem *parent, TDEListView *listview); private: // KFormDesigner::Container *m_container; diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 52d44966..31344419 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -97,7 +97,7 @@ Form::Form(WidgetLibrary* library, const char *name, bool designMode) d->design = designMode; // Init actions - d->collection = new KActionCollection(0, this); + d->collection = new TDEActionCollection(0, this); d->history = new KCommandHistory(d->collection, true); connect(d->history, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(slotCommandExecuted())); connect(d->history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(slotFormRestored())); @@ -321,11 +321,11 @@ Form::emitActionSignals(bool withUndoAction) if(!withUndoAction) return; - KAction *undoAction = d->collection->action("edit_undo"); + TDEAction *undoAction = d->collection->action("edit_undo"); if(undoAction) FormManager::self()->emitUndoEnabled(undoAction->isEnabled(), undoAction->text()); - KAction *redoAction = d->collection->action("edit_redo"); + TDEAction *redoAction = d->collection->action("edit_redo"); if(redoAction) FormManager::self()->emitRedoEnabled(redoAction->isEnabled(), redoAction->text()); } @@ -428,7 +428,7 @@ Form::slotCommandExecuted() void Form::emitUndoEnabled() { - KAction *undoAction = d->collection->action("edit_undo"); + TDEAction *undoAction = d->collection->action("edit_undo"); if(undoAction) FormManager::self()->emitUndoEnabled(undoAction->isEnabled(), undoAction->text()); } @@ -436,7 +436,7 @@ Form::emitUndoEnabled() void Form::emitRedoEnabled() { - KAction *redoAction = d->collection->action("edit_redo"); + TDEAction *redoAction = d->collection->action("edit_redo"); if(redoAction) FormManager::self()->emitRedoEnabled(redoAction->isEnabled(), redoAction->text()); } diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h index 084e7d20..7f79cf79 100644 --- a/kexi/formeditor/form.h +++ b/kexi/formeditor/form.h @@ -31,7 +31,7 @@ class TQWidget; class TQDomElement; -class KActionCollection; +class TDEActionCollection; class KCommandHistory; class KCommand; class PixmapCollection; @@ -101,7 +101,7 @@ class FormPrivate TQString filename; KCommandHistory *history; - KActionCollection *collection; + TDEActionCollection *collection; ObjectTreeList tabstops; bool autoTabstops; diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index f90efddd..993b2451 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -1201,7 +1201,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren //! @todo allow setting this for data view mode as well if (m_currentForm->designMode()) { //don't generate accelerators for widgets in design mode - KAcceleratorManager::setNoAccel(w); + TDEAcceleratorManager::setNoAccel(w); } #endif w->setStyle(&(container->widget()->style())); diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index f9849c35..284ce405 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -192,7 +192,7 @@ FormManager::setObjectTreeView(ObjectTreeView *treeview) } ActionList -FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KXMLGUIClient* client) +FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection, KXMLGUIClient* client) { m_collection = collection; @@ -201,8 +201,8 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX if (m_options & HideSignalSlotConnections) m_dragConnection = 0; else { - m_dragConnection = new KToggleAction(i18n("Connect Signals/Slots"), - "signalslot", KShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection, + m_dragConnection = new TDEToggleAction(i18n("Connect Signals/Slots"), + "signalslot", TDEShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection, "drag_connection"); //to be exclusive with any 'widget' action m_dragConnection->setExclusiveGroup("LibActionWidgets"); @@ -210,19 +210,19 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX actions.append(m_dragConnection); } - m_pointer = new KToggleAction(i18n("Pointer"), "mouse_pointer", KShortcut(0), + m_pointer = new TDEToggleAction(i18n("Pointer"), "mouse_pointer", TDEShortcut(0), this, TQT_SLOT(slotPointerClicked()), m_collection, "pointer"); m_pointer->setExclusiveGroup("LibActionWidgets"); //to be exclusive with any 'widget' action m_pointer->setChecked(true); actions.append(m_pointer); - m_snapToGrid = new KToggleAction(i18n("Snap to Grid"), TQString(), KShortcut(0), + m_snapToGrid = new TDEToggleAction(i18n("Snap to Grid"), TQString(), TDEShortcut(0), 0, 0, m_collection, "snap_to_grid"); m_snapToGrid->setChecked(true); actions.append(m_snapToGrid); // Create the Style selection action (with a combo box in toolbar and submenu items) - KSelectAction *m_style = new KSelectAction( i18n("Style"), KShortcut(0), + TDESelectAction *m_style = new TDESelectAction( i18n("Style"), TDEShortcut(0), this, TQT_SLOT(slotStyle()), m_collection, "change_style"); m_style->setEditable(false); @@ -501,7 +501,7 @@ FormManager::windowChanged(TQWidget *w) { #ifndef KFD_NO_STYLES // update the 'style' action - KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction"); + TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction"); const TQString currentStyle = form->widget()->style().name(); const TQStringList styles = m_style->items(); @@ -544,7 +544,7 @@ FormManager::windowChanged(TQWidget *w) { #ifndef KFD_NO_STYLES // update the 'style' action - KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction"); + TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction"); const TQString currentStyle = form->widget()->style().name(); const TQStringList styles = m_style->items(); @@ -787,7 +787,7 @@ FormManager::setInsertPoint(const TQPoint &p) void FormManager::createSignalMenu(TQWidget *w) { - m_sigSlotMenu = new KPopupMenu(); + m_sigSlotMenu = new TDEPopupMenu(); m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals")); TQStrList list = w->metaObject()->signalNames(true); @@ -808,7 +808,7 @@ FormManager::createSignalMenu(TQWidget *w) void FormManager::createSlotMenu(TQWidget *w) { - m_sigSlotMenu = new KPopupMenu(); + m_sigSlotMenu = new TDEPopupMenu(); m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Slots")); TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) ); @@ -853,7 +853,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu // TQValueVector menuIds(); if (!m_popup) { - m_popup = new KPopupMenu(); + m_popup = new TDEPopupMenu(); } else { m_popup->clear(); @@ -872,7 +872,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu m_popup->insertTitle(SmallIcon("multiple_obj"), i18n("Multiple Widgets") + TQString(" (%1)").arg(widgetsCount)); - KAction *a; + TDEAction *a; #define PLUG_ACTION(_name, forceVisible) \ { a = action(_name); \ if (a && (forceVisible || a->isEnabled())) { \ @@ -903,7 +903,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu if (separatorNeeded) m_popup->insertSeparator(); - KPopupMenu *sub = new KPopupMenu(w); + TDEPopupMenu *sub = new TDEPopupMenu(w); TQWidget *buddy = ((TQLabel*)w)->buddy(); sub->insertItem(i18n("No Buddy"), MenuNoBuddy); @@ -936,7 +936,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu m_popup->insertSeparator(); // We create the signals menu - KPopupMenu *sigMenu = new KPopupMenu(); + TDEPopupMenu *sigMenu = new TDEPopupMenu(); TQStrList list = w->metaObject()->signalNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) @@ -1206,7 +1206,7 @@ FormManager::slotStyle() if(!activeForm()) return; - KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction"); + TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction"); TQString style = m_style->currentText(); activeForm()->widget()->setStyle( style ); @@ -1684,26 +1684,26 @@ FormManager::changeFont() //single widget's settings widget = widgetsWithFontProperty.first(); KoProperty::Property &fontProp = m_propSet->property("font"); - if (TQDialog::Accepted != KFontDialog::getFont(font, false, m_active->widget())) + if (TQDialog::Accepted != TDEFontDialog::getFont(font, false, m_active->widget())) return; fontProp = font; return; } //multiple widgets int diffFlags=0; - if (TQDialog::Accepted != KFontDialog::getFontDiff(font, diffFlags, false, m_active->widget()) + if (TQDialog::Accepted != TDEFontDialog::getFontDiff(font, diffFlags, false, m_active->widget()) || 0==diffFlags) return; //update font for (WidgetListIterator it(widgetsWithFontProperty); (widget = it.current()); ++it) { TQFont prevFont( widget->font() ); - if (diffFlags & KFontChooser::FontDiffFamily) + if (diffFlags & TDEFontChooser::FontDiffFamily) prevFont.setFamily( font.family() ); - if (diffFlags & KFontChooser::FontDiffStyle) { + if (diffFlags & TDEFontChooser::FontDiffStyle) { prevFont.setBold( font.bold() ); prevFont.setItalic( font.italic() ); } - if (diffFlags & KFontChooser::FontDiffSize) + if (diffFlags & TDEFontChooser::FontDiffSize) prevFont.setPointSize( font.pointSize() ); /*! @todo this modification is not added to UNDO BUFFER: do it when KoProperty::Set supports multiple selections */ diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h index 39006a7b..036bf90e 100644 --- a/kexi/formeditor/formmanager.h +++ b/kexi/formeditor/formmanager.h @@ -30,14 +30,14 @@ class TQWidget; class TQWorkspace; -class KPopupMenu; -class KActionCollection; -class KAction; -class KToggleAction; +class TDEPopupMenu; +class TDEActionCollection; +class TDEAction; +class TDEToggleAction; class KDialogBase; class KTextEdit; class KXMLGUIClient; -class KMainWindow; +class TDEMainWindow; namespace KoProperty { class Editor; @@ -55,7 +55,7 @@ class WidgetLibrary; class ObjectTreeView; class Connection; class FormManager; -typedef TQPtrList ActionList; +typedef TQPtrList ActionList; //! @internal //static FormManager* FormManager_static = 0; @@ -95,13 +95,13 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject enum Options { HideEventsInPopupMenu = 1, SkipFileActions = 2, HideSignalSlotConnections = 4 }; //todo - /*! Creates all the KActions related to widget insertion, and plug them + /*! Creates all the TDEActions related to widget insertion, and plug them into the \a collection. \a client XML GUI client is used to call lib->addCustomWidgetActions(client). These actions are automatically connected to \ref insertWidget() slot. \return a TQPtrList of the created actions. */ - ActionList createActions(WidgetLibrary *lib, KActionCollection* collection, KXMLGUIClient *client); + ActionList createActions(WidgetLibrary *lib, TDEActionCollection* collection, KXMLGUIClient *client); /*! Enables or disables actions \a name. KFD uses KPart's, action collection here. @@ -109,7 +109,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject virtual void enableAction( const char* name, bool enable ) = 0; /*! \return action for \a name. @see enableAction() */ - virtual KAction* action(const char* name) = 0; + virtual TDEAction* action(const char* name) = 0; bool isPasteEnabled(); @@ -453,7 +453,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject // Copy/Paste TQDomDocument m_domDoc; - KPopupMenu *m_popup; + TDEPopupMenu *m_popup; TQPoint m_insertPoint; TQGuardedPtr m_menuWidget; @@ -464,11 +464,11 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject // Connection stuff bool m_drawingSlot; Connection *m_connection; - KPopupMenu *m_sigSlotMenu; + TDEPopupMenu *m_sigSlotMenu; // Actions - KActionCollection *m_collection; - KToggleAction *m_pointer, *m_dragConnection, *m_snapToGrid; + TDEActionCollection *m_collection; + TDEToggleAction *m_pointer, *m_dragConnection, *m_snapToGrid; //! Used to delayed widgets deletion TQTimer m_deleteWidgetLater_timer; diff --git a/kexi/formeditor/libactionwidget.cpp b/kexi/formeditor/libactionwidget.cpp index 0edc2433..4322ad18 100644 --- a/kexi/formeditor/libactionwidget.cpp +++ b/kexi/formeditor/libactionwidget.cpp @@ -25,8 +25,8 @@ using namespace KFormDesigner; -LibActionWidget::LibActionWidget(WidgetInfo *w, KActionCollection *c) - : KToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, +LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c) + : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, c, TQString("library_widget_" + w->className()).latin1()) { // kdDebug() << "LibActionWidget::LibActionWidget(): " << TQString("library_widget_" + w->className()).latin1() << endl; @@ -40,7 +40,7 @@ LibActionWidget::LibActionWidget(WidgetInfo *w, KActionCollection *c) void LibActionWidget::slotActivated() { - KToggleAction::slotActivated(); + TDEToggleAction::slotActivated(); if (isChecked()) emit prepareInsert(m_className); } diff --git a/kexi/formeditor/libactionwidget.h b/kexi/formeditor/libactionwidget.h index 8247d69c..c546ac9d 100644 --- a/kexi/formeditor/libactionwidget.h +++ b/kexi/formeditor/libactionwidget.h @@ -30,16 +30,16 @@ namespace KFormDesigner class WidgetInfo; /** - * KToggleAction subclass which remembers the matching class name. + * TDEToggleAction subclass which remembers the matching class name. */ -class KFORMEDITOR_EXPORT LibActionWidget : public KToggleAction +class KFORMEDITOR_EXPORT LibActionWidget : public TDEToggleAction { Q_OBJECT public: /** LibActionWidget object is initialized to be mutually exclusive with all other LibActionWidget objects */ - LibActionWidget(WidgetInfo *, KActionCollection *collection); + LibActionWidget(WidgetInfo *, TDEActionCollection *collection); virtual ~LibActionWidget(); signals: @@ -49,7 +49,7 @@ class KFORMEDITOR_EXPORT LibActionWidget : public KToggleAction void prepareInsert(const TQCString &className); protected slots: - /** reimplemented from KToggleAction */ + /** reimplemented from TDEToggleAction */ virtual void slotActivated(); private: diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index 82cb67bb..5146576c 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -35,13 +35,13 @@ using namespace KFormDesigner; ObjectTreeViewItem::ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item) - : KListViewItem(parent, item->name(), item->className()) + : TDEListViewItem(parent, item->name(), item->className()) { m_item = item; } -ObjectTreeViewItem::ObjectTreeViewItem(KListView *list, ObjectTreeItem *item) - : KListViewItem(list, item ? item->name() : TQString(), item ? item->className() : TQString()) +ObjectTreeViewItem::ObjectTreeViewItem(TDEListView *list, ObjectTreeItem *item) + : TDEListViewItem(list, item ? item->name() : TQString(), item ? item->className() : TQString()) { m_item = item; } @@ -67,7 +67,7 @@ ObjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, { if(!m_item) return; - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); } else { @@ -148,7 +148,7 @@ ObjectTreeViewItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, i void ObjectTreeViewItem::setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); if(!m_item) setHeight(0); } @@ -158,13 +158,13 @@ ObjectTreeViewItem::setOpen( bool o ) { //don't allow to collapse the node, user may be tricked because we're not displaying [+] marks if (o) - KListViewItem::setOpen(o); + TDEListViewItem::setOpen(o); } // ObjectTreeView itself ---------------- ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop) - : KListView(parent, name) + : TDEListView(parent, name) , m_form(0) { addColumn(i18n("Name"), 130); @@ -177,7 +177,7 @@ ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop) { setSelectionModeExt(Extended); connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } setFullWidth(true); @@ -194,7 +194,7 @@ TQSize ObjectTreeView::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::sizeHint().height()); + TDEListView::sizeHint().height()); } TQString @@ -210,7 +210,7 @@ ObjectTreeView::slotColumnSizeChanged(int) } void -ObjectTreeView::displayContextMenu(KListView *list, TQListViewItem *item, const TQPoint &) +ObjectTreeView::displayContextMenu(TDEListView *list, TQListViewItem *item, const TQPoint &) { if(list != this || !m_form || !item) return; diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h index 1da1a398..e1b6932b 100644 --- a/kexi/formeditor/objecttreeview.h +++ b/kexi/formeditor/objecttreeview.h @@ -28,11 +28,11 @@ class ObjectTreeItem; class Form; //! @short An item in ObjectTreeView associated with an ObjectTreeItem. -class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem +class KFORMEDITOR_EXPORT ObjectTreeViewItem : public TDEListViewItem { public: ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item); - ObjectTreeViewItem(KListView *list, ObjectTreeItem *item=0); + ObjectTreeViewItem(TDEListView *list, ObjectTreeItem *item=0); virtual ~ObjectTreeViewItem(); //! \return the item name, ie the ObjectTreeItem name @@ -60,11 +60,11 @@ class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem }; /*! @short A graphical view of Form's ObjectTree. - This is a KListView which represents an item for each widget in the form. + This is a TDEListView which represents an item for each widget in the form. The actually selected widget is written bold and selected. Clicking on a list item selects the corresponding widget in the Form. */ -class KFORMEDITOR_EXPORT ObjectTreeView : public KListView +class KFORMEDITOR_EXPORT ObjectTreeView : public TDEListView { Q_OBJECT @@ -101,7 +101,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView protected slots: /*! This slot is called when the user right-click a list item. The widget context menu is shown, as inisde the Form. */ - void displayContextMenu(KListView *list, TQListViewItem *item, const TQPoint &p); + void displayContextMenu(TDEListView *list, TQListViewItem *item, const TQPoint &p); void slotColumnSizeChanged(int); diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index a8605e7b..1461536d 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -40,11 +40,11 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text) TQVBoxLayout *l = new TQVBoxLayout(frame); l->setAutoAdd(true); - m_toolbar = new KToolBar(frame); + m_toolbar = new TDEToolBar(frame); m_toolbar->setFlat(true); m_toolbar->show(); - m_fcombo = new KFontCombo(m_toolbar); + m_fcombo = new TDEFontCombo(m_toolbar); m_toolbar->insertWidget(TBFont, 40, m_fcombo); connect(m_fcombo, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeFont(const TQString &))); @@ -68,7 +68,7 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text) m_toolbar->setToggle(TBSub, true); m_toolbar->insertSeparator(); - KToolBarRadioGroup *group = new KToolBarRadioGroup(m_toolbar); + TDEToolBarRadioGroup *group = new TDEToolBarRadioGroup(m_toolbar); m_toolbar->insertButton("text_left", TBLeft, true, i18n("Left Align")); m_toolbar->setToggle(TBLeft, true); group->addButton(TBLeft); diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h index 585e65df..366a1cd2 100644 --- a/kexi/formeditor/richtextdialog.h +++ b/kexi/formeditor/richtextdialog.h @@ -23,8 +23,8 @@ #include #include -class KToolBar; -class KFontCombo; +class TDEToolBar; +class TDEFontCombo; class KColorCombo; namespace KFormDesigner { @@ -53,9 +53,9 @@ class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase private: enum { TBFont = 100, TBColor, TBBold, TBItalic, TBUnder, TBSuper, TBSub, TBLeft = 201, TBCenter, TBRight, TBJustify }; - KToolBar *m_toolbar; + TDEToolBar *m_toolbar; KTextEdit *m_edit; - KFontCombo *m_fcombo; + TDEFontCombo *m_fcombo; KColorCombo *m_colCombo; }; diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index e6c09927..c897f243 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -106,7 +106,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager { } - virtual KAction* action( const char* name) + virtual TDEAction* action( const char* name) { return m_part->actionCollection()->action( name ); } @@ -208,35 +208,35 @@ KFormDesignerKDevPart::setupActions() KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new KAction(i18n("Clear Widget Contents"), "editclear", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new KAction(i18n("Delete Widget"), "editdelete", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new KAction(i18n("Preview Form"), "filequickprint", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); - new KAction(i18n("Edit Tab Order"), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); - new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); - new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); - - new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); - new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); - new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); - new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); - - new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); - new KAction(i18n("Send Widget to Back"), "lower", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); - - KActionMenu *alignMenu = new KActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); - alignMenu->insert( new KAction(i18n("To Left"), "aoleft", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); - alignMenu->insert( new KAction(i18n("To Right"), "aoright", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); - alignMenu->insert( new KAction(i18n("To Top"), "aotop", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); - alignMenu->insert( new KAction(i18n("To Bottom"), "aobottom", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); - alignMenu->insert( new KAction(i18n("To Grid"), "aopos2grid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); - - KActionMenu *sizeMenu = new KActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); - sizeMenu->insert( new KAction(i18n("To Fit"), "aofit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); - sizeMenu->insert( new KAction(i18n("To Grid"), "aogrid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); - sizeMenu->insert( new KAction(i18n("To Shortest"), "aoshortest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); - sizeMenu->insert( new KAction(i18n("To Tallest"), "aotallest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); - sizeMenu->insert( new KAction(i18n("To Narrowest"), "aonarrowest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); - sizeMenu->insert( new KAction(i18n("To Widest"), "aowidest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); + new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "filequickprint", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); + new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); + new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); + + new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); + new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); + new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); + new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + + new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); + new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); + + TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); + alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); + alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); + alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); + alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); + alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); + + TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); + sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); + sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); + sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); + sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); + sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); + sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); if(m_inShell) setXMLFile("kformdesigner_part_shell.rc"); @@ -495,7 +495,7 @@ KFormDesignerKDevPart::disableWidgetActions() void KFormDesignerKDevPart::setUndoEnabled(bool enabled, const TQString &text) { - KAction *undoAction = actionCollection()->action("edit_undo"); + TDEAction *undoAction = actionCollection()->action("edit_undo"); if(undoAction) { undoAction->setEnabled(enabled); @@ -507,7 +507,7 @@ KFormDesignerKDevPart::setUndoEnabled(bool enabled, const TQString &text) void KFormDesignerKDevPart::setRedoEnabled(bool enabled, const TQString &text) { - KAction *redoAction = actionCollection()->action("edit_redo"); + TDEAction *redoAction = actionCollection()->action("edit_redo"); if(redoAction) { redoAction->setEnabled(enabled); diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc b/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc index 3cadda53..38ab2ee4 100644 --- a/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc +++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc @@ -42,9 +42,9 @@ - + - + @@ -103,9 +103,9 @@ - + - + diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc b/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc index 8b592752..95916698 100644 --- a/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc +++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc @@ -52,9 +52,9 @@ - + - + @@ -116,9 +116,9 @@ - + - + diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index a6b24574..38d99e5a 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -68,7 +68,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager { } - virtual KAction* action( const char* name) + virtual TDEAction* action( const char* name) { return m_part->actionCollection()->action( name ); } @@ -212,48 +212,48 @@ KFormDesignerPart::setupActions() KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new KAction(i18n("Clear Widget Contents"), "editclear", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new KAction(i18n("Delete Widget"), "editdelete", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new KAction(i18n("Preview Form"), "filequickprint", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); - new KAction(i18n("Edit Tab Order"), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); - new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); - new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); - - KActionMenu *layoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu"); - layoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox")); - layoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox")); - layoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid")); - layoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow")); - layoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow")); - layoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter")); - layoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter")); - new KAction(i18n("&Ungroup Widgets"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "filequickprint", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); + new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); + new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); + + TDEActionMenu *layoutMenu = new TDEActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu"); + layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox")); + layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox")); + layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid")); + layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow")); + layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow")); + layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter")); + layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter")); + new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); /* - new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); - new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); - new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); - new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"); - new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"); - new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); + new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); + new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); + new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"); + new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"); + new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); */ - new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); - new KAction(i18n("Send Widget to Back"), "lower", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); - - KActionMenu *alignMenu = new KActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); - alignMenu->insert( new KAction(i18n("To Left"), "aoleft", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); - alignMenu->insert( new KAction(i18n("To Right"), "aoright", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); - alignMenu->insert( new KAction(i18n("To Top"), "aotop", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); - alignMenu->insert( new KAction(i18n("To Bottom"), "aobottom", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); - alignMenu->insert( new KAction(i18n("To Grid"), "aopos2grid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); - - KActionMenu *sizeMenu = new KActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); - sizeMenu->insert( new KAction(i18n("To Fit"), "aofit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); - sizeMenu->insert( new KAction(i18n("To Grid"), "aogrid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); - sizeMenu->insert( new KAction(i18n("To Shortest"), "aoshortest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); - sizeMenu->insert( new KAction(i18n("To Tallest"), "aotallest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); - sizeMenu->insert( new KAction(i18n("To Narrowest"), "aonarrowest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); - sizeMenu->insert( new KAction(i18n("To Widest"), "aowidest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); + new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); + new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); + + TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); + alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); + alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); + alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); + alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); + alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); + + TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); + sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); + sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); + sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); + sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); + sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); + sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); if(m_inShell) setXMLFile("kformdesigner_part_shell.rc"); @@ -536,7 +536,7 @@ KFormDesignerPart::disableWidgetActions() void KFormDesignerPart::setUndoEnabled(bool enabled, const TQString &text) { - KAction *undoAction = actionCollection()->action("edit_undo"); + TDEAction *undoAction = actionCollection()->action("edit_undo"); if(undoAction) { if(!text.isNull()) @@ -547,7 +547,7 @@ KFormDesignerPart::setUndoEnabled(bool enabled, const TQString &text) void KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text) { - KAction *redoAction = actionCollection()->action("edit_redo"); + TDEAction *redoAction = actionCollection()->action("edit_redo"); if(redoAction) { if(!text.isNull()) diff --git a/kexi/formeditor/test/kformdesigner_part.rc b/kexi/formeditor/test/kformdesigner_part.rc index 03c25f19..4fde21b4 100644 --- a/kexi/formeditor/test/kformdesigner_part.rc +++ b/kexi/formeditor/test/kformdesigner_part.rc @@ -41,9 +41,9 @@ - + - + @@ -99,9 +99,9 @@ - + - + diff --git a/kexi/formeditor/test/kformdesigner_part_shell.rc b/kexi/formeditor/test/kformdesigner_part_shell.rc index 8163cab3..c4dc3a20 100644 --- a/kexi/formeditor/test/kformdesigner_part_shell.rc +++ b/kexi/formeditor/test/kformdesigner_part_shell.rc @@ -52,9 +52,9 @@ - + - + @@ -112,9 +112,9 @@ - + - + diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h index 0bc2b47c..7be11444 100644 --- a/kexi/formeditor/widgetfactory.h +++ b/kexi/formeditor/widgetfactory.h @@ -40,7 +40,7 @@ class TQDomElement; class TQDomDocument; class TQVariant; class TQListView; -class KActionCollection; +class TDEActionCollection; class KTextEdit; class KLineEdit; class KXMLGUIClient; @@ -107,7 +107,7 @@ class KFORMEDITOR_EXPORT WidgetInfo If this name is found when loading a .ui file, the className() will be used instead. It allows to support both KDE and TQt versions of widget, without duplicating code. As a rule, className() should always return a class name which is inherited from - alternate class. For example KListView class has alternate TQListView class. + alternate class. For example TDEListView class has alternate TQListView class. \a override parameter overrides class name of a widget, even if it was implemented in other factory. @@ -300,7 +300,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject /*! Creates custom actions. Reimplement this if you need to add some actions coming from the factory. */ - virtual void createCustomActions(KActionCollection *col) { Q_UNUSED(col); }; + virtual void createCustomActions(TDEActionCollection *col) { Q_UNUSED(col); }; /*! This function can be used to add custom items in widget \a w context menu \a menu. */ diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index c15c3a9c..a21c4f3f 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -319,7 +319,7 @@ WidgetLibrary::createXML() }*/ ActionList -WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, +WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, TQObject *receiver, const char *slot) { loadFactories(); @@ -348,7 +348,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *par } void -WidgetLibrary::addCustomWidgetActions(KActionCollection *col) +WidgetLibrary::addCustomWidgetActions(TDEActionCollection *col) { for (TQAsciiDictIterator it(d->factories); it.current(); ++it) { @@ -738,7 +738,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup( if (textVertical.isEmpty()) //default textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical"); - KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup"); + TDEPopupMenu* popup = new TDEPopupMenu(parent, "orientationSelectionPopup"); popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name())); popup->insertItem(iconHorizontal, textHorizontal, 1); popup->insertItem(iconVertical, textVertical, 2); diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h index f9db38aa..ca041396 100644 --- a/kexi/formeditor/widgetlibrary.h +++ b/kexi/formeditor/widgetlibrary.h @@ -30,8 +30,8 @@ template class TQPtrList; template class TQValueVector; -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class TQWidget; class TQPopupMenu; class TQVariant; @@ -45,10 +45,10 @@ class ObjectTreeItem; class WidgetLibraryPrivate; class WidgetPropertySet; -typedef TQPtrList ActionList; +typedef TQPtrList ActionList; /** - * This class searches for factories and provides KActions for widget creation. + * This class searches for factories and provides TDEActions for widget creation. * Every widget can be located using this library. * You call WidgetLibrary functions instead of calling directly factories. * See WidgetFactory for a description of the functions. @@ -73,10 +73,10 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject /** * creates actions for widget creating */ - ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, + ActionList createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, TQObject *receiver, const char *slot); - void addCustomWidgetActions(KActionCollection *col); + void addCustomWidgetActions(TDEActionCollection *col); //old /** //old * creates the XML for widget actions diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index cbee692d..4119af75 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -34,8 +34,8 @@ static DebugWindowDialog* debugWindow = 0; static KTabWidget* debugWindowTab = 0; -static KListView* kexiDBDebugPage = 0; -static KListView* kexiAlterTableActionDebugPage = 0; +static TDEListView* kexiDBDebugPage = 0; +static TDEListView* kexiAlterTableActionDebugPage = 0; TQWidget *KexiUtils::createDebugWindow(TQWidget *parent) { @@ -66,7 +66,7 @@ void KexiUtils::addKexiDBDebug(const TQString& text) KPushButton *btn_clear = new KPushButton(KGuiItem("Clear", "clear_left"), page); hbox->addWidget(btn_clear); - kexiDBDebugPage = new KListView(page, "kexiDbDebugPage"); + kexiDBDebugPage = new TDEListView(page, "kexiDbDebugPage"); TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiDBDebugPage, TQT_SLOT(clear())); vbox->addWidget(kexiDBDebugPage); kexiDBDebugPage->addColumn(""); @@ -82,7 +82,7 @@ void KexiUtils::addKexiDBDebug(const TQString& text) //add \n after (about) every 30 characters //TODO TQString realText - KListViewItem * li = new KListViewItem( kexiDBDebugPage, kexiDBDebugPage->lastItem(), text ); + TDEListViewItem * li = new TDEListViewItem( kexiDBDebugPage, kexiDBDebugPage->lastItem(), text ); li->setMultiLinesEnabled( true ); } @@ -106,7 +106,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) btn_sim->setName("simulateAlterTableExecution"); hbox->addWidget(btn_sim); - kexiAlterTableActionDebugPage = new KListView(page, "kexiAlterTableActionDebugPage"); + kexiAlterTableActionDebugPage = new TDEListView(page, "kexiAlterTableActionDebugPage"); TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiAlterTableActionDebugPage, TQT_SLOT(clear())); vbox->addWidget(kexiAlterTableActionDebugPage); kexiAlterTableActionDebugPage->addColumn(""); @@ -121,7 +121,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) } if (text.isEmpty()) //don't move up! return; - KListViewItem * li; + TDEListViewItem * li; int availableNestingLevels = 0; // compute availableNestingLevels TQListViewItem * lastItem = kexiAlterTableActionDebugPage->lastItem(); @@ -144,16 +144,16 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) while (after && after->nextSibling()) after = after->nextSibling(); if (after) - li = new KListViewItem( lastItem, after, text ); //child, after + li = new TDEListViewItem( lastItem, after, text ); //child, after else - li = new KListViewItem( lastItem, text ); //1st child + li = new TDEListViewItem( lastItem, text ); //1st child } else { lastItem = kexiAlterTableActionDebugPage->lastItem(); while (lastItem && lastItem->parent()) lastItem = lastItem->parent(); //kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl; - li = new KListViewItem( kexiAlterTableActionDebugPage, lastItem, text ); //after + li = new TDEListViewItem( kexiAlterTableActionDebugPage, lastItem, text ); //after } li->setOpen(true); li->setMultiLinesEnabled( true ); diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 80f3c83e..8ca17429 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -49,7 +49,7 @@ class KexiFindDialog::Private //! Connects action \a action with appropriate signal \a member //! and optionally adds accel that will receive shortcut for \a action //! at global scope of the dialog \a parent. - void setActionAndAccel(KAction *action, TQWidget* parent, const char* member) + void setActionAndAccel(TDEAction *action, TQWidget* parent, const char* member) { if (!action) return; @@ -65,10 +65,10 @@ class KexiFindDialog::Private TQStringList lookInColumnNames; TQStringList lookInColumnCaptions; TQString objectName; //!< for caption - TQGuardedPtr findnextAction; - TQGuardedPtr findprevAction; - TQGuardedPtr replaceAction; - TQGuardedPtr replaceallAction; + TQGuardedPtr findnextAction; + TQGuardedPtr findprevAction; + TQGuardedPtr replaceAction; + TQGuardedPtr replaceallAction; TQPtrList accels; bool replaceMode : 1; }; @@ -84,7 +84,7 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent ) m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown); layout()->setMargin( KDialog::marginHint() ); layout()->setSpacing( KDialog::spacingHint() ); - KAction *a = KStdAction::findNext(0, 0, 0); + TDEAction *a = KStdAction::findNext(0, 0, 0); m_btnFind->setText(a->text()); m_btnFind->setIconSet(a->iconSet()); delete a; @@ -109,8 +109,8 @@ KexiFindDialog::~KexiFindDialog() delete d; } -void KexiFindDialog::setActions( KAction *findnext, KAction *findprev, - KAction *replace, KAction *replaceall ) +void KexiFindDialog::setActions( TDEAction *findnext, TDEAction *findprev, + TDEAction *replace, TDEAction *replaceall ) { d->findnextAction = findnext; d->findprevAction = findprev; diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h index d93ac703..b0a5cac1 100644 --- a/kexi/main/kexifinddialog.h +++ b/kexi/main/kexifinddialog.h @@ -23,7 +23,7 @@ #include "kexifinddialogbase.h" #include -class KAction; +class TDEAction; //! @short A Kexi-specific "Find text" dialog. /*! Also used for as replace dialog. @@ -41,8 +41,8 @@ class KexiFindDialog : public KexiFindDialogBase virtual ~KexiFindDialog(); //! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once. - void setActions( KAction *findnext, KAction *findprev, - KAction *replace, KAction *replaceall ); + void setActions( TDEAction *findnext, TDEAction *findprev, + TDEAction *replace, TDEAction *replaceall ); //! Shows the dialog as a modal dialog. virtual void show(); diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index ce29b32e..4bfaef61 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -316,13 +316,13 @@ KexiMainWindowImpl::KexiMainWindowImpl() //disabled (possible crash) d->hideMenuItem("file", i18n("&Import"), true); //disabled (possible crash) d->hideMenuItem("help", i18n( "&Report Bug..." ), true); #endif - KAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0; + TDEAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0; if (tdemdi_tooldock_menu_action) { tdemdi_tooldock_menu_action->setEnabled(false); } if (!isFakingSDIApplication()/* && !userMode()*/) { -// TQPopupMenu *menu = (TQPopupMenu*) child( "window", "KPopupMenu" ); +// TQPopupMenu *menu = (TQPopupMenu*) child( "window", "TDEPopupMenu" ); TQPopupMenu *menu = d->popups["window"]; unsigned int count = menuBar()->count(); if (menu) @@ -506,7 +506,7 @@ TQPopupMenu* KexiMainWindowImpl::findPopupMenu(const char *popupName) return d->popups[popupName]; } -KActionPtrList KexiMainWindowImpl::allActions() const +TDEActionPtrList KexiMainWindowImpl::allActions() const { return actionCollection()->actions(); } @@ -518,13 +518,13 @@ KexiDialogBase* KexiMainWindowImpl::currentDialog() const void KexiMainWindowImpl::initActions() { -// setupGUI(KMainWindow::Keys|KMainWindow::StatusBar|KMainWindow::Save|KMainWindow::Create); +// setupGUI(TDEMainWindow::Keys|TDEMainWindow::StatusBar|TDEMainWindow::Save|TDEMainWindow::Create); // d->actionMapper = new TQSignalMapper(this, "act_map"); // connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotAction(const TQString &))); // PROJECT MENU - KAction *action = new KAction(i18n("&New..."), "filenew", KStdAccel::shortcut(KStdAccel::New), + TDEAction *action = new TDEAction(i18n("&New..."), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotProjectNew()), actionCollection(), "project_new"); action->setToolTip(i18n("Create a new project")); action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected.")); @@ -534,7 +534,7 @@ void KexiMainWindowImpl::initActions() action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected.")); #ifdef HAVE_KNEWSTUFF - action = new KAction(i18n("&Download Example Databases..."), "kget", KShortcut(0), + action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); action->setToolTip(i18n("Download example databases from the Internet")); action->setWhatsThis(i18n("Downloads example databases from the Internet.")); @@ -544,7 +544,7 @@ void KexiMainWindowImpl::initActions() //#ifdef KEXI_SHOW_UNIMPLEMENTED #ifndef KEXI_NO_UNFINISHED - d->action_open_recent = new KActionMenu(i18n("Open Recent"), + d->action_open_recent = new TDEActionMenu(i18n("Open Recent"), actionCollection(), "project_open_recent"); connect(d->action_open_recent->popupMenu(),TQT_SIGNAL(activated(int)), this,TQT_SLOT(slotProjectOpenRecent(int))); @@ -563,26 +563,26 @@ void KexiMainWindowImpl::initActions() d->action_save = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); -// d->action_save = new KAction(i18n("&Save"), "filesave", KStdAccel::shortcut(KStdAccel::Save), +// d->action_save = new TDEAction(i18n("&Save"), "filesave", TDEStdAccel::shortcut(TDEStdAccel::Save), // TQT_TQOBJECT(this), TQT_SLOT(slotProjectSave()), actionCollection(), "project_save"); d->action_save->setToolTip(i18n("Save object changes")); d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window.")); #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_save_as = new KAction(i18n("Save &As..."), "filesaveas", 0, + d->action_save_as = new TDEAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); d->action_save_as->setToolTip(i18n("Save object as")); d->action_save_as->setWhatsThis( i18n("Saves object changes from currently selected window under a new name (within the same project).")); - d->action_project_properties = new KAction(i18n("Project Properties"), "info", 0, + d->action_project_properties = new TDEAction(i18n("Project Properties"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); #else d->action_save_as = d->dummy_action; d->action_project_properties = d->dummy_action; #endif - d->action_close = new KAction(i18n("&Close Project"), "fileclose", 0, + d->action_close = new TDEAction(i18n("&Close Project"), "fileclose", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" ); d->action_close->setToolTip(i18n("Close the current project")); d->action_close->setWhatsThis(i18n("Closes the current project.")); @@ -590,7 +590,7 @@ void KexiMainWindowImpl::initActions() KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotProjectQuit()), actionCollection(), "quit"); #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_project_relations = new KAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, + d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); d->action_project_relations->setToolTip(i18n("Project relationships")); d->action_project_relations->setWhatsThis(i18n("Shows project relationships.")); @@ -598,13 +598,13 @@ void KexiMainWindowImpl::initActions() #else d->action_project_relations = d->dummy_action; #endif - d->action_tools_data_migration = new KAction( + d->action_tools_data_migration = new TDEAction( i18n("&Import Database..."), "database_import", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); d->action_tools_data_migration->setToolTip(i18n("Import entire database as a Kexi project")); d->action_tools_data_migration->setWhatsThis(i18n("Imports entire database as a Kexi project.")); - d->action_tools_compact_database = new KAction( + d->action_tools_compact_database = new TDEAction( i18n("&Compact Database..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); d->action_tools_compact_database->setToolTip(i18n("Compact the current database project")); @@ -614,7 +614,7 @@ void KexiMainWindowImpl::initActions() if (userMode()) d->action_project_import_data_table = 0; else { - d->action_project_import_data_table = new KAction( + d->action_project_import_data_table = new TDEAction( i18n("Import->Table Data From File...", "Table Data From &File..."), "table"/*! @todo: change to "file_import" or so*/, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectImportDataTable()), actionCollection(), @@ -623,7 +623,7 @@ void KexiMainWindowImpl::initActions() d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file.")); } - d->action_project_export_data_table = new KAction(i18n("Export->Table or Query Data to File...", + d->action_project_export_data_table = new TDEAction(i18n("Export->Table or Query Data to File...", "Table or Query Data to &File..."), "table"/*! @todo: change to "file_export" or so*/, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectExportDataTable()), actionCollection(), @@ -633,9 +633,9 @@ void KexiMainWindowImpl::initActions() d->action_project_export_data_table->setWhatsThis( i18n("Exports data from the active table or query data to a file.")); -//TODO new KAction(i18n("From File..."), "fileopen", 0, +//TODO new TDEAction(i18n("From File..."), "fileopen", 0, //TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); -//TODO new KAction(i18n("From Server..."), "server", 0, +//TODO new TDEAction(i18n("From Server..."), "server", 0, //TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); d->action_project_print = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrint()), @@ -651,7 +651,7 @@ void KexiMainWindowImpl::initActions() d->action_project_print_preview->setWhatsThis( i18n("Shows print preview for the active table or query.")); - d->action_project_print_setup = new KAction(i18n("Page Set&up..."), + d->action_project_print_setup = new TDEAction(i18n("Page Set&up..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectPageSetup()), actionCollection(), "project_print_setup"); d->action_project_print_setup->setToolTip( @@ -668,7 +668,7 @@ void KexiMainWindowImpl::initActions() d->action_edit_paste_special_data_table = 0; else { d->action_edit_paste_special_data_table = - new KAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."), + new TDEAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."), "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPasteSpecialDataTable()), actionCollection(), "edit_paste_special_data_table"); d->action_edit_paste_special_data_table->setToolTip( @@ -678,7 +678,7 @@ void KexiMainWindowImpl::initActions() } d->action_edit_copy_special_data_table = - new KAction(i18n("Copy Special->Table or Query Data...", + new TDEAction(i18n("Copy Special->Table or Query Data...", "Table or Query as Data Table..."), "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditCopySpecialDataTable()), actionCollection(), "edit_copy_special_data_table"); @@ -710,7 +710,7 @@ void KexiMainWindowImpl::initActions() //! @todo d->action_edit_replace = KStdAction::replace( //! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; -//! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0, +//! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, //! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); d->action_edit_select_all = createSharedAction( KStdAction::SelectAll, "edit_select_all"); @@ -744,7 +744,7 @@ void KexiMainWindowImpl::initActions() //VIEW MENU if (!userMode()) { - d->action_view_data_mode = new KRadioAction(i18n("&Data View"), "state_data", TQt::Key_F6, + d->action_view_data_mode = new TDERadioAction(i18n("&Data View"), "state_data", TQt::Key_F6, TQT_TQOBJECT(this), TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode ); d->action_view_data_mode->setExclusiveGroup("view_mode"); @@ -755,7 +755,7 @@ void KexiMainWindowImpl::initActions() d->action_view_data_mode = 0; if (!userMode()) { - d->action_view_design_mode = new KRadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7, + d->action_view_design_mode = new TDERadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7, TQT_TQOBJECT(this), TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode ); d->action_view_design_mode->setExclusiveGroup("view_mode"); @@ -766,7 +766,7 @@ void KexiMainWindowImpl::initActions() d->action_view_design_mode = 0; if (!userMode()) { - d->action_view_text_mode = new KRadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8, + d->action_view_text_mode = new TDERadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8, TQT_TQOBJECT(this), TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode ); d->action_view_text_mode->setExclusiveGroup("view_mode"); @@ -777,7 +777,7 @@ void KexiMainWindowImpl::initActions() d->action_view_text_mode = 0; if (d->isProjectNavigatorVisible) { - d->action_view_nav = new KAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1, + d->action_view_nav = new TDEAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); d->action_view_nav->setToolTip(i18n("Go to project navigator panel")); d->action_view_nav->setWhatsThis(i18n("Goes to project navigator panel.")); @@ -785,13 +785,13 @@ void KexiMainWindowImpl::initActions() else d->action_view_nav = 0; - d->action_view_mainarea = new KAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2, + d->action_view_mainarea = new TDEAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); d->action_view_mainarea->setToolTip(i18n("Go to main area")); d->action_view_mainarea->setWhatsThis(i18n("Goes to main area.")); if (!userMode()) { - d->action_view_propeditor = new KAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3, + d->action_view_propeditor = new TDEAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); d->action_view_propeditor->setToolTip(i18n("Go to property editor panel")); d->action_view_propeditor->setWhatsThis(i18n("Goes to property editor panel.")); @@ -851,13 +851,13 @@ void KexiMainWindowImpl::initActions() //WINDOW MENU #ifndef TQ_WS_WIN //KMDI <= 3.5.1 has no shortcut here: - KAction *closeWindowAction = actionCollection()->action("window_close"); + TDEAction *closeWindowAction = actionCollection()->action("window_close"); if (closeWindowAction) - closeWindowAction->setShortcut(KStdAccel::close()); + closeWindowAction->setShortcut(TDEStdAccel::close()); #endif //additional 'Window' menu items - d->action_window_next = new KAction( i18n("&Next Window"), "", + d->action_window_next = new TDEAction( i18n("&Next Window"), "", #ifdef TQ_WS_WIN TQt::CTRL+TQt::Key_Tab, #else @@ -867,7 +867,7 @@ void KexiMainWindowImpl::initActions() d->action_window_next->setToolTip( i18n("Next window") ); d->action_window_next->setWhatsThis(i18n("Switches to the next window.")); - d->action_window_previous = new KAction( i18n("&Previous Window"), "", + d->action_window_previous = new TDEAction( i18n("&Previous Window"), "", #ifdef TQ_WS_WIN TQt::CTRL+TQt::SHIFT+TQt::Key_Tab, #else @@ -886,12 +886,12 @@ void KexiMainWindowImpl::initActions() action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure toolbars.")); - d->action_show_other = new KActionMenu(i18n("Other"), + d->action_show_other = new TDEActionMenu(i18n("Other"), actionCollection(), "options_show_other"); #endif #ifndef KEXI_NO_CTXT_HELP - d->action_show_helper = new KToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H, + d->action_show_helper = new TDEToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H, actionCollection(), "options_show_contexthelp"); #if KDE_IS_VERSION(3,2,90) d->action_show_helper->setCheckedState(i18n("Hide Context Help")); @@ -933,18 +933,18 @@ void KexiMainWindowImpl::initActions() ->setWhatsThis(i18n("This shows useful tips on the use of this application.")); #endif #if 0 //we don't have a time for updating info text for each new version - new KAction(i18n("Important Information"), "messagebox_info", 0, + new TDEAction(i18n("Important Information"), "messagebox_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); #endif //TODO: UNCOMMENT TO REMOVE MDI MODES SETTING m_pMdiModeMenu->hide(); #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS - new KAction(i18n("Give Feedback..."), "messagebox_info", 0, + new TDEAction(i18n("Give Feedback..."), "messagebox_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); #endif #endif -// KAction *actionSettings = new KAction(i18n("Configure Kexi..."), "configure", 0, +// TDEAction *actionSettings = new TDEAction(i18n("Configure Kexi..."), "configure", 0, // actionCollection(), "kexi_settings"); // actionSettings->setWhatsThis(i18n("Lets you configure Kexi.")); // connect(actionSettings, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings())); @@ -1373,7 +1373,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr KURL url; url.setPath( fname ); if (url.isLocalFile()) - KRecentDirs::add(startDir, url.directory()); + TDERecentDirs::add(startDir, url.directory()); } #else Q_UNUSED(projectData); @@ -1394,7 +1394,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr dlg.exec(); fname = dlg.selectedFile(); if (!fname.isEmpty()) - KRecentDocument::add(fname); + TDERecentDocument::add(fname); // fname = KFileDialog::getSaveFileName(fname.isEmpty() ? startDir : fname, // mimetypes.join(" "), this, caption); #endif @@ -1420,9 +1420,9 @@ void KexiMainWindowImpl::updateReadOnlyState() if (d->nav) d->nav->setReadOnly(readOnly); // update "insert ....." actions for every part - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); for (KexiPart::PartInfoListIterator it(*Kexi::partManager().partInfoList()); it.current(); ++it) { - KAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )).ascii() ); + TDEAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )).ascii() ); if (a) a->setEnabled(!readOnly); } @@ -2797,7 +2797,7 @@ KexiMainWindowImpl::slotProjectOpenRecentAboutToShow() { /* //setup - KPopupMenu *popup = d->action_open_recent->popupMenu(); + TDEPopupMenu *popup = d->action_open_recent->popupMenu(); const int cnt = popup->count(); //remove older for (int i = 0; iaction_open_recent->popupMenu(); + TDEPopupMenu *popup = d->action_open_recent->popupMenu(); popup->clear(); #if 0 d->action_open_recent_projects_title_id = popup->insertTitle(i18n("Recently Opened Databases")); diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 9721a558..8df772ce 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -91,7 +91,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI virtual TQPopupMenu* findPopupMenu(const char *popupName); /*! Implemented for KexiMainWindow. */ - virtual KActionPtrList allActions() const; + virtual TDEActionPtrList allActions() const; /*! \return currently active dialog (window) od 0 if there is no active dialog. Implemented for KexiMainWindow. */ diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index c775b087..83814f4e 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -73,7 +73,7 @@ public: wasAutoOpen = false; dialogExistedBeforeCloseProject = false; #ifndef KEXI_SHOW_UNIMPLEMENTED - dummy_action = new KActionMenu(TQString(""), TQT_TQOBJECT(wnd)); + dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd)); #endif maximizeFirstOpenedChildFrm = false; #ifdef HAVE_KNEWSTUFF @@ -191,7 +191,7 @@ public: { if (curDialog.isNull()) return; - KRadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ]; + TDERadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ]; if (ra) ra->setChecked(true); // if (!last_checked_mode) @@ -393,7 +393,7 @@ void updatePropEditorDockWidthInfo() { KexiViewBase *view = curDialog->selectedView(); if (!view) return 0; - KAction *action = view->sharedAction(actionName); + TDEAction *action = view->sharedAction(actionName); if (!action || !action->isEnabled()) return 0; return view; @@ -442,24 +442,24 @@ void updatePropEditorDockWidthInfo() { TQString appCaptionPrefix; // actions_for_view_modes; -// KRadioAction *last_checked_mode; + TDEAction *action_view_nav, *action_view_propeditor, *action_view_mainarea; + TDERadioAction *action_view_data_mode, *action_view_design_mode, *action_view_text_mode; + TQIntDict actions_for_view_modes; +// TDERadioAction *last_checked_mode; #ifndef KEXI_NO_CTXT_HELP - KToggleAction *action_show_helper; + TDEToggleAction *action_show_helper; #endif //! data menu - KAction *action_data_save_row; - KAction *action_data_cancel_row_changes; - KAction *action_data_execute; + TDEAction *action_data_save_row; + TDEAction *action_data_cancel_row_changes; + TDEAction *action_data_execute; //! format menu - KAction *action_format_font; + TDEAction *action_format_font; //! tools menu - KAction *action_tools_data_migration, *action_tools_compact_database; - KActionMenu *action_tools_scripts; + TDEAction *action_tools_data_migration, *action_tools_compact_database; + TDEActionMenu *action_tools_scripts; //! window menu - KAction *action_window_next, *action_window_previous; + TDEAction *action_window_next, *action_window_previous; //! settings menu - KAction *action_configure; + TDEAction *action_configure; //! for dock windows KMdiToolViewAccessor* navToolWindow; diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index 5d823a13..de3f64e2 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -501,7 +501,7 @@ void KexiSimplePrintingPageSetup::slotTitleTextChanged(const TQString&) void KexiSimplePrintingPageSetup::slotChangeTitleFont() { - if (TQDialog::Accepted != KFontDialog::getFont(m_settings.pageTitleFont, false, this)) + if (TQDialog::Accepted != TDEFontDialog::getFont(m_settings.pageTitleFont, false, this)) return; m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont ); setDirty(true); diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 83d9cb06..e587556b 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -162,10 +162,10 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( TQVBoxLayout *lyr = new TQVBoxLayout(this, 6); int id; - m_toolbar = new KToolBar(0, this); + m_toolbar = new TDEToolBar(0, this); m_toolbar->setLineWidth(0); m_toolbar->setFrameStyle(TQFrame::NoFrame); - m_toolbar->setIconText(KToolBar::IconTextRight); + m_toolbar->setIconText(TDEToolBar::IconTextRight); lyr->addWidget(m_toolbar); id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) ); @@ -204,14 +204,14 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget); lyr->addWidget(navToolbarWidget); - m_navToolbar = new KToolBar(0, navToolbarWidget); + m_navToolbar = new TDEToolBar(0, navToolbarWidget); navToolbarLyr->addStretch(1); navToolbarLyr->addWidget(m_navToolbar); navToolbarLyr->addStretch(1); // m_navToolbar->setFullWidth(true); m_navToolbar->setLineWidth(0); m_navToolbar->setFrameStyle(TQFrame::NoFrame); - m_navToolbar->setIconText(KToolBar::IconTextRight); + m_navToolbar->setIconText(TDEToolBar::IconTextRight); m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("start"), i18n("First Page"), m_navToolbar)); m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstClicked())); diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h index 8f76e803..c966553f 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.h +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h @@ -71,7 +71,7 @@ class KexiSimplePrintPreviewWindow : public TQWidget KexiSimplePrintingEngine &m_engine; const KexiSimplePrintingSettings& m_settings; - KToolBar *m_toolbar, *m_navToolbar; + TDEToolBar *m_toolbar, *m_navToolbar; int m_pageNumber; int m_pagesCount; //!< needed to know that pages could has been changed int m_idFirst, m_idLast, m_idPrevious, m_idNext, m_idPageNumberLabel; diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h index 00ace8dc..ab4ed10a 100644 --- a/kexi/main/startup/KexiConnSelector.h +++ b/kexi/main/startup/KexiConnSelector.h @@ -64,7 +64,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget \a conn_set can be altered, because Add/Edit/Remove buttons are available to users. \a startDirOrVariable can be provided to specify a start dir for file browser (it can also contain a configuration variable name with ":" prefix as described - in KRecentDirs documentation). */ + in TDERecentDirs documentation). */ KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, const TQString& startDirOrVariable, TQWidget* parent = 0, const char* name = 0 ); diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 122137e1..9ea3a0db 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -36,7 +36,7 @@ - + diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 3e59d937..44fb7026 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -67,8 +67,8 @@ class KexiNewProjectWizardPrivate // delete project_set_to_show; delete msgHandler; } -// KListView *lv_types; - KListViewItem *lvi_file, *lvi_server; +// TDEListView *lv_types; + TDEListViewItem *lvi_file, *lvi_server; TQString chk_file_txt, chk_server_txt; //!< helper TQString server_db_name_dblist_lbl_txt; //!< helper @@ -95,7 +95,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, //page: type selector m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector"); -// lv_types = new KListView(m_prjtype_sel, "types listview"); +// lv_types = new TDEListView(m_prjtype_sel, "types listview"); // m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); #if KDE_IS_VERSION(3,3,9) m_prjtype_sel->lv_types->setShadeSortColumn(false); @@ -105,14 +105,14 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_prjtype_sel->lv_types->setAlternateBackground(TQColor()); //disable altering m_prjtype_sel->lv_types->setItemMargin( KDialogBase::marginHint() ); TQString none; - d->lvi_file = new KListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") ); + d->lvi_file = new TDEListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") ); d->lvi_file->setPixmap(0, TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop ) ); d->lvi_file->setMultiLinesEnabled( true ); - d->lvi_server = new KListViewItem( m_prjtype_sel->lv_types, d->lvi_file, + d->lvi_server = new TDEListViewItem( m_prjtype_sel->lv_types, d->lvi_file, i18n("New Project Stored on Database Server") ); d->lvi_server->setPixmap(0, DesktopIcon("network") ); d->lvi_server->setMultiLinesEnabled( true ); diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 5c281256..21eb3edf 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -299,7 +299,7 @@ void KexiStartupDialog::setupPageTemplates() d->templatesWidget = new KJanusWidget( d->pageTemplates, "templatesWidget", KJanusWidget::IconList); {//aaa! dirty hack - d->templatesWidget_IconListBox = d->templatesWidget->child(0,"KListBox"); + d->templatesWidget_IconListBox = d->templatesWidget->child(0,"TDEListBox"); if (d->templatesWidget_IconListBox) d->templatesWidget_IconListBox->installEventFilter(this); } diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index d919463d..5db58c82 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -49,13 +49,13 @@ }*/ //! @internal -class TemplateItem : public KListViewItem +class TemplateItem : public TDEListViewItem { public: TemplateItem(TQListView* parent, const TQString& aFilename, const TQString& name, const TQString& description, const TQPixmap& icon, const TQValueList& aAutoopenObjects) - : KListViewItem(parent, name + "\n" + description) + : TDEListViewItem(parent, name + "\n" + description) , autoopenObjects(aAutoopenObjects) , filename(aFilename) { @@ -70,7 +70,7 @@ class TemplateItem : public KListViewItem //----------------------- KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * parent ) - : KListView(parent, "KexiStartupDialogTemplatesPage") + : TDEListView(parent, "KexiStartupDialogTemplatesPage") , m_popuplated(false) { addColumn(TQString()); diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h index 82ba7fe2..07b8b663 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h @@ -24,7 +24,7 @@ #include /*! Helper class for displaying templates set with description. */ -class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView +class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public TDEListView { Q_OBJECT diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 6b8ab9d4..29567ce0 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -107,7 +107,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //TODO TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); //TODO toolbar = 0; //(js) -//(js) toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true); +//(js) toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true); //(js) toolbar->setFlat(true); //TODO tqInstallMsgHandler( oldHandler ); @@ -179,7 +179,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | KDirOperator::ViewActions); - KActionCollection *coll = ops->actionCollection(); + TDEActionCollection *coll = ops->actionCollection(); // plug nav items into the toolbar coll->action( "up" )->plug( toolbar ); @@ -211,12 +211,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), TQT_SLOT( enterURL( const TQString& ))); - KToggleAction *showSidebarAction = - new KToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); + TDEToggleAction *showSidebarAction = + new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleSpeedbar( bool )) ); - KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", this, "extra menu" ); + TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("This is the configuration menu for the file dialog. " "Various options can be accessed from this menu including:
    " "
  • how files are sorted in the list
    • " @@ -257,8 +257,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f toolbar->setItemAutoSized (PATH_COMBO); - toolbar->setIconText(KToolBar::IconOnly); - toolbar->setBarPos(KToolBar::Top); + toolbar->setIconText(TDEToolBar::IconOnly); + toolbar->setBarPos(TDEToolBar::Top); toolbar->setMovingEnabled(false); toolbar->adjustSize(); @@ -471,6 +471,6 @@ void KexiStartupFileDialogBase::saveLastVisitedPath(const TQString& path) TQFileInfo fi(path); TQString dir( fi.isDir() ? fi.absFilePath() : fi.dir(true).absPath() ); if (!dir.isEmpty()) - KRecentDirs::add(m_lastVisitedPathsVariable, dir); + TDERecentDirs::add(m_lastVisitedPathsVariable, dir); } } diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h index 97ffec4f..0c60c5b7 100644 --- a/kexi/migration/importwizard.h +++ b/kexi/migration/importwizard.h @@ -36,7 +36,7 @@ class TQHBoxLayout; class TQVBoxLayout; class TQVButtonGroup; class KComboBox; -class KListView; +class TDEListView; class KLineEdit; class KexiConnSelectorWidget; class KexiProjectSelectorWidget; diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index bec4de7d..59cfefa5 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -46,7 +46,7 @@ #include #include -typedef KListViewItemTemplate ActionSelectorDialogListItemBase; +typedef TDEListViewItemTemplate ActionSelectorDialogListItemBase; class ActionSelectorDialogListItem : public ActionSelectorDialogListItemBase { @@ -79,7 +79,7 @@ protected: //--------------------------------------- ActionsListViewBase::ActionsListViewBase(TQWidget* parent) - : KListView(parent) + : TDEListView(parent) { setResizeMode(TQListView::AllColumns); addColumn(""); @@ -115,27 +115,27 @@ void ActionsListViewBase::selectAction(const TQString& actionName) //--------------------------------------- -KActionsListViewBase::KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin) +TDEActionsListViewBase::TDEActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin) : ActionsListViewBase(parent) , m_mainWin(mainWin) { } -KActionsListViewBase::~KActionsListViewBase() {} +TDEActionsListViewBase::~TDEActionsListViewBase() {} -void KActionsListViewBase::init() +void TDEActionsListViewBase::init() { setSorting(0); const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); - KActionPtrList sharedActions( m_mainWin->allActions() ); + TDEActionPtrList sharedActions( m_mainWin->allActions() ); const Kexi::ActionCategories *acat = Kexi::actionCategories(); - foreach (KActionPtrList::ConstIterator, it, sharedActions) { + foreach (TDEActionPtrList::ConstIterator, it, sharedActions) { // kdDebug() << (*it)->name() << " " << (*it)->text() << endl; //! @todo group actions - //! @todo: store KAction* here? + //! @todo: store TDEAction* here? const int actionCategories = acat->actionCategories((*it)->name()); if (actionCategories==-1) { - kexipluginswarn << "KActionsListViewBase(): no category declared for action \"" + kexipluginswarn << "TDEActionsListViewBase(): no category declared for action \"" << (*it)->name() << "\"! Fix this!" << endl; continue; } @@ -152,15 +152,15 @@ void KActionsListViewBase::init() //--------------------------------------- -//! @internal Used to display KActions (in column 2) -class KActionsListView : public KActionsListViewBase +//! @internal Used to display TDEActions (in column 2) +class TDEActionsListView : public TDEActionsListViewBase { public: - KActionsListView(TQWidget* parent, KexiMainWindow* mainWin) - : KActionsListViewBase(parent, mainWin) + TDEActionsListView(TQWidget* parent, KexiMainWindow* mainWin) + : TDEActionsListViewBase(parent, mainWin) { } - virtual ~KActionsListView() {} + virtual ~TDEActionsListView() {} virtual bool isActionVisible(const char* actionName, int actionCategories) const { Q_UNUSED(actionName); @@ -168,12 +168,12 @@ public: } }; -//! @internal Used to display KActions (in column 2) -class CurrentFormActionsListView : public KActionsListViewBase +//! @internal Used to display TDEActions (in column 2) +class CurrentFormActionsListView : public TDEActionsListViewBase { public: CurrentFormActionsListView(TQWidget* parent, KexiMainWindow* mainWin) - : KActionsListViewBase(parent, mainWin) + : TDEActionsListViewBase(parent, mainWin) { } virtual ~CurrentFormActionsListView() {} @@ -276,7 +276,7 @@ class ActionToExecuteListView : public ActionsListViewBase ActionSelectorDialogListItem *printItem = new ActionSelectorDialogListItem( "print", this, i18n("Print")); printItem->setPixmap(0, SmallIcon("fileprint")); - KAction *a = KStdAction::printPreview(0, 0, 0); + TDEAction *a = KStdAction::printPreview(0, 0, 0); item = new ActionSelectorDialogListItem("printPreview", printItem, a->text().replace("&", "").replace("...", "")); item->setPixmap(0, SmallIcon(a->icon())); @@ -377,7 +377,7 @@ public: TQString actionWidgetName; ActionCategoriesListView* actionCategoriesListView; //!< for column #1 TQWidget *kactionPageWidget; - KActionsListView* kactionListView; //!< for column #2 + TDEActionsListView* kactionListView; //!< for column #2 KexiBrowser* objectsListView; //!< for column #2 TQWidget *currentFormActionsPageWidget; //!< for column #2 CurrentFormActionsListView* currentFormActionsListView; //!< for column #2 @@ -419,7 +419,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ \______________________________________________/ glyr [a]- TQWidgetStack *secondAnd3rdColumnStack, - - for displaying KActions, the stack contains d->kactionPageWidget TQWidget + - for displaying TDEActions, the stack contains d->kactionPageWidget TQWidget - for displaying objects, the stack contains secondAnd3rdColumnMainWidget TQWidget and TQGridLayout *secondAnd3rdColumnGrLyr - kactionPageWidget contains only a TQVBoxLayout and label+kactionListView */ @@ -530,12 +530,12 @@ KexiActionSelectionDialog::~KexiActionSelectionDialog() delete d; } -void KexiActionSelectionDialog::slotKActionItemExecuted(TQListViewItem*) +void KexiActionSelectionDialog::slotTDEActionItemExecuted(TQListViewItem*) { accept(); } -void KexiActionSelectionDialog::slotKActionItemSelected(TQListViewItem*) +void KexiActionSelectionDialog::slotTDEActionItemSelected(TQListViewItem*) { d->setActionToExecuteSectionVisible(false); updateOKButtonStatus(); @@ -585,7 +585,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) d->kactionPageWidget = new TQWidget(); d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint()); - d->kactionListView = new KActionsListView(d->kactionPageWidget, d->mainWin); + d->kactionListView = new TDEActionsListView(d->kactionPageWidget, d->mainWin); d->kactionListView->init(); TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName), d->kactionPageWidget); @@ -595,13 +595,13 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) vlyr->addWidget(d->kactionListView); d->secondAnd3rdColumnStack->addWidget(d->kactionPageWidget); connect(d->kactionListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotKActionItemExecuted(TQListViewItem*))); + this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); connect( d->kactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotKActionItemSelected(TQListViewItem*))); + this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); d->raiseWidget(d->kactionPageWidget); - slotKActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3 + slotTDEActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3 } else if (simpleItem->data == "currentForm") { if (!d->currentFormActionsPageWidget) { diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h index 8587287c..9d355562 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.h +++ b/kexi/plugins/forms/kexiactionselectiondialog.h @@ -24,14 +24,14 @@ #include "kexiformeventhandler.h" class KexiMainWindow; -class KListView; +class TDEListView; namespace KexiPart { class Item; } //! @short A dialog for selecting an action to be executed for a form's command button /*! Available actions are: - - application's global actions like "edit->copy" (KAction-based) + - application's global actions like "edit->copy" (TDEAction-based) - opening/printing/executing of selected object (table/query/form/script/macrto, etc.) */ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase @@ -54,8 +54,8 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase protected slots: void slotActionCategorySelected(TQListViewItem* item); - void slotKActionItemExecuted(TQListViewItem*); - void slotKActionItemSelected(TQListViewItem*); + void slotTDEActionItemExecuted(TQListViewItem*); + void slotTDEActionItemSelected(TQListViewItem*); void slotActionToExecuteItemExecuted(TQListViewItem* item); void slotActionToExecuteItemSelected(TQListViewItem*); void slotCurrentFormActionItemExecuted(TQListViewItem*); diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h index 741bd230..f0527132 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog_p.h +++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h @@ -23,7 +23,7 @@ #include //! @internal -class ActionsListViewBase : public KListView +class ActionsListViewBase : public TDEListView { public: ActionsListViewBase(TQWidget* parent); @@ -34,14 +34,14 @@ class ActionsListViewBase : public KListView void selectAction(const TQString& actionName); }; -//! @internal Used by KActionsListView and CurrentFormActionsListView (in column 2) -class KActionsListViewBase : public ActionsListViewBase +//! @internal Used by TDEActionsListView and CurrentFormActionsListView (in column 2) +class TDEActionsListViewBase : public ActionsListViewBase { Q_OBJECT public: - KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin); - virtual ~KActionsListViewBase(); + TDEActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin); + virtual ~TDEActionsListViewBase(); void init(); virtual bool isActionVisible(const char* actionName, int actionCategories) const = 0; diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index 5b7e46db..b89031a7 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -138,7 +138,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) separator->setFrameShadow(TQFrame::Sunken); vlyr->addWidget(separator);*/ /* - KPopupTitle *title = new KPopupTitle(this); + TDEPopupTitle *title = new TDEPopupTitle(this); title->setTitle(i18n("Inserting fields")); vlyr->addWidget(title); vlyr->addSpacing(4);*/ diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index bfc70226..8bb55bce 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -425,8 +425,8 @@ KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopu { KexiDBImageBox *imageBox = static_cast(w); imageBox->contextMenu()->updateActionsAvailability(); - KActionCollection *ac = imageBox->contextMenu()->actionCollection(); - KPopupMenu *subMenu = new KPopupMenu(); + TDEActionCollection *ac = imageBox->contextMenu()->actionCollection(); + TDEPopupMenu *subMenu = new TDEPopupMenu(); //! @todo make these actions undoable/redoable menu->insertItem(i18n("&Image"), subMenu); ac->action("insert")->plug(subMenu); @@ -445,10 +445,10 @@ KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopu } void -KexiDBFactory::createCustomActions(KActionCollection* col) +KexiDBFactory::createCustomActions(TDEActionCollection* col) { //this will create shared instance action for design mode (special collection is provided) - m_assignAction = new KAction( i18n("&Assign Action..."), SmallIconSet("form_action"), + m_assignAction = new TDEAction( i18n("&Assign Action..."), SmallIconSet("form_action"), 0, 0, 0, col, "widget_assign_action"); } diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h index a5830593..6be965d5 100644 --- a/kexi/plugins/forms/kexidbfactory.h +++ b/kexi/plugins/forms/kexidbfactory.h @@ -23,7 +23,7 @@ #include -class KAction; +class TDEAction; namespace KFormDesigner { class Form; @@ -43,7 +43,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, KFormDesigner::Container *container, int options = DefaultOptions ); - virtual void createCustomActions(KActionCollection* col); + virtual void createCustomActions(TDEActionCollection* col); virtual bool createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu, KFormDesigner::Container *container); virtual bool startEditing(const TQCString &classname, TQWidget *w, KFormDesigner::Container *container); @@ -69,7 +69,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory virtual bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w, const TQCString& property); - KAction* m_assignAction; + TDEAction* m_assignAction; }; #endif diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index 55e999db..365f5cb4 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -70,7 +70,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString( KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, const TQString& actionName, const TQString& objectName, const TQString& actionOption) - : KAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName) + : TDEAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName) , m_actionOption(actionOption) { } @@ -171,7 +171,7 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin if (!ok) continue; if (actionType=="kaction" || actionType=="currentForm") { - KAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); + TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); if (!action) continue; TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); //safety diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h index e882eeb8..69b9a20c 100644 --- a/kexi/plugins/forms/kexiformeventhandler.h +++ b/kexi/plugins/forms/kexiformeventhandler.h @@ -54,7 +54,7 @@ class KEXIFORMUTILS_EXPORT KexiFormEventHandler }; //! @internal form-level action for handling "on click" actions -class KEXIFORMUTILS_EXPORT KexiFormEventAction : public KAction +class KEXIFORMUTILS_EXPORT KexiFormEventAction : public TDEAction { public: //! A structure used in currentActionName() diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp index 8c0c66e7..56d20376 100644 --- a/kexi/plugins/forms/kexiformmanager.cpp +++ b/kexi/plugins/forms/kexiformmanager.cpp @@ -51,13 +51,13 @@ KexiFormManager::~KexiFormManager() { } -KAction* KexiFormManager::action( const char* name ) +TDEAction* KexiFormManager::action( const char* name ) { - KActionCollection *col = m_part->actionCollectionForMode(Kexi::DesignViewMode); + TDEActionCollection *col = m_part->actionCollectionForMode(Kexi::DesignViewMode); if (!col) return 0; TQCString n( translateName( name ).latin1() ); - KAction *a = col->action(n.data()); + TDEAction *a = col->action(n.data()); if (a) return a; KexiDBForm *dbform; diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h index baeb74d9..1e1b767c 100644 --- a/kexi/plugins/forms/kexiformmanager.h +++ b/kexi/plugins/forms/kexiformmanager.h @@ -37,7 +37,7 @@ class KEXIFORMUTILS_EXPORT KexiFormManager : public KFormDesigner::FormManager KexiFormManager(KexiPart::Part *parent, const char* name = 0); virtual ~KexiFormManager(); - virtual KAction* action( const char* name ); + virtual TDEAction* action( const char* name ); virtual void enableAction( const char* name, bool enable ); public slots: diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 911c3374..b96e4814 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -127,7 +127,7 @@ KFormDesigner::WidgetLibrary* KexiFormPart::library() } #if 0 -void KexiFormPart::initPartActions(KActionCollection *collection) +void KexiFormPart::initPartActions(TDEActionCollection *collection) { //this is automatic? -no //create child guicilent: guiClient()->setXMLFile("kexidatatableui.rc"); @@ -139,12 +139,12 @@ void KexiFormPart::initPartActions(KActionCollection *collection) //js m_manager->createActions(collection, 0); } -void KexiFormPart::initInstanceActions( int mode, KActionCollection *col ) +void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col ) { if (mode==Kexi::DesignViewMode) { KFormDesigner::FormManager::self()->createActions(col, 0); - new KAction(i18n("Edit Tab Order..."), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder"); - new KAction(i18n("Adjust Size"), "viewmagfit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust"); + new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder"); + new TDEAction(i18n("Adjust Size"), "viewmagfit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust"); } //TODO } @@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, KActionCollection *col ) void KexiFormPart::initPartActions() { -// new KAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()), +// new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()), // guiClient()->actionCollection(), "show_form_ui"); } @@ -161,13 +161,13 @@ void KexiFormPart::initInstanceActions() #ifdef KEXI_DEBUG_GUI kapp->config()->setGroup("General"); if (kapp->config()->readBoolEntry("showInternalDebugger", false)) { - new KAction(i18n("Show Form UI Code"), "compfile", + new TDEAction(i18n("Show Form UI Code"), "compfile", CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_SLOT(showFormUICode()), actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui"); } #endif - KActionCollection *col = actionCollectionForMode(Kexi::DesignViewMode); + TDEActionCollection *col = actionCollectionForMode(Kexi::DesignViewMode); KFormDesigner::FormManager::self()->createActions( library(), col, (KXMLGUIClient*)col->parentGUIClient() ); //guiClient() ); //connect actions provided by widget factories @@ -180,8 +180,8 @@ void KexiFormPart::initInstanceActions() // KFormDesigner::CreateLayoutCommand - KAction *action = createSharedAction(Kexi::DesignViewMode, i18n("Layout Widgets"), "", 0, "formpart_layout_menu", "KActionMenu"); - KActionMenu *menu = static_cast(action); + TDEAction *action = createSharedAction(Kexi::DesignViewMode, i18n("Layout Widgets"), "", 0, "formpart_layout_menu", "TDEActionMenu"); + TDEActionMenu *menu = static_cast(action); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("&Horizontally"), TQString(), 0, "formpart_layout_hbox")); @@ -206,19 +206,19 @@ void KexiFormPart::initInstanceActions() createSharedAction(Kexi::DesignViewMode, i18n("Send Widget to Back"), "lower", 0, "formpart_format_lower"); #ifndef KEXI_NO_UNFINISHED - action = createSharedAction(Kexi::DesignViewMode, i18n("Other Widgets"), "", 0, "other_widgets_menu", "KActionMenu"); + action = createSharedAction(Kexi::DesignViewMode, i18n("Other Widgets"), "", 0, "other_widgets_menu", "TDEActionMenu"); #endif - action = createSharedAction(Kexi::DesignViewMode, i18n("Align Widgets Position"), "aoleft", 0, "formpart_align_menu", "KActionMenu"); - menu = static_cast(action); + action = createSharedAction(Kexi::DesignViewMode, i18n("Align Widgets Position"), "aoleft", 0, "formpart_align_menu", "TDEActionMenu"); + menu = static_cast(action); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Left"), "aoleft", 0, "formpart_align_to_left") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Right"), "aoright", 0, "formpart_align_to_right") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Top"), "aotop", 0, "formpart_align_to_top") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Bottom"), "aobottom", 0, "formpart_align_to_bottom") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Grid"), "aopos2grid", 0, "formpart_align_to_grid") ); - action = createSharedAction(Kexi::DesignViewMode, i18n("Adjust Widgets Size"), "aogrid", 0, "formpart_adjust_size_menu", "KActionMenu"); - menu = static_cast(action); + action = createSharedAction(Kexi::DesignViewMode, i18n("Adjust Widgets Size"), "aogrid", 0, "formpart_adjust_size_menu", "TDEActionMenu"); + menu = static_cast(action); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Fit"), "aofit", 0, "formpart_adjust_to_fit") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Grid"), "aogrid", 0, "formpart_adjust_size_grid") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Shortest"), "aoshortest", 0, "formpart_adjust_height_small") ); diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index b4b58f70..b73cf8ea 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -51,7 +51,7 @@ KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview) connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted())); - m_popupMenu = new KPopupMenu(this, "contextMenu"); + m_popupMenu = new TDEPopupMenu(this, "contextMenu"); // setFocusPolicy(NoFocus); } diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index daff9ef9..cf8c1d70 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -52,7 +52,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_dte_date = 0; #endif - m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); + m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.h b/kexi/plugins/forms/widgets/kexidbdateedit.h index a9ddd6a3..638b985a 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.h +++ b/kexi/plugins/forms/widgets/kexidbdateedit.h @@ -24,7 +24,7 @@ #include "kexiformdataiteminterface.h" #include -class KPopupMenu; +class TDEPopupMenu; class KDatePicker; class TQDateTimeEditor; @@ -109,7 +109,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateEdit : public TQWidget, public KexiFormData private: KDatePicker *m_datePicker; TQDateEdit *m_edit; - KPopupMenu *m_datePickerPopupMenu; + TDEPopupMenu *m_datePickerPopupMenu; TQDateTimeEditor *m_dte_date; bool m_invalidState : 1; bool m_cleared : 1; diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 627e1172..763bdf02 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -59,7 +59,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_dte_date = 0; #endif - m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); + m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h index c7080a1e..a56bb30e 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h @@ -26,7 +26,7 @@ class KDatePicker; class TQDateTimeEditor; -class KPopupMenu; +class TDEPopupMenu; //! @short A db-aware datetime editor class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiFormDataItemInterface @@ -98,7 +98,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiForm TQDateEdit* m_dateEdit; TQTimeEdit* m_timeEdit; TQDateTimeEditor *m_dte_date, *m_dte_time; - KPopupMenu *m_datePickerPopupMenu; + TDEPopupMenu *m_datePickerPopupMenu; bool m_invalidState : 1; bool m_cleared : 1; bool m_readOnly : 1; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 97d36055..eaf91044 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -779,7 +779,7 @@ bool KexiDBImageBox::keyPressed(TQKeyEvent *ke) return true; } } -// else if (ke->state() == TQt::ControlButton && KStdAccel::shortcut(KStdAccel::Copy).keyCodeTQt() == (ke->key()|TQt::CTRL)) { +// else if (ke->state() == TQt::ControlButton && TDEStdAccel::shortcut(TDEStdAccel::Copy).keyCodeTQt() == (ke->key()|TQt::CTRL)) { // } return false; } diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h index 93e7e244..e7a46329 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.h +++ b/kexi/plugins/forms/widgets/kexidbimagebox.h @@ -254,8 +254,8 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : // TQString m_originalFileName; KexiDropDownButton *m_chooser; KexiImageContextMenu *m_popupMenu; -//moved KActionCollection m_actionCollection; -//moved KAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction, +//moved TDEActionCollection m_actionCollection; +//moved TDEAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction, // *m_deleteAction, *m_propertiesAction; // TQTimer m_clickTimer; int m_alignment; diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index b6ab6b03..de928e37 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -199,7 +199,7 @@ void KexiDBTextEdit::selectAll() void KexiDBTextEdit::keyPressEvent( TQKeyEvent *ke ) { // for instance, Windows uses Ctrl+Tab for moving between tabs, so do not steal this shortcut - if (KStdAccel::tabNext().contains( KKey(ke) ) || KStdAccel::tabPrev().contains( KKey(ke) )) { + if (TDEStdAccel::tabNext().contains( KKey(ke) ) || TDEStdAccel::tabPrev().contains( KKey(ke) )) { ke->ignore(); return; } diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp index 3f12b3dd..863b5d80 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.cpp +++ b/kexi/plugins/forms/widgets/kexidbutils.cpp @@ -53,7 +53,7 @@ void KexiDBWidgetContextMenuExtender::createTitle(TQPopupMenu *menu) if (!menu) return; m_contextMenu = menu; - KPopupTitle *titleItem = new KPopupTitle(); + TDEPopupTitle *titleItem = new TDEPopupTitle(); const int id = m_contextMenu->insertItem(titleItem, -1, 0); m_contextMenu->setItemEnabled(id, false); TQString icon; diff --git a/kexi/plugins/forms/widgets/kexidbutils.h b/kexi/plugins/forms/widgets/kexidbutils.h index f4100c73..ceac5975 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.h +++ b/kexi/plugins/forms/widgets/kexidbutils.h @@ -50,7 +50,7 @@ class KexiDBWidgetContextMenuExtender : public TQObject protected: KexiDataItemInterface* m_iface; TQGuardedPtr m_contextMenu; - bool m_contextMenuHasTitle; //!< true if KPopupTitle has been added to the context menu. + bool m_contextMenuHasTitle; //!< true if TDEPopupTitle has been added to the context menu. }; class KexiDBAutoField; diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 941f8eda..20fba8fe 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -318,7 +318,7 @@ if ( m_mode == Clipboard ) KURL url; url.setPath( m_fname ); if (url.isLocalFile()) - KRecentDirs::add(":CSVImportExport", url.directory()); + TDERecentDirs::add(":CSVImportExport", url.directory()); } #else m_fname = KFileDialog::getOpenFileName(":CSVImportExport", mimetypes.join(" "), diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 6c35e8d7..a512994d 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -59,7 +59,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtrmacro()->items(); for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++) { - KListViewItem* listviewitem = new KListViewItem(errorlist); + TDEListViewItem* listviewitem = new TDEListViewItem(errorlist); listviewitem->setText(0,TQString("%1").arg(i++)); listviewitem->setText(1,i18n("Action")); TDESharedPtr macroitem = *mit; @@ -80,7 +80,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtrvariables(); KoMacro::Variable::Map::ConstIterator vit; for ( vit = variables.begin(); vit != variables.end(); ++vit ) { - KListViewItem* child = new KListViewItem(listviewitem); + TDEListViewItem* child = new TDEListViewItem(listviewitem); child->setText(1,vit.key()); child->setText(2,vit.data()->toString()); } diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index 05d7ba72..707b2cb3 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -93,7 +93,7 @@ - + No diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h index f8109364..197676e9 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.h +++ b/kexi/plugins/macros/kexipart/keximacropart.h @@ -50,7 +50,7 @@ class KexiMacroPart : public KexiPart::Part /** * Implementation of the KexiPart::Part::action method used to - * provide scripts as KAction's to the outside world. + * provide scripts as TDEAction's to the outside world. */ virtual bool execute(KexiPart::Item* item, TQObject* sender = 0); diff --git a/kexi/plugins/macros/lib/action.h b/kexi/plugins/macros/lib/action.h index c779f21a..0b19ef46 100644 --- a/kexi/plugins/macros/lib/action.h +++ b/kexi/plugins/macros/lib/action.h @@ -32,8 +32,8 @@ namespace KoMacro { /** - * The Action class extendes KAction to implement some additional - * functionality KAction doesn't provide. + * The Action class extendes TDEAction to implement some additional + * functionality TDEAction doesn't provide. */ class KOMACRO_EXPORT Action : public TQObject // TQt functionality like signals and slots diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h index 5e3ce084..5abddeae 100644 --- a/kexi/plugins/macros/lib/manager.h +++ b/kexi/plugins/macros/lib/manager.h @@ -48,8 +48,8 @@ namespace KoMacro { * // got published. * class PublishedObject : public TQObject {}; * - * // Somewhere we have our KMainWindow. - * KMainWindow* mainwindow = new KMainWindow(); + * // Somewhere we have our TDEMainWindow. + * TDEMainWindow* mainwindow = new TDEMainWindow(); * * // Create a new KoMacro::Manager instance to access the * // Macro-framework. diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index 26b7d0f2..7741073f 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -24,7 +24,7 @@ Parameters: - + Name diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 5de13fe2..650e90a6 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -79,7 +79,7 @@ class KexiQueryDesignerSQLView::Private KexiSectionHeader *head, *historyHead; TQPixmap statusPixmapOk, statusPixmapErr, statusPixmapInfo; TQSplitter *splitter; - KToggleAction *action_toggle_history; + TDEToggleAction *action_toggle_history; //! For internal use, this pointer is usually copied to TempData structure, //! when switching out of this view (then it's cleared). KexiDB::QuerySchema *parsedQuery; @@ -138,7 +138,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi plugSharedAction("querypart_check_query", TQT_TQOBJECT(this), TQT_SLOT(slotCheckQuery())); plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode())); - d->action_toggle_history = static_cast( sharedAction( "querypart_view_toggle_history" ) ); + d->action_toggle_history = static_cast( sharedAction( "querypart_view_toggle_history" ) ); d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),Qt::Vertical, d->history_section); d->historyHead->installEventFilter(this); diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 81bb22bc..da27f890 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -40,7 +40,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const m_history = new History(); m_history->setAutoDelete(true); - m_popup = new KPopupMenu(this); + m_popup = new TDEPopupMenu(this); m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); } @@ -161,7 +161,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e) /*void KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *) { - KPopupMenu p(this); + TDEPopupMenu p(this); p.insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); @@ -209,7 +209,7 @@ void KexiQueryDesignerSQLHistory::clear() updateContents(); } -KPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const +TDEPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const { return m_popup; } diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h index 9183764f..516a6dbf 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h @@ -28,7 +28,7 @@ #include class TQSimpleRichText; -class KPopupMenu; +class TDEPopupMenu; class HistoryEntry { @@ -68,7 +68,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name=0); virtual ~KexiQueryDesignerSQLHistory(); - KPopupMenu* popupMenu() const; + TDEPopupMenu* popupMenu() const; // void contextMenu(const TQPoint &pos, HistoryEntry *e); @@ -99,7 +99,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView private: History *m_history; HistoryEntry *m_selected; - KPopupMenu *m_popup; + TDEPopupMenu *m_popup; }; #endif diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp index d0c71eae..02c4ab94 100644 --- a/kexi/plugins/queries/kexiquerypart.cpp +++ b/kexi/plugins/queries/kexiquerypart.cpp @@ -117,20 +117,20 @@ KexiQueryPart::dataSource() return new KexiQueryDataSource(this); } -void KexiQueryPart::initPartActions( KActionCollection *col ) +void KexiQueryPart::initPartActions( TDEActionCollection *col ) { } -void KexiQueryPart::initInstanceActions( int mode, KActionCollection *col ) +void KexiQueryPart::initInstanceActions( int mode, TDEActionCollection *col ) { if (mode==Kexi::DataViewMode) { } else if (mode==Kexi::DesignViewMode) { } else if (mode==Kexi::TextViewMode) { -// new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query"); +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query"); -//TODO new KAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query"); +//TODO new TDEAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query"); } } #endif @@ -141,10 +141,10 @@ void KexiQueryPart::initPartActions() void KexiQueryPart::initInstanceActions() { -// new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), // m_instanceGuiClients[Kexi::DesignViewMode]->actionCollection(), "querypart_check_query"); - KAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", + TDEAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", Key_F9, "querypart_check_query"); a->setToolTip(i18n("Check Query")); a->setWhatsThis(i18n("Checks query for validity.")); diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h index 33399c56..3587388c 100644 --- a/kexi/plugins/queries/kexiquerypart.h +++ b/kexi/plugins/queries/kexiquerypart.h @@ -105,8 +105,8 @@ class KexiQueryPart : public KexiPart::Part virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap* staticObjectArgs = 0); -// virtual void initPartActions( KActionCollection *col ); -// virtual void initInstanceActions( int mode, KActionCollection *col ); +// virtual void initPartActions( TDEActionCollection *col ); +// virtual void initInstanceActions( int mode, TDEActionCollection *col ); virtual void initPartActions(); virtual void initInstanceActions(); diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index 7cf7dae9..cf54b254 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -120,7 +120,7 @@ KexiReportFactory::createMenuActions(const TQCString &classname, TQWidget *w, Q_UNUSED(w); Q_UNUSED(container); if(classname == "Label") { - /*! @todo use KAction */ + /*! @todo use TDEAction */ menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); return true; } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index 0b096b82..1c24db1b 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -126,25 +126,25 @@ void KexiScriptPart::initPartActions() if(! Kross::Api::Manager::scriptManager()->hasChild("KexiMainWindow")) { Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_mainWin), "KexiMainWindow"); - // Add the KAction's provided by the ScriptGUIClient to the + // Add the TDEAction's provided by the ScriptGUIClient to the // KexiMainWindow. //FIXME: fix+use createSharedPartAction() whyever it doesn't work as expected right now... TQPopupMenu* popup = m_mainWin->findPopupMenu("tools"); if(popup) { - KAction* execscriptaction = d->scriptguiclient->action("executescriptfile"); + TDEAction* execscriptaction = d->scriptguiclient->action("executescriptfile"); if(execscriptaction) execscriptaction->plug( popup ); - KAction* configscriptaction = d->scriptguiclient->action("configurescripts"); + TDEAction* configscriptaction = d->scriptguiclient->action("configurescripts"); if(configscriptaction) configscriptaction->plug( popup ); - KAction* scriptmenuaction = d->scriptguiclient->action("installedscripts"); + TDEAction* scriptmenuaction = d->scriptguiclient->action("installedscripts"); if(scriptmenuaction) scriptmenuaction->plug( popup ); /* - KAction* execscriptmenuaction = d->scriptguiclient->action("executedscripts"); + TDEAction* execscriptmenuaction = d->scriptguiclient->action("executedscripts"); if(execscriptmenuaction) execscriptmenuaction->plug( popup ); - KAction* loadedscriptmenuaction = d->scriptguiclient->action("loadedscripts"); + TDEAction* loadedscriptmenuaction = d->scriptguiclient->action("loadedscripts"); if(loadedscriptmenuaction) loadedscriptmenuaction->plug( popup ); */ diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 6130a93f..62ab4cbf 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -175,12 +175,12 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare connect(d->sets, TQT_SIGNAL(rowDeleted()), TQT_TQOBJECT(this), TQT_SLOT(updateActions())); connect(d->sets, TQT_SIGNAL(rowInserted()), TQT_TQOBJECT(this), TQT_SLOT(slotRowInserted())); - d->contextMenuTitle = new KPopupTitle(d->view->contextMenu()); + d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu()); d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0); connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowContextMenu())); plugSharedAction("tablepart_toggle_pkey", TQT_TQOBJECT(this), TQT_SLOT(slotTogglePrimaryKey())); - d->action_toggle_pkey = static_cast( sharedAction("tablepart_toggle_pkey") ); + d->action_toggle_pkey = static_cast( sharedAction("tablepart_toggle_pkey") ); d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning d->view->contextMenu()->insertSeparator(2); setAvailable("tablepart_toggle_pkey", !conn->isReadOnly()); diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp index c546327b..a9254ba4 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.cpp +++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp @@ -53,7 +53,7 @@ using namespace KexiTableDesignerCommands; //---------------------------------------------- -CommandHistory::CommandHistory(KActionCollection *actionCollection, bool withMenus) +CommandHistory::CommandHistory(TDEActionCollection *actionCollection, bool withMenus) : KCommandHistory(actionCollection, withMenus) { // We need ALL the commands because we'll collect reuse their @@ -109,7 +109,7 @@ KexiTableDesignerViewPrivate::KexiTableDesignerViewPrivate(KexiTableDesignerView , slotBeforeCellChanged_enabled(true) , tempStoreDataUsingRealAlterTable(false) { - historyActionCollection = new KActionCollection((TQWidget*)0,""); + historyActionCollection = new TDEActionCollection((TQWidget*)0,""); history = new CommandHistory(historyActionCollection, true); internalPropertyNames.insert("subType",(char*)1); diff --git a/kexi/plugins/tables/kexitabledesignerview_p.h b/kexi/plugins/tables/kexitabledesignerview_p.h index 206c295c..0b689d64 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.h +++ b/kexi/plugins/tables/kexitabledesignerview_p.h @@ -52,7 +52,7 @@ class CommandHistory : public KCommandHistory Q_OBJECT public: - CommandHistory(KActionCollection *actionCollection, bool withMenus = true); + CommandHistory(TDEActionCollection *actionCollection, bool withMenus = true); const TQPtrList& commands() const { return m_commandsToUndo; } @@ -141,9 +141,9 @@ class KexiTableDesignerViewPrivate int row; //!< used to know if a new row is selected in slotCellSelected() - KToggleAction *action_toggle_pkey; + TDEToggleAction *action_toggle_pkey; - KPopupTitle *contextMenuTitle; + TDEPopupTitle *contextMenuTitle; int uniqueIdCounter; @@ -181,7 +181,7 @@ class KexiTableDesignerViewPrivate to know what return value should be. */ tristate recentResultOfStoreData; - KActionCollection* historyActionCollection; + TDEActionCollection* historyActionCollection; CommandHistory* history; //! A cache used in KexiTableDesignerView::buildField() to quickly identify diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 55c8be5d..07541f4d 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -85,7 +85,7 @@ void KexiTablePart::initInstanceActions() { //moved to main window createSharedAction(Kexi::DataViewMode, i18n("Filter"), "filter", 0, "tablepart_filter"); - KAction *a = createSharedToggleAction( + TDEAction *a = createSharedToggleAction( Kexi::DesignViewMode, i18n("Primary Key"), "key", 0, "tablepart_toggle_pkey"); // Kexi::DesignViewMode, i18n("Toggle Primary Key"), "key", 0, "tablepart_toggle_pkey"); a->setWhatsThis(i18n("Sets or removes primary key for currently selected field.")); diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 472dd25c..00586a53 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -72,7 +72,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features : TQWidget(parent, "KexiBrowser") , m_mainWin(mainWin) , m_features(features) - , m_actions( new KActionCollection(this) ) + , m_actions( new TDEActionCollection(this) ) , m_baseItems(199, false) , m_normalItems(199) , m_prevSelectedPart(0) @@ -103,8 +103,8 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_list->setTooltipColumn(0); m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this)) ); m_list->setResizeMode(TQListView::LastColumn); - connect(m_list, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem *, const TQPoint&))); + connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); @@ -123,7 +123,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } // actions - m_openAction = new KAction(i18n("&Open"), "fileopen", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), + m_openAction = new TDEAction(i18n("&Open"), "fileopen", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), TQT_SLOT(slotOpenObject()), TQT_TQOBJECT(this), "open_object"); m_openAction->setToolTip(i18n("Open object")); m_openAction->setWhatsThis(i18n("Opens object selected in the list")); @@ -145,12 +145,12 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_newObjectPopup = 0; } else { - m_deleteAction = new KAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/, + m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete"); //! @todo 1.1: just add "Delete" tooltip and what's this m_deleteAction->setToolTip(i18n("&Delete").replace("&","")); - m_renameAction = new KAction(i18n("&Rename"), "", 0, + m_renameAction = new TDEAction(i18n("&Rename"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), m_actions, "edit_rename"); #ifdef KEXI_SHOW_UNIMPLEMENTED //todo plugSharedAction("edit_cut",TQT_SLOT(slotCut())); @@ -158,7 +158,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features //todo plugSharedAction("edit_paste",TQT_SLOT(slotPaste())); #endif - m_designAction = new KAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), + m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), TQT_SLOT(slotDesignObject()), TQT_TQOBJECT(this), "design_object"); m_designAction->setToolTip(i18n("Design object")); m_designAction->setWhatsThis(i18n("Starts designing of the object selected in the list")); @@ -167,15 +167,15 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features buttons_flyr->add(btn); } - m_editTextAction = new KAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this), + m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTextObject()), TQT_TQOBJECT(this), "editText_object"); m_editTextAction->setToolTip(i18n("Open object in text view")); m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view")); - m_newObjectAction = new KAction("", "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); + m_newObjectAction = new TDEAction("", "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); if (m_features & Toolbar) { m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object"); - m_newObjectPopup = new KPopupMenu(this, "newObjectPopup"); + m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup"); connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotNewObjectPopupAboutToShow())); // KexiPart::Part* part = Kexi::partManager().part("kexi/table"); // m_newObjectPopup->insertItem( SmallIconSet(part->info()->createItemIcon()), part->instanceName() ); @@ -190,21 +190,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } } - m_executeAction = new KAction(i18n("Execute"), "player_play", 0, TQT_TQOBJECT(this), + m_executeAction = new TDEAction(i18n("Execute"), "player_play", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExecuteObject()), TQT_TQOBJECT(this), "data_execute"); - m_exportActionMenu = new KActionMenu(i18n("Export")); - m_dataExportAction = new KAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), + m_exportActionMenu = new TDEActionMenu(i18n("Export")); + m_dataExportAction = new TDEAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportAsDataTable()), TQT_TQOBJECT(this), "exportAsDataTable"); m_dataExportAction->setWhatsThis( i18n("Exports data from the currently selected table or query data to a file.")); m_exportActionMenu->insert( m_dataExportAction ); - m_printAction = new KAction(i18n("&Print..."), "fileprint", 0, TQT_TQOBJECT(this), + m_printAction = new TDEAction(i18n("&Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrintItem()), TQT_TQOBJECT(this), "printItem"); m_printAction->setWhatsThis( i18n("Prints data from the currently selected table or query.")); - m_pageSetupAction = new KAction(i18n("Page Setup..."), "", 0, TQT_TQOBJECT(this), + m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPageSetupForItem()), TQT_TQOBJECT(this), "pageSetupForItem"); m_pageSetupAction->setWhatsThis( i18n("Shows page setup for printing the active table or query.")); @@ -214,7 +214,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_partPopup = 0; } else { - m_partPopup = new KPopupMenu(this, "partPopup"); + m_partPopup = new TDEPopupMenu(this, "partPopup"); m_partPopupTitle_id = m_partPopup->insertTitle(""); m_newObjectAction->plug(m_partPopup); #ifdef KEXI_SHOW_UNIMPLEMENTED @@ -225,7 +225,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features if (m_features & ContextMenus) { //init popups - m_itemPopup = new KPopupMenu(this, "itemPopup"); + m_itemPopup = new TDEPopupMenu(this, "itemPopup"); m_itemPopupTitle_id = m_itemPopup->insertTitle(""); m_openAction->plug(m_itemPopup); m_openAction_id = m_itemPopup->idAt(m_itemPopup->count()-1); @@ -411,12 +411,12 @@ KexiBrowser::slotRemoveItem(const KexiPart::Item &item) } void -KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQPoint &pos) +KexiBrowser::slotContextMenu(TDEListView* /*list*/, TQListViewItem *item, const TQPoint &pos) { if(!item || !(m_features & ContextMenus)) return; KexiBrowserItem *bit = static_cast(item); - KPopupMenu *pm = 0; + TDEPopupMenu *pm = 0; if (bit->item()) { pm = m_itemPopup; //update popup title @@ -762,7 +762,7 @@ void KexiBrowser::slotNewObjectPopupAboutToShow() KexiPart::PartInfoList *list = Kexi::partManager().partInfoList(); //this list is properly sorted for (KexiPart::PartInfoListIterator it(*list); it.current(); ++it) { //add an item to "New object" toolbar popup - KAction *action = m_mainWin->actionCollection()->action( + TDEAction *action = m_mainWin->actionCollection()->action( TQString(KexiPart::nameForCreateAction(*it.current())).ascii() ); if (action) { action->plug(m_newObjectPopup); @@ -853,7 +853,7 @@ void KexiBrowser::clear() //-------------------------------------------- KexiBrowserListView::KexiBrowserListView(TQWidget *parent) - : KListView(parent, "KexiBrowserListView") + : TDEListView(parent, "KexiBrowserListView") , nameEndsWithAsterisk(false) , enableExecuteArea(true) { @@ -876,14 +876,14 @@ void KexiBrowserListView::rename(TQListViewItem *item, int c) nameEndsWithAsterisk = item->text(0).endsWith("*"); if (nameEndsWithAsterisk) item->setText(0, item->text(0).left(item->text(0).length()-1)); - KListView::rename(item, c); + TDEListView::rename(item, c); adjustColumn(0); } } bool KexiBrowserListView::isExecuteArea( const TQPoint& point ) { - return enableExecuteArea && KListView::isExecuteArea(point); + return enableExecuteArea && TDEListView::isExecuteArea(point); } #include "kexibrowser.moc" diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h index 602fffe1..d4c8033f 100644 --- a/kexi/widget/kexibrowser.h +++ b/kexi/widget/kexibrowser.h @@ -27,12 +27,12 @@ class TQListViewItem; class KIconLoader; -class KPopupMenu; -class KAction; -class KActionMenu; -class KActionCollection; -class KListView; -class KToolBar; +class TDEPopupMenu; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; +class TDEListView; +class TDEToolBar; class KexiBrowserItem; class KexiView; class KexiMainWindow; @@ -129,7 +129,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget void pageSetupForItem( KexiPart::Item* ); protected slots: - void slotContextMenu(KListView*, TQListViewItem *i, const TQPoint &point); + void slotContextMenu(TDEListView*, TQListViewItem *i, const TQPoint &point); void slotExecuteItem(TQListViewItem *item); void slotSelectionChanged(TQListViewItem* i); void slotSettingsChanged(int); @@ -156,17 +156,17 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget KexiMainWindow *m_mainWin; int m_features; KexiBrowserListView *m_list; - KActionCollection *m_actions; + TDEActionCollection *m_actions; TQAsciiDict m_baseItems; TQIntDict m_normalItems; - KPopupMenu *m_itemPopup, *m_partPopup; - KAction *m_deleteAction, *m_renameAction, + TDEPopupMenu *m_itemPopup, *m_partPopup; + TDEAction *m_deleteAction, *m_renameAction, *m_newObjectAction, // *m_newObjectToolbarAction, *m_openAction, *m_designAction, *m_editTextAction, *m_executeAction, *m_dataExportAction, *m_printAction, *m_pageSetupAction; - KActionMenu* m_exportActionMenu; - KPopupMenu* m_newObjectPopup; + TDEActionMenu* m_exportActionMenu; + TDEPopupMenu* m_newObjectPopup; int m_itemPopupTitle_id, m_partPopupTitle_id, m_openAction_id, m_designAction_id, m_editTextAction_id, m_executeAction_id, @@ -174,7 +174,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget m_printAction_id, m_pageSetupAction_id, m_pageSetupAction_id_sep; KexiPart::Part *m_prevSelectedPart; - KToolBar *m_toolbar; + TDEToolBar *m_toolbar; KexiSmallToolButton *m_newObjectToolButton, *m_deleteObjectToolButton; TQString m_itemsMimeType; bool m_singleClick : 1; diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h index bcfc9479..bd9eb8f5 100644 --- a/kexi/widget/kexibrowser_p.h +++ b/kexi/widget/kexibrowser_p.h @@ -24,7 +24,7 @@ #include /*! @internal */ -class KexiBrowserListView : public KListView +class KexiBrowserListView : public TDEListView { Q_OBJECT diff --git a/kexi/widget/kexibrowseritem.cpp b/kexi/widget/kexibrowseritem.cpp index 99b80095..3c61e77a 100644 --- a/kexi/widget/kexibrowseritem.cpp +++ b/kexi/widget/kexibrowseritem.cpp @@ -24,8 +24,8 @@ #include #include -KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i) - : KListViewItem(parent, i->groupName()) +KexiBrowserItem::KexiBrowserItem(TDEListView *parent, KexiPart::Info *i) + : TDEListViewItem(parent, i->groupName()) , m_info(i) , m_item(0) { @@ -36,8 +36,8 @@ KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i) m_fifoSorting = 1; //because this is top level item } -KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item) - : KListViewItem(parent, item->name()) +KexiBrowserItem::KexiBrowserItem(TDEListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item) + : TDEListViewItem(parent, item->name()) , m_info(i) , m_item(item) { @@ -45,8 +45,8 @@ KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiP initItem(); } -KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item) - : KListViewItem(parent, item->name()) +KexiBrowserItem::KexiBrowserItem(TDEListView *parent, KexiPart::Info *i, KexiPart::Item *item) + : TDEListViewItem(parent, item->name()) , m_info(i) , m_item(item) { @@ -85,7 +85,7 @@ KexiBrowserItem::clearChildren() TQString KexiBrowserItem::key( int column, bool ascending ) const { -// kdDebug() << "KexiBrowserItem::key() : " << (m_fifoSorting ? m_sortKey : KListViewItem::key(column,ascending)) << endl; - return m_fifoSorting ? m_sortKey : KListViewItem::key(column,ascending); +// kdDebug() << "KexiBrowserItem::key() : " << (m_fifoSorting ? m_sortKey : TDEListViewItem::key(column,ascending)) << endl; + return m_fifoSorting ? m_sortKey : TDEListViewItem::key(column,ascending); } diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h index 9138dafd..4dfa1232 100644 --- a/kexi/widget/kexibrowseritem.h +++ b/kexi/widget/kexibrowseritem.h @@ -33,18 +33,18 @@ namespace KexiPart //! @short List view item for the navigator widget (KexiBrowser) //! Used for creating group items as well as object items -class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem +class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public TDEListViewItem { public: //! Creates group item for part \a i - KexiBrowserItem(KListView *parent, KexiPart::Info *i); + KexiBrowserItem(TDEListView *parent, KexiPart::Info *i); //! Creates item for object \a item defined by part \a i for \a parent - KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item); + KexiBrowserItem(TDEListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item); //! Creates item for object \a item defined by part \a i, without parent //! (used in a case when KexiBrowser::itemsMimeType() is not empty) - KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item); + KexiBrowserItem(TDEListView *parent, KexiPart::Info *i, KexiPart::Item *item); virtual ~KexiBrowserItem(); diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 29bd06d0..6dc75abb 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -188,7 +188,7 @@ void KexiDataAwareView::reloadActions() //warning FIXME Move this to the table part /* kdDebug()<<"INIT ACTIONS***********************************************************************"<contextMenu()->clear(); diff --git a/kexi/widget/kexidatatable.h b/kexi/widget/kexidatatable.h index b82e4f62..68f9caf0 100644 --- a/kexi/widget/kexidatatable.h +++ b/kexi/widget/kexidatatable.h @@ -28,7 +28,7 @@ class KexiMainWindow; class KexiDataTableView; class KexiTableView; class KexiTableViewData; -class KPopupMenu; +class TDEPopupMenu; namespace KexiDB { diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 07a3f4ab..fe81b9eb 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -43,7 +43,7 @@ #include KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int options) - : KListView(parent, name) + : TDEListView(parent, name) , m_schema(0) , m_keyIcon(SmallIcon("key")) , m_noIcon(KexiUtils::emptyIcon(KIcon::Small)) @@ -87,7 +87,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema) int order=0; bool hasPKeys = true; //t->hasPrimaryKeys(); - KListViewItem *item = 0; + TDEListViewItem *item = 0; KexiDB::QueryColumnInfo::Vector columns = m_schema->columns(true /*unique*/); const int count = columns.count(); for(int i=-1; i < count; i++) @@ -96,12 +96,12 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema) if (i==-1) { if (! (m_options & ShowAsterisk)) continue; - item = new KListViewItem(this, item, i18n("* (All Columns)")); + item = new TDEListViewItem(this, item, i18n("* (All Columns)")); m_allColumnsItem = item; } else { colinfo = columns[i]; - item = new KListViewItem(this, item, colinfo->aliasOrName()); + item = new TDEListViewItem(this, item, colinfo->aliasOrName()); if (m_options & ShowDataTypes) item->setText(1, colinfo->field->typeName()); } diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h index a5630a30..e936cc89 100644 --- a/kexi/widget/kexifieldlistview.h +++ b/kexi/widget/kexifieldlistview.h @@ -24,7 +24,7 @@ #include #include -class KListViewItem; +class TDEListViewItem; namespace KexiDB { class TableOrQuerySchema; @@ -32,7 +32,7 @@ namespace KexiDB { /*! This widget provides a list of fields from a table or query. */ -class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView +class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public TDEListView { Q_OBJECT @@ -77,7 +77,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView TQPixmap m_keyIcon; //!< a small "primary key" icon for 0-th column TQPixmap m_noIcon; //!< blank icon of the same size as m_keyIcon int m_options; - KListViewItem *m_allColumnsItem; + TDEListViewItem *m_allColumnsItem; }; #endif diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 82b6489e..8852f81c 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -44,7 +44,7 @@ KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text, update(text, iconSet); } -KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, KAction* action) +KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, TDEAction* action) : TQToolButton(parent, action->name()) , m_action(action) { diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h index 3f8dd615..13aad9e8 100644 --- a/kexi/widget/kexismalltoolbutton.h +++ b/kexi/widget/kexismalltoolbutton.h @@ -38,7 +38,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton KexiSmallToolButton(TQWidget* parent, const TQString& text, const TQIconSet& iconSet, const char* name = 0); - KexiSmallToolButton(TQWidget* parent, KAction *action); + KexiSmallToolButton(TQWidget* parent, TDEAction *action); virtual ~KexiSmallToolButton(); @@ -54,7 +54,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton void init(); virtual void drawButton( TQPainter *_painter ); - TQGuardedPtr m_action; + TQGuardedPtr m_action; }; #endif diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index f3224c7e..d7e2dae1 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -365,7 +365,7 @@ void PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p) { if(!it) return; - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQT_SLOT(renameItem())); menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQT_SLOT(removeItem())); menu->exec(p); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index a3ce7632..d901d373 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -62,22 +62,22 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) setResizePolicy(Manual); /*MOVED TO KexiRelationDialog //actions - m_tableQueryPopup = new KPopupMenu(this, "m_popup"); + m_tableQueryPopup = new TDEPopupMenu(this, "m_popup"); m_tableQueryPopup->insertTitle(i18n("Table")); - m_connectionPopup = new KPopupMenu(this, "m_connectionPopup"); + m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopup->insertTitle(i18n("Relation")); - m_areaPopup = new KPopupMenu(this, "m_areaPopup"); + m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup); plugSharedAction("edit_delete",m_connectionPopup); plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); */ #if 0 - m_removeSelectedTableQueryAction = new KAction(i18n("&Hide Selected Table/Query"), "editdelete", "", + m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "editdelete", "", this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); - m_removeSelectedConnectionAction = new KAction(i18n("&Remove Selected Relationship"), "button_cancel", "", + m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "", this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); - m_openSelectedTableQueryAction = new KAction(i18n("&Open Selected Table/Query"), "", "", + m_openSelectedTableQueryAction = new TDEAction(i18n("&Open Selected Table/Query"), "", "", this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); #endif @@ -86,7 +86,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) #if 0 - m_popup = new KPopupMenu(this, "m_popup"); + m_popup = new TDEPopupMenu(this, "m_popup"); m_openSelectedTableQueryAction->plug( m_popup ); m_removeSelectedTableQueryAction->plug( m_popup ); m_removeSelectedConnectionAction->plug( m_popup ); diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h index 9fa741f6..e801b801 100644 --- a/kexi/widget/relations/kexirelationview.h +++ b/kexi/widget/relations/kexirelationview.h @@ -34,8 +34,8 @@ class TQFrame; class KexiRelationViewTable; class KexiRelationViewTableContainer; -class KAction; -class KPopupMenu; +class TDEAction; +class TDEPopupMenu; namespace KexiDB { diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index a3ad0d5d..cba19483 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -75,8 +75,8 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( // m_tableView->resize( m_tableView->sizeHint() ); lyr->addWidget(m_tableView, 0); connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved())); - connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(m_tableView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } KexiRelationViewTableContainer::~KexiRelationViewTableContainer() @@ -88,7 +88,7 @@ KexiDB::TableOrQuerySchema* KexiRelationViewTableContainer::schema() const return m_tableView->schema(); } -void KexiRelationViewTableContainer::slotContextMenu(KListView *, TQListViewItem *, const TQPoint &p) +void KexiRelationViewTableContainer::slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &p) { // m_parent->executePopup(p); emit contextMenuRequest( p ); @@ -412,7 +412,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) { parentWidget()->setFocus(); setFocus(); - KListView::contentsMousePressEvent(ev); + TDEListView::contentsMousePressEvent(ev); // if (ev->button()==Qt::RightButton) // static_cast(parentWidget())->executePopup(ev->pos()); } diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index 176cc2b8..5e3ff332 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -70,7 +70,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame protected slots: void moved(); - void slotContextMenu(KListView *lv, TQListViewItem *i, const TQPoint& p); + void slotContextMenu(TDEListView *lv, TQListViewItem *i, const TQPoint& p); protected: // KexiDB::TableSchema *m_table; @@ -82,7 +82,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame }; /* -class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public KListViewItem +class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public TDEListViewItem { public: KexiRelationViewTableItem(TQListView *parent, TQListViewItem *after, diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 4c5754b5..47075bbb 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -73,25 +73,25 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, //m_relationView->setFocus(); //actions - m_tableQueryPopup = new KPopupMenu(this, "m_popup"); + m_tableQueryPopup = new TDEPopupMenu(this, "m_popup"); m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), ""); connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); - m_connectionPopup = new KPopupMenu(this, "m_connectionPopup"); + m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopupTitleID = m_connectionPopup->insertTitle(""); connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); - m_areaPopup = new KPopupMenu(this, "m_areaPopup"); + m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); - m_openSelectedTableAction = new KAction(i18n("&Open Table"), SmallIcon("fileopen"), KShortcut(), + m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("fileopen"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(openSelectedTable()), TQT_TQOBJECT(this), "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); - m_designSelectedTableAction = new KAction(i18n("&Design Table"), SmallIcon("edit"), KShortcut(), + m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(designSelectedTable()), TQT_TQOBJECT(this), "relationsview_designTable"); m_designSelectedTableAction->plug( m_tableQueryPopup ); m_tableQueryPopup->insertSeparator(); - KAction* hide_action = plugSharedAction("edit_delete", i18n("&Hide Table"), m_tableQueryPopup); + TDEAction* hide_action = plugSharedAction("edit_delete", i18n("&Hide Table"), m_tableQueryPopup); hide_action->setIconSet(TQIconSet()); plugSharedAction("edit_delete",m_connectionPopup); diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h index 2d6d2064..c71b6e18 100644 --- a/kexi/widget/relations/kexirelationwidget.h +++ b/kexi/widget/relations/kexirelationwidget.h @@ -28,8 +28,8 @@ class KComboBox; class KPushButton; -class KPopupMenu; -class KAction; +class TDEPopupMenu; +class TDEAction; class TQListViewItem; class KexiMainWindow; @@ -127,10 +127,10 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase KexiRelationView *m_relationView; KexiDB::Connection *m_conn; - KPopupMenu *m_tableQueryPopup //over table/query + TDEPopupMenu *m_tableQueryPopup //over table/query , *m_connectionPopup //over connection , *m_areaPopup; //over outer area - KAction *m_openSelectedTableAction, *m_designSelectedTableAction; + TDEAction *m_openSelectedTableAction, *m_designSelectedTableAction; int m_tableQueryPopupTitleID, m_connectionPopupTitleID; }; diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h index 0fed82b6..5d87ad88 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.h +++ b/kexi/widget/tableview/kexidataawareobjectiface.h @@ -36,7 +36,7 @@ class TQObject; class TQScrollBar; -class KPopupMenu; +class TDEPopupMenu; class KexiTableItem; class KexiTableViewData; class KexiRecordMarker; @@ -419,7 +419,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface virtual void dataSet( KexiTableViewData *data ) = 0; /*! \return a pointer to context menu. This can be used to plug some actions there. */ - KPopupMenu* contextMenu() const { return m_popupMenu; } + TDEPopupMenu* contextMenu() const { return m_popupMenu; } /*! \return true if the context menu is enabled (visible) for the view. True by default. */ @@ -818,7 +818,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface int m_dragIndicatorLine; /*! Context menu widget. */ - KPopupMenu *m_popupMenu; + TDEPopupMenu *m_popupMenu; bool m_contextMenuEnabled : 1; diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index a132e829..e4a6288e 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -63,10 +63,10 @@ KexiDataTableView::init() // connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int))); } -/*void KexiDataTableView::initActions(KActionCollection *col) +/*void KexiDataTableView::initActions(TDEActionCollection *col) { KexiTableView::initActions(col); - new KAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter"); + new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter"); }*/ bool KexiDataTableView::setData(KexiDB::Cursor *cursor) diff --git a/kexi/widget/tableview/kexidatatableview.h b/kexi/widget/tableview/kexidatatableview.h index 8592e1b8..120c9817 100644 --- a/kexi/widget/tableview/kexidatatableview.h +++ b/kexi/widget/tableview/kexidatatableview.h @@ -56,7 +56,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView ~KexiDataTableView(); -// virtual void initActions(KActionCollection *col); +// virtual void initActions(TDEActionCollection *col); /*! Fills table view with data using \a cursor. \return true on success. Cursor \a cursor will not be owned by this object. */ diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 4303e551..b975fcdf 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -217,7 +217,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch verticalScrollBar()->raise(); //context menu - m_popupMenu = new KPopupMenu(this, "contextMenu"); + m_popupMenu = new TDEPopupMenu(this, "contextMenu"); #if 0 //moved to mainwindow's actions d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert); d->menu_id_removeRecord = m_popupMenu->insertItem( @@ -322,7 +322,7 @@ void KexiTableView::clearVariables() d->clearVariables(); } -/*void KexiTableView::initActions(KActionCollection *ac) +/*void KexiTableView::initActions(TDEActionCollection *ac) { emit reloadActions(ac); }*/ @@ -1224,11 +1224,11 @@ static bool overrideEditorShortcutNeeded(TQKeyEvent *e) bool KexiTableView::shortCutPressed( TQKeyEvent *e, const TQCString &action_name ) { const int k = e->key(); - KAction *action = m_sharedActions[action_name]; + TDEAction *action = m_sharedActions[action_name]; if (action) { if (!action->isEnabled())//this action is disabled - don't process it! return false; - if (action->shortcut() == KShortcut( KKey(e) )) { + if (action->shortcut() == TDEShortcut( KKey(e) )) { //special cases when we need to override editor's shortcut if (overrideEditorShortcutNeeded(e)) { return true; diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h index f4364eb8..2e1d83fd 100644 --- a/kexi/widget/tableview/kexitableview.h +++ b/kexi/widget/tableview/kexitableview.h @@ -42,16 +42,16 @@ #include #include "kexidataawareobjectiface.h" -class KPopupMenu; +class TDEPopupMenu; class KPrinter; -class KAction; +class TDEAction; class KexiTableHeader; class KexiTableItem; class KexiTableView; class KexiTableEdit; class KexiTableViewPrivate; -class KActionCollection; +class TDEActionCollection; namespace KexiDB { class RowEditBuffer; diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index 30ecab17..eb735a49 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -44,8 +44,8 @@ public: { } - KActionCollection actionCollection; - KAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction, + TDEActionCollection actionCollection; + TDEAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction, *deleteAction #ifdef KEXI_NO_UNFINISHED , *propertiesAction @@ -56,13 +56,13 @@ public: //------------ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) - : KPopupMenu(parent) + : TDEPopupMenu(parent) , d( new Private(this) ) { setName("KexiImageContextMenu"); insertTitle(TQString()); - d->insertFromFileAction = new KAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0, + d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); d->insertFromFileAction->plug(this); d->saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), &d->actionCollection); @@ -75,14 +75,14 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) d->copyAction->plug(this); d->pasteAction = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), &d->actionCollection); d->pasteAction->plug(this); - d->deleteAction = new KAction(i18n("&Clear"), SmallIconSet("editdelete"), 0, + d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("editdelete"), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), &d->actionCollection, "delete"); d->deleteAction->plug(this); #ifdef KEXI_NO_UNFINISHED d->propertiesAction = 0; #else insertSeparator(); - d->propertiesAction = new KAction(i18n("Properties"), 0, 0, + d->propertiesAction = new TDEAction(i18n("Properties"), 0, 0, this, TQT_SLOT(showProperties()), &d->actionCollection, "properties"); d->propertiesAction->plug(this); #endif @@ -128,7 +128,7 @@ void KexiImageContextMenu::insertFromFile() //save last visited path // KURL url(fileName); if (url.isLocalFile()) - KRecentDirs::add(":LastVisitedImagePath", url.directory()); + TDERecentDirs::add(":LastVisitedImagePath", url.directory()); #endif emit insertFromFileRequested(url); @@ -164,7 +164,7 @@ void KexiImageContextMenu::saveAs() convertKFileDialogFilterToTQFileDialogFilter(KImageIO::pattern(KImageIO::Writing)), this, 0, i18n("Save Image to File")); #else - //! @todo add originalFileName! (requires access to KRecentDirs) + //! @todo add originalFileName! (requires access to TDERecentDirs) TQString fileName = KFileDialog::getSaveFileName( ":LastVisitedImagePath", KImageIO::pattern(KImageIO::Writing), this, i18n("Save Image to File")); #endif @@ -180,7 +180,7 @@ void KexiImageContextMenu::saveAs() #ifdef TQ_WS_WIN //save last visited path if (url.isLocalFile()) - KRecentDirs::add(":LastVisitedImagePath", url.directory()); + TDERecentDirs::add(":LastVisitedImagePath", url.directory()); #endif TQFile f(fileName); @@ -238,7 +238,7 @@ void KexiImageContextMenu::updateActionsAvailability() d->propertiesAction->setEnabled( !valueIsNull ); } -KActionCollection* KexiImageContextMenu::actionCollection() const +TDEActionCollection* KexiImageContextMenu::actionCollection() const { return &d->actionCollection; } @@ -261,7 +261,7 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object TQMenuItem *item = menu->findItem(id); if (!item) return false; - KPopupTitle *title = dynamic_cast(item->widget()); + TDEPopupTitle *title = dynamic_cast(item->widget()); if (!title) return false; diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h index b9f950bf..826b1ebb 100644 --- a/kexi/widget/utils/kexicontextmenuutils.h +++ b/kexi/widget/utils/kexicontextmenuutils.h @@ -24,7 +24,7 @@ #include #include -class KActionCollection; +class TDEActionCollection; class KexiDataItemInterface; //! @short A set of helpers for updating popup menu titles @@ -47,7 +47,7 @@ class KEXIGUIUTILS_EXPORT KexiContextMenuUtils handlers in KexiDBImageBox and KexiBlobTableEdit so these objects can respond on requests for data handling. */ -class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu +class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public TDEPopupMenu { Q_OBJECT @@ -56,7 +56,7 @@ class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu KexiImageContextMenu(TQWidget *parent); virtual ~KexiImageContextMenu(); - KActionCollection* actionCollection() const; + TDEActionCollection* actionCollection() const; /*! Updates title for context menu. Used in KexiDBWidgetContextMenuExtender::createTitle(TQPopupMenu *menu) and KexiDBImageBox. diff --git a/kexi/widget/utils/kexisharedactionclient.cpp b/kexi/widget/utils/kexisharedactionclient.cpp index 7436b9f5..ec7d0630 100644 --- a/kexi/widget/utils/kexisharedactionclient.cpp +++ b/kexi/widget/utils/kexisharedactionclient.cpp @@ -30,7 +30,7 @@ KexiSharedActionClient::~KexiSharedActionClient() { } -void KexiSharedActionClient::plugSharedAction(KAction* a) +void KexiSharedActionClient::plugSharedAction(TDEAction* a) { if (!a) return; diff --git a/kexi/widget/utils/kexisharedactionclient.h b/kexi/widget/utils/kexisharedactionclient.h index 58b3bd6a..18b4af11 100644 --- a/kexi/widget/utils/kexisharedactionclient.h +++ b/kexi/widget/utils/kexisharedactionclient.h @@ -22,7 +22,7 @@ #include -class KAction; +class TDEAction; #include //! The KexiSharedActionClient is an interface using application-wide (shared) actions. @@ -39,11 +39,11 @@ class KEXIGUIUTILS_EXPORT KexiSharedActionClient performed at main window's level, so we should give up. Otherwise - default shortcut will be used (example: Shift+Enter key for "data_save_row" action). \sa KexiTableView::shortCutPressed() */ - void plugSharedAction(KAction* a); + void plugSharedAction(TDEAction* a); protected: //! Actions pluged for this widget using plugSharedAction(), available by name. - TQAsciiDict m_sharedActions; + TQAsciiDict m_sharedActions; }; #endif diff --git a/kexi/widget/utils/klistviewitemtemplate.h b/kexi/widget/utils/klistviewitemtemplate.h index 45a5b889..9a4a3be4 100644 --- a/kexi/widget/utils/klistviewitemtemplate.h +++ b/kexi/widget/utils/klistviewitemtemplate.h @@ -24,25 +24,25 @@ //! TQListViewItem class with ability for storing additional data member template -class KListViewItemTemplate : public KListViewItem +class TDEListViewItemTemplate : public TDEListViewItem { public: - KListViewItemTemplate(type _data, TQListView *parent) - : KListViewItem(parent), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent) - : KListViewItem(parent), data(_data) {} - KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after) - : KListViewItem(parent, after), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after) - : KListViewItem(parent, after), data(_data) {} - KListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent) + : TDEListViewItem(parent), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent) + : TDEListViewItem(parent), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after) + : TDEListViewItem(parent, after), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after) + : TDEListViewItem(parent, after), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} type data; }; diff --git a/kformula/DESIGN b/kformula/DESIGN index eec70869..f9e3d55d 100644 --- a/kformula/DESIGN +++ b/kformula/DESIGN @@ -241,7 +241,7 @@ Your only need to choose one of them to get a reasonable good look. Interface templates ################### -Decide what KAction have to be toolbars, +Decide what TDEAction have to be toolbars, what element templates must be loaded, what toolbar display.... There will be predefined (sorry for the spelling error) templates for -General... diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc index 7dbabc00..4433ddd7 100644 --- a/kformula/kformula_view.cc +++ b/kformula/kformula_view.cc @@ -107,37 +107,37 @@ KFormulaPartView::KFormulaPartView(KFormulaDoc* _doc, TQWidget* _parent, const c KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection(), "configure" ); // font stuff -// KFontAction* actionElement_Text_Font = new KFontAction(i18n( "Font Family" ),0, +// TDEFontAction* actionElement_Text_Font = new TDEFontAction(i18n( "Font Family" ),0, // actionCollection(),"textfont"); // connect( actionElement_Text_Font, TQT_SIGNAL( activated( const TQString& ) ), TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString& ) ) ); - KFontSizeAction* actionTextSize = new KFontSizeAction(i18n( "Size" ),0, + TDEFontSizeAction* actionTextSize = new TDEFontSizeAction(i18n( "Size" ),0, actionCollection(),"formula_textsize"); actionTextSize->setFontSize( m_pDoc->getFormula()->fontSize() ); connect( actionTextSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( sizeSelected( int ) ) ); connect( formula, TQT_SIGNAL( baseSizeChanged( int ) ), actionTextSize, TQT_SLOT( setFontSize( int ) ) ); -// KToggleAction* actionElement_Text_Bold = new KToggleAction(i18n( "Bold" ), +// TDEToggleAction* actionElement_Text_Bold = new TDEToggleAction(i18n( "Bold" ), // "bold", // 0, // actionCollection(),"textbold"); // connect( actionElement_Text_Bold, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( bold( bool ) ) ); -// KToggleAction* actionElement_Text_Italic = new KToggleAction(i18n( "Italic" ), +// TDEToggleAction* actionElement_Text_Italic = new TDEToggleAction(i18n( "Italic" ), // "italic", // 0, // actionCollection(),"textitalic"); // connect( actionElement_Text_Italic, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( italic( bool ) ) ); -// KToggleAction* actionElement_Text_Under = new KToggleAction(i18n( "Underlined" ), +// TDEToggleAction* actionElement_Text_Under = new TDEToggleAction(i18n( "Underlined" ), // "underl", // 0, // actionCollection(),"textunder"); // connect(actionElement_Text_Under, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( underline( bool ) ) ); - formulaStringAction = new KAction( i18n( "Edit Formula String..." ), + formulaStringAction = new TDEAction( i18n( "Edit Formula String..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( formulaString() ), actionCollection(), "formula_formulastring" ); diff --git a/kformula/kformula_view.h b/kformula/kformula_view.h index ff564ac0..a1e60861 100644 --- a/kformula/kformula_view.h +++ b/kformula/kformula_view.h @@ -21,11 +21,11 @@ #ifndef __kformula_view_h__ #define __kformula_view_h__ -class KAction; +class TDEAction; class KFormulaDoc; class KFormulaPartView; class KFormulaWidget; -class KSelectAction; +class TDESelectAction; class TQPaintEvent; class TQScrollView; class DCOPObject; @@ -91,26 +91,26 @@ private: KFormulaWidget* formulaWidget; TQScrollView* scrollview; - KAction* cutAction; - KAction* copyAction; - KAction* pasteAction; - - KAction* addBracketAction; - KAction* addFractionAction; - KAction* addRootAction; - KAction* addSumAction; - KAction* addProductAction; - KAction* addIntegralAction; - KAction* addMatrixAction; - KAction* addUpperLeftAction; - KAction* addLowerLeftAction; - KAction* addUpperRightAction; - KAction* addLowerRightAction; - KAction* addGenericUpperAction; - KAction* addGenericLowerAction; - KAction* removeEnclosingAction; - - KAction* formulaStringAction; + TDEAction* cutAction; + TDEAction* copyAction; + TDEAction* pasteAction; + + TDEAction* addBracketAction; + TDEAction* addFractionAction; + TDEAction* addRootAction; + TDEAction* addSumAction; + TDEAction* addProductAction; + TDEAction* addIntegralAction; + TDEAction* addMatrixAction; + TDEAction* addUpperLeftAction; + TDEAction* addLowerLeftAction; + TDEAction* addUpperRightAction; + TDEAction* addLowerRightAction; + TDEAction* addGenericUpperAction; + TDEAction* addGenericLowerAction; + TDEAction* removeEnclosingAction; + + TDEAction* formulaStringAction; static bool first_window; 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 actions = actionCollection()->actions(); - TQValueList::ConstIterator aIt = actions.begin(); - TQValueList::ConstIterator aEnd = actions.end(); + TQValueList actions = actionCollection()->actions(); + TQValueList::ConstIterator aIt = actions.begin(); + TQValueList::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( 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( widget ); + TDEToolBar *bar = static_cast( 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 -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( 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( widget ); + TDEToolBar *bar = static_cast( 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::Iterator it; + TQValueList::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 #include -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 m_pathList; TQStringList m_collectionIdList; - TQValueList m_collectionMenuList; + TQValueList 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(widget)) { - KToolBar* toolBar = static_cast(widget); - KToolBarButton* button = toolBar->getButton(itemId(usedIndex)); + if(::tqqt_cast(widget)) { + TDEToolBar* toolBar = static_cast(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 #include -#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 @@ 0 - + bar @@ -46,7 +46,7 @@ - KToolBar + TDEToolBar
    ktoolbar.h
    -1 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 // 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. Horizontal - + Stencil Set 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 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 -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(view()->factory()->container("PagePopup", view())); + menu = static_cast(view()->factory()->container("PagePopup", view())); } else { - menu = static_cast(view()->factory()->container("StencilPopup", view())); + menu = static_cast(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 true - + m_fontCombo 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 selected 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(factory()->container("ZoomPopup", this)); + m_pMenu = static_cast(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; diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 3c88f8b6..87fb5251 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -203,10 +203,10 @@ void EntryItem::setPaintActive( bool paintActive ) // ************************************************ -Navigator::Navigator(bool _selectable, KPopupMenu * menu, IconSidePane *_iconsidepane, TQWidget *parent, const char *name ) - : KListBox( parent, name ), mSidePane( _iconsidepane ), mPopupMenu( menu ) +Navigator::Navigator(bool _selectable, TDEPopupMenu * menu, IconSidePane *_iconsidepane, TQWidget *parent, const char *name ) + : TDEListBox( parent, name ), mSidePane( _iconsidepane ), mPopupMenu( menu ) { - setSelectionMode( KListBox::Single ); + setSelectionMode( TDEListBox::Single ); viewport()->setBackgroundMode( PaletteBackground ); setFrameStyle( TQFrame::NoFrame ); setHScrollBarMode( TQScrollView::AlwaysOff ); @@ -246,7 +246,7 @@ bool Navigator::showIcons() void Navigator::mouseReleaseEvent(TQMouseEvent *e) { - KListBox::mouseReleaseEvent(e); + TDEListBox::mouseReleaseEvent(e); if ( e->button() != Qt::LeftButton || !mLeftMouseButtonPressed ) return; if ( itemAt( e->pos() ) && executedItem == selectedItem() ) @@ -266,13 +266,13 @@ void Navigator::mousePressEvent(TQMouseEvent *e) } else mLeftMouseButtonPressed = true; - KListBox::mousePressEvent(e); + TDEListBox::mousePressEvent(e); } void Navigator::enterEvent( TQEvent *event ) { // work around TQt behaviour: onItem is not emmitted in enterEvent() - KListBox::enterEvent( event ); + TDEListBox::enterEvent( event ); emit onItem( itemAt( mapFromGlobal( TQCursor::pos() ) ) ); } @@ -415,7 +415,7 @@ IconSidePane::IconSidePane(TQWidget *parent, const char *name ) mShowIcons = KoShellSettings::sidePaneShowIcons(); mShowText = KoShellSettings::sidePaneShowText(); mViewMode = sizeIntToEnum( KoShellSettings::sidePaneIconSize() ); - mPopupMenu = new KPopupMenu(0); + mPopupMenu = new TDEPopupMenu(0); mPopupMenu->insertTitle( i18n( "Icon Size" ) ); mPopupMenu->insertItem( i18n( "Large" ), (int)LargeIcons ); mPopupMenu->setItemEnabled( (int)LargeIcons, mShowIcons ); @@ -580,12 +580,12 @@ IconViewMode IconSidePane::sizeIntToEnum(int size) const } } -void IconSidePane::setActionCollection( KActionCollection *actionCollection ) +void IconSidePane::setActionCollection( TDEActionCollection *actionCollection ) { mActionCollection = actionCollection; } -KActionCollection *IconSidePane::actionCollection() const +TDEActionCollection *IconSidePane::actionCollection() const { return mActionCollection; } diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h index fb7ac2db..5510ffa9 100644 --- a/koshell/iconsidepane.h +++ b/koshell/iconsidepane.h @@ -114,12 +114,12 @@ class EntryItemToolTip : public TQToolTip /** Navigation pane showing all parts relevant to the user */ -class Navigator : public KListBox +class Navigator : public TDEListBox { Q_OBJECT public: - Navigator(bool _selectable, KPopupMenu*, IconSidePane *, TQWidget *parent = 0, const char *name = 0 ); + Navigator(bool _selectable, TDEPopupMenu*, IconSidePane *, TQWidget *parent = 0, const char *name = 0 ); int insertItem(const TQString &_text, const TQString &_pix); @@ -156,7 +156,7 @@ class Navigator : public KListBox int mMinWidth; TQListBoxItem *executedItem; bool mLeftMouseButtonPressed; - KPopupMenu *mPopupMenu; + TDEPopupMenu *mPopupMenu; bool mSelectable; TQListBoxItem* mMouseOn; }; @@ -169,8 +169,8 @@ class IconSidePane :public TQVBox IconSidePane( TQWidget *parent, const char *name = 0 ); ~IconSidePane(); - void setActionCollection( KActionCollection *actionCollection ); - KActionCollection *actionCollection() const; + void setActionCollection( TDEActionCollection *actionCollection ); + TDEActionCollection *actionCollection() const; int insertItem(const TQString & _pix, const TQString &_text); int insertItem(int _grp, const TQString & _pix, const TQString &_text); @@ -203,8 +203,8 @@ class IconSidePane :public TQVBox TQValueList mWidgetStackIds; Navigator *mCurrentNavigator; TQButtonGroup *m_buttongroup; - KActionCollection *mActionCollection; - KPopupMenu *mPopupMenu; + TDEActionCollection *mActionCollection; + TDEPopupMenu *mPopupMenu; IconViewMode mViewMode; bool mShowIcons; diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc index 83be2342..ecfd34f0 100644 --- a/koshell/koshell_main.cc +++ b/koshell/koshell_main.cc @@ -49,7 +49,7 @@ int KoShellApp::newInstance() { if ( isRestored() ) { // There can only be one main window - if ( KMainWindow::canBeRestored( 1 ) ) { + if ( TDEMainWindow::canBeRestored( 1 ) ) { mMainWindow = new KoShellWindow(); setMainWidget( mMainWindow ); mMainWindow->show(); diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index abd7eaa2..763026e3 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -539,9 +539,9 @@ void KoShellWindow::slotFileOpen() url=dialog->selectedURL(); recentAction()->addURL( url ); if ( url.isLocalFile() ) - KRecentDocument::add(url.path(-1)); + TDERecentDocument::add(url.path(-1)); else - KRecentDocument::add(url.url(-1), true); + TDERecentDocument::add(url.url(-1), true); } else return; @@ -669,7 +669,7 @@ TQString KoShellWindow::configFile() const void KoShellWindow::tab_contextMenu(TQWidget * w,const TQPoint &p) { - KPopupMenu menu; + TDEPopupMenu menu; KIconLoader il; int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", KIcon::Small ), i18n("Save") ); int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", KIcon::Small ), i18n("Close") ); @@ -729,9 +729,9 @@ void KoShellWindow::showPartSpecificHelp() KoShellGUIClient::KoShellGUIClient( KoShellWindow *window ) : KXMLGUIClient() { setXMLFile( "koshellui.rc", true, true ); - window->mnuSaveAll = new KAction( i18n("Save All"), 0, TQT_TQOBJECT(window), TQT_SLOT( saveAll() ), actionCollection(), "save_all" ); + window->mnuSaveAll = new TDEAction( i18n("Save All"), 0, TQT_TQOBJECT(window), TQT_SLOT( saveAll() ), actionCollection(), "save_all" ); window->mnuSaveAll->setEnabled(false); - window->partSpecificHelpAction = new KAction(i18n("Part Handbook"), "contents", 0, TQT_TQOBJECT(window), TQT_SLOT(showPartSpecificHelp()), + window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, TQT_TQOBJECT(window), TQT_SLOT(showPartSpecificHelp()), actionCollection(), "partSpecificHelp"); window->partSpecificHelpAction->setEnabled(false); } diff --git a/koshell/koshell_shell.h b/koshell/koshell_shell.h index 4167bf31..d25cedd5 100644 --- a/koshell/koshell_shell.h +++ b/koshell/koshell_shell.h @@ -61,8 +61,8 @@ public: virtual TQString configFile() const; - KAction *mnuSaveAll; - KAction* partSpecificHelpAction; + TDEAction *mnuSaveAll; + TDEAction* partSpecificHelpAction; protected slots: diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cc index b5082af0..6aaa4a61 100644 --- a/kplato/kptaccountspanel.cc +++ b/kplato/kptaccountspanel.cc @@ -37,25 +37,25 @@ namespace KPlato { -class AccountItem : public KListViewItem { +class AccountItem : public TDEListViewItem { public: AccountItem(AccountsPanel &pan, TQListView *parent) - : KListViewItem(parent), account(0), panel(pan) + : TDEListViewItem(parent), account(0), panel(pan) { init(); } AccountItem(AccountsPanel &pan, TQListViewItem *parent) - : KListViewItem(parent), account(0), panel(pan) + : TDEListViewItem(parent), account(0), panel(pan) { init(); } AccountItem(AccountsPanel &pan, TQListView *parent, TQString label1, TQString label2 = TQString()) - : KListViewItem(parent, label1, label2), account(0), panel(pan) + : TDEListViewItem(parent, label1, label2), account(0), panel(pan) { init(); } AccountItem(AccountsPanel &pan, TQListViewItem *parent, TQString label1, TQString label2 = TQString()) - : KListViewItem(parent, label1, label2), account(0), panel(pan) + : TDEListViewItem(parent, label1, label2), account(0), panel(pan) { init(); } AccountItem(AccountsPanel &pan, TQListView *parent, TQListViewItem *after) - : KListViewItem(parent, after), account(0), panel(pan) + : TDEListViewItem(parent, after), account(0), panel(pan) { init(); } AccountItem(AccountsPanel &pan, TQListViewItem *parent, TQListViewItem *after) - : KListViewItem(parent, after), account(0), panel(pan) + : TDEListViewItem(parent, after), account(0), panel(pan) { init(); } Account *account; diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index 42b35ba9..61d83ac5 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -58,7 +58,7 @@ - + Account diff --git a/kplato/kptaccountsview.h b/kplato/kptaccountsview.h index 3daf9057..c8f99aae 100644 --- a/kplato/kptaccountsview.h +++ b/kplato/kptaccountsview.h @@ -37,8 +37,8 @@ class TQListViewItem; class TQLabel; class TQPushButton; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class KPrinter; namespace KPlato diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc index c10a34b5..010e82bf 100644 --- a/kplato/kptcalendarlistdialog.cc +++ b/kplato/kptcalendarlistdialog.cc @@ -44,11 +44,11 @@ namespace KPlato { -class CalendarListViewItem : public KListViewItem +class CalendarListViewItem : public TDEListViewItem { public: CalendarListViewItem(CalendarListDialogImpl &pan, TQListView *lv, Calendar *cal, Calendar *orig=0) - : KListViewItem(lv, cal->name()), panel(pan) { + : TDEListViewItem(lv, cal->name()), panel(pan) { calendar = cal; original = orig; @@ -155,7 +155,7 @@ protected: return; } panel.renameStopped(this); - KListViewItem::cancelRename(col); + TDEListViewItem::cancelRename(col); setRenameEnabled(col, false); } private: diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui index 29f4a4fd..08980750 100644 --- a/kplato/kptcalendarlistpanel.ui +++ b/kplato/kptcalendarlistpanel.ui @@ -47,7 +47,7 @@ New - + Calendar Name diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc index 5f641792..8a354d61 100644 --- a/kplato/kptdoublelistviewbase.cc +++ b/kplato/kptdoublelistviewbase.cc @@ -89,7 +89,7 @@ void ListView::paintToPrinter(TQPainter * p, int cx, int cy, int cw, int ch) { } DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListView *parent, TQListViewItem *after, bool highlight) - : KListViewItem(parent, after), + : TDEListViewItem(parent, after), m_masterItem(master), m_value(0.0), m_highlight(highlight), @@ -101,7 +101,7 @@ DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListI //kdDebug()<<"DoubleListViewBase::SlaveListItem "<text(0)<<" parent="<(parent)->m_masterItem->text(0)<setShadeSortColumn(false); #endif diff --git a/kplato/kptreportview.h b/kplato/kptreportview.h index 0c9f5d12..e62c2b36 100644 --- a/kplato/kptreportview.h +++ b/kplato/kptreportview.h @@ -30,7 +30,7 @@ #include -class KAction; +class TDEAction; class KPrinter; namespace Kugar @@ -114,10 +114,10 @@ protected slots: void slotReportListSelectionChanged(TQListViewItem* item); private: - class ReportItem : public KListViewItem { + class ReportItem : public TDEListViewItem { public: - ReportItem(KListView *p, TQString name, TQString _url) - : KListViewItem(p, name), + ReportItem(TDEListView *p, TQString name, TQString _url) + : TDEListViewItem(p, name), url(_url) {} TQString url; @@ -126,7 +126,7 @@ private: private: View *m_mainview; - KListView *m_reportList; + TDEListView *m_reportList; KugarReportViewer *m_reportview; int m_defaultFontSize; diff --git a/kplato/kptresourceappointmentsview.h b/kplato/kptresourceappointmentsview.h index db7049e4..cdffa912 100644 --- a/kplato/kptresourceappointmentsview.h +++ b/kplato/kptresourceappointmentsview.h @@ -33,8 +33,8 @@ class TQListViewItem; class TQLabel; class TQPushButton; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class KPrinter; namespace KPlato diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cc index 99443d88..6059590b 100644 --- a/kplato/kptresourcespanel.cc +++ b/kplato/kptresourcespanel.cc @@ -180,10 +180,10 @@ public: int m_state; }; -class ResourcesPanelGroupLVItem : public KListViewItem { +class ResourcesPanelGroupLVItem : public TDEListViewItem { public: - ResourcesPanelGroupLVItem(ResourcesPanel &pan, KListView *lv, GroupItem *item) - : KListViewItem(lv, item->m_name), + ResourcesPanelGroupLVItem(ResourcesPanel &pan, TDEListView *lv, GroupItem *item) + : TDEListViewItem(lv, item->m_name), m_group(item), panel(pan) { @@ -218,7 +218,7 @@ protected: return; } panel.renameStopped(this); - KListViewItem::cancelRename(col); + TDEListViewItem::cancelRename(col); setRenameEnabled(col, false); } }; diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index 5ce557cd..addfac34 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -46,10 +46,10 @@ namespace KPlato { -class ResListView : public KListView { +class ResListView : public TDEListView { public: ResListView(TQWidget * parent = 0, const char* name=0) - : KListView(parent, name) + : TDEListView(parent, name) {} int headerHeight() const { @@ -278,10 +278,10 @@ protected: }; -class ResourceItemPrivate : public KListViewItem { +class ResourceItemPrivate : public TDEListViewItem { public: ResourceItemPrivate(Resource *r, TQListViewItem *parent) - : KListViewItem(parent, r->name()), + : TDEListViewItem(parent, r->name()), resource(r) {} Resource *resource; @@ -293,7 +293,7 @@ public: g.setColor(TQColorGroup::HighlightedText, TQColor(red)); } - KListViewItem::paintCell(p, g, column, width, align); + TDEListViewItem::paintCell(p, g, column, width, align); } void setColumnState(int c, int state=1) { m_columns[c] = state; @@ -302,16 +302,16 @@ private: TQMap m_columns; }; -class NodeItemPrivate : public KListViewItem { +class NodeItemPrivate : public TDEListViewItem { public: NodeItemPrivate(Task *n, TQListView *parent) - : KListViewItem(parent, n->name()), + : TDEListViewItem(parent, n->name()), node(n) { init(); } NodeItemPrivate(TQString name, TQListView *parent) - : KListViewItem(parent, name), + : TDEListViewItem(parent, name), node(0) { init(); } @@ -336,7 +336,7 @@ public: if (columnPrio.contains(column)) { g.setColor(TQColorGroup::Base, prioColors[columnPrio[column]]); } - KListViewItem::paintCell(p, g, column, width, align); + TDEListViewItem::paintCell(p, g, column, width, align); } Task *node; @@ -351,10 +351,10 @@ private: TQMap columnPrio; }; -class AppointmentItem : public KListViewItem { +class AppointmentItem : public TDEListViewItem { public: AppointmentItem(Appointment *a, TQDate &d, TQListViewItem *parent) - : KListViewItem(parent), + : TDEListViewItem(parent), appointment(a), date(d) {} @@ -432,7 +432,7 @@ void ResourceView::draw(Project &project) TQPtrListIterator it(project.resourceGroups()); for (; it.current(); ++it) { - KListViewItem *item = new KListViewItem(resList, it.current()->name()); + TDEListViewItem *item = new TDEListViewItem(resList, it.current()->name()); item->setOpen(true); drawResources(project, item, it.current()); } diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc index d7c2c759..ff691bff 100644 --- a/kplato/kptstandardworktimedialog.cc +++ b/kplato/kptstandardworktimedialog.cc @@ -46,11 +46,11 @@ namespace KPlato { -class WeekdayListItem : public KListViewItem +class WeekdayListItem : public TDEListViewItem { public: - WeekdayListItem(Calendar *cal, int wd, KListView *parent, TQString name, KListViewItem *after) - : KListViewItem(parent, after), + WeekdayListItem(Calendar *cal, int wd, TDEListView *parent, TQString name, TDEListViewItem *after) + : TDEListViewItem(parent, after), original(cal->weekday(wd)), calendar(cal), weekday(wd) diff --git a/kplato/kpttaskappointmentsview.h b/kplato/kpttaskappointmentsview.h index aca847a4..7f6e7b4b 100644 --- a/kplato/kpttaskappointmentsview.h +++ b/kplato/kpttaskappointmentsview.h @@ -32,8 +32,8 @@ class TQListViewItem; class TQLabel; class TQPushButton; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class KPrinter; namespace KPlato diff --git a/kplato/kptview.cc b/kplato/kptview.cc index 8b669252..7ebd1b2d 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -164,73 +164,73 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) actionCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotEditCopy() ), actionCollection(), "edit_copy" ); actionPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotEditPaste() ), actionCollection(), "edit_paste" ); - actionIndentTask = new KAction(i18n("Indent Task"), "indent_task", 0, TQT_TQOBJECT(this), + actionIndentTask = new TDEAction(i18n("Indent Task"), "indent_task", 0, TQT_TQOBJECT(this), TQT_SLOT(slotIndentTask()), actionCollection(), "indent_task"); - actionUnindentTask = new KAction(i18n("Unindent Task"), "unindent_task", 0, TQT_TQOBJECT(this), + actionUnindentTask = new TDEAction(i18n("Unindent Task"), "unindent_task", 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnindentTask()), actionCollection(), "unindent_task"); - actionMoveTaskUp = new KAction(i18n("Move Up"), "move_task_up", 0, TQT_TQOBJECT(this), + actionMoveTaskUp = new TDEAction(i18n("Move Up"), "move_task_up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveTaskUp()), actionCollection(), "move_task_up"); - actionMoveTaskDown = new KAction(i18n("Move Down"), "move_task_down", 0, TQT_TQOBJECT(this), + actionMoveTaskDown = new TDEAction(i18n("Move Down"), "move_task_down", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveTaskDown()), actionCollection(), "move_task_down"); // ------ View - actionViewGantt = new KAction(i18n("Gantt"), "gantt_chart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGantt()), actionCollection(), "view_gantt"); + actionViewGantt = new TDEAction(i18n("Gantt"), "gantt_chart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGantt()), actionCollection(), "view_gantt"); TQString group = "EstimationType"; - actionViewExpected = new KRadioAction(i18n("Expected"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewExpected()), actionCollection(), "view_expected"); + actionViewExpected = new TDERadioAction(i18n("Expected"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewExpected()), actionCollection(), "view_expected"); actionViewExpected->setExclusiveGroup(group); - actionViewOptimistic = new KRadioAction(i18n("Optimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewOptimistic()), actionCollection(), "view_optimistic"); + actionViewOptimistic = new TDERadioAction(i18n("Optimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewOptimistic()), actionCollection(), "view_optimistic"); actionViewOptimistic->setExclusiveGroup(group); - actionViewPessimistic = new KRadioAction(i18n("Pessimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPessimistic()), actionCollection(), "view_pessimistic"); + actionViewPessimistic = new TDERadioAction(i18n("Pessimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPessimistic()), actionCollection(), "view_pessimistic"); actionViewPessimistic->setExclusiveGroup(group); - actionViewGanttResources = new KToggleAction(i18n("Resources"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttResources()), actionCollection(), "view_gantt_showResources"); - actionViewGanttTaskName = new KToggleAction(i18n("Task Name"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttTaskName()), actionCollection(), "view_gantt_showTaskName"); - actionViewGanttTaskLinks = new KToggleAction(i18n("Task Links"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttTaskLinks()), actionCollection(), "view_gantt_showTaskLinks"); - actionViewGanttProgress = new KToggleAction(i18n("Progress"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttProgress()), actionCollection(), "view_gantt_showProgress"); - actionViewGanttFloat = new KToggleAction(i18n("Float"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttFloat()), actionCollection(), "view_gantt_showFloat"); - actionViewGanttCriticalTasks = new KToggleAction(i18n("Critical Tasks"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttCriticalTasks()), actionCollection(), "view_gantt_showCriticalTasks"); - actionViewGanttCriticalPath = new KToggleAction(i18n("Critical Path"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttCriticalPath()), actionCollection(), "view_gantt_showCriticalPath"); + actionViewGanttResources = new TDEToggleAction(i18n("Resources"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttResources()), actionCollection(), "view_gantt_showResources"); + actionViewGanttTaskName = new TDEToggleAction(i18n("Task Name"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttTaskName()), actionCollection(), "view_gantt_showTaskName"); + actionViewGanttTaskLinks = new TDEToggleAction(i18n("Task Links"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttTaskLinks()), actionCollection(), "view_gantt_showTaskLinks"); + actionViewGanttProgress = new TDEToggleAction(i18n("Progress"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttProgress()), actionCollection(), "view_gantt_showProgress"); + actionViewGanttFloat = new TDEToggleAction(i18n("Float"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttFloat()), actionCollection(), "view_gantt_showFloat"); + actionViewGanttCriticalTasks = new TDEToggleAction(i18n("Critical Tasks"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttCriticalTasks()), actionCollection(), "view_gantt_showCriticalTasks"); + actionViewGanttCriticalPath = new TDEToggleAction(i18n("Critical Path"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttCriticalPath()), actionCollection(), "view_gantt_showCriticalPath"); -// actionViewGanttNotScheduled = new KToggleAction(i18n("Not Scheduled"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled"); +// actionViewGanttNotScheduled = new TDEToggleAction(i18n("Not Scheduled"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled"); - actionViewTaskAppointments = new KToggleAction(i18n("Show Allocations"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments"); + actionViewTaskAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments"); - actionViewPert = new KAction(i18n("Network"), "pert_chart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPert()), actionCollection(), "view_pert"); + actionViewPert = new TDEAction(i18n("Network"), "pert_chart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPert()), actionCollection(), "view_pert"); - actionViewResources = new KAction(i18n("Resources"), "resources", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewResources()), actionCollection(), "view_resources"); + actionViewResources = new TDEAction(i18n("Resources"), "resources", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewResources()), actionCollection(), "view_resources"); - actionViewResourceAppointments = new KToggleAction(i18n("Show Allocations"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewResourceAppointments()), actionCollection(), "view_resource_appointments"); + actionViewResourceAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewResourceAppointments()), actionCollection(), "view_resource_appointments"); - actionViewAccounts = new KAction(i18n("Accounts"), "accounts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewAccounts()), actionCollection(), "view_accounts"); + actionViewAccounts = new TDEAction(i18n("Accounts"), "accounts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewAccounts()), actionCollection(), "view_accounts"); - //actionViewReports = new KAction(i18n("Reports"), "reports", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewReports()), actionCollection(), "view_reports"); + //actionViewReports = new TDEAction(i18n("Reports"), "reports", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewReports()), actionCollection(), "view_reports"); // ------ Insert - actionAddTask = new KAction(i18n("Task..."), "add_task", 0, TQT_TQOBJECT(this), + actionAddTask = new TDEAction(i18n("Task..."), "add_task", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddTask()), actionCollection(), "add_task"); - actionAddSubtask = new KAction(i18n("Sub-Task..."), "add_sub_task", 0, TQT_TQOBJECT(this), + actionAddSubtask = new TDEAction(i18n("Sub-Task..."), "add_sub_task", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTask()), actionCollection(), "add_sub_task"); - actionAddMilestone = new KAction(i18n("Milestone..."), "add_milestone", 0, TQT_TQOBJECT(this), + actionAddMilestone = new TDEAction(i18n("Milestone..."), "add_milestone", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddMilestone()), actionCollection(), "add_milestone"); // ------ Project - actionEditMainProject = new KAction(i18n("Edit Main Project..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectEdit()), actionCollection(), "project_edit"); - actionEditStandardWorktime = new KAction(i18n("Edit Standard Worktime..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectWorktime()), actionCollection(), "project_worktime"); - actionEditCalendar = new KAction(i18n("Edit Calendar..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalendar()), actionCollection(), "project_calendar"); - actionEditAccounts = new KAction(i18n("Edit Accounts..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAccounts()), actionCollection(), "project_accounts"); - actionEditResources = new KAction(i18n("Edit Resources..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectResources()), actionCollection(), "project_resources"); + actionEditMainProject = new TDEAction(i18n("Edit Main Project..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectEdit()), actionCollection(), "project_edit"); + actionEditStandardWorktime = new TDEAction(i18n("Edit Standard Worktime..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectWorktime()), actionCollection(), "project_worktime"); + actionEditCalendar = new TDEAction(i18n("Edit Calendar..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalendar()), actionCollection(), "project_calendar"); + actionEditAccounts = new TDEAction(i18n("Edit Accounts..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAccounts()), actionCollection(), "project_accounts"); + actionEditResources = new TDEAction(i18n("Edit Resources..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectResources()), actionCollection(), "project_resources"); - actionCalculate = new KActionMenu(i18n("Calculate"), "project_calculate", actionCollection(), "project_calculate"); + actionCalculate = new TDEActionMenu(i18n("Calculate"), "project_calculate", actionCollection(), "project_calculate"); connect(actionCalculate, TQT_SIGNAL(activated()), TQT_SLOT(slotProjectCalculate())); - actionCalculateExpected = new KAction(i18n("Expected"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculateExpected()), actionCollection(), "project_calculate_expected"); + actionCalculateExpected = new TDEAction(i18n("Expected"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculateExpected()), actionCollection(), "project_calculate_expected"); actionCalculate->insert(actionCalculateExpected); - actionCalculateOptimistic = new KAction(i18n("Optimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculateOptimistic()), actionCollection(), "project_calculate_optimistic"); + actionCalculateOptimistic = new TDEAction(i18n("Optimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculateOptimistic()), actionCollection(), "project_calculate_optimistic"); actionCalculate->insert(actionCalculateOptimistic); - actionCalculatePessimistic = new KAction(i18n("Pessimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculatePessimistic()), actionCollection(), "project_calculate_pessimistic"); + actionCalculatePessimistic = new TDEAction(i18n("Pessimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculatePessimistic()), actionCollection(), "project_calculate_pessimistic"); actionCalculate->insert(actionCalculatePessimistic); /* // ------ Reports @@ -245,48 +245,48 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) m_reportview->enableNavigationBtn();*/ mainWindow()->toolBar("report")->hide(); -// new KAction(i18n("Design..."), "report_design", 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Design..."), "report_design", 0, TQT_TQOBJECT(this), // TQT_SLOT(slotReportDesign()), actionCollection(), "report_design"); // ------ Tools actionDefineWBS = - new KAction(i18n("Define WBS Pattern..."), "tools_define_wbs", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Define WBS Pattern..."), "tools_define_wbs", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDefineWBS()), actionCollection(), "tools_generate_wbs"); actionGenerateWBS = - new KAction(i18n("Generate WBS Code"), "tools_generate_wbs", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Generate WBS Code"), "tools_generate_wbs", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGenerateWBS()), actionCollection(), "tools_define_wbs"); // ------ Export (testing) - //actionExportGantt = new KAction(i18n("Export Ganttview"), "export_gantt", 0, TQT_TQOBJECT(this), + //actionExportGantt = new TDEAction(i18n("Export Ganttview"), "export_gantt", 0, TQT_TQOBJECT(this), // TQT_SLOT(slotExportGantt()), actionCollection(), "export_gantt"); // ------ Settings - actionConfigure = new KAction(i18n("Configure KPlato..."), "configure", 0, TQT_TQOBJECT(this), + actionConfigure = new TDEAction(i18n("Configure KPlato..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "configure"); // ------ Popup - actionOpenNode = new KAction(i18n("Edit..."), "edit", 0, TQT_TQOBJECT(this), + actionOpenNode = new TDEAction(i18n("Edit..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenNode()), actionCollection(), "node_properties"); - actionTaskProgress = new KAction(i18n("Progress..."), "edit", 0, TQT_TQOBJECT(this), + actionTaskProgress = new TDEAction(i18n("Progress..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTaskProgress()), actionCollection(), "task_progress"); - actionDeleteTask = new KAction(i18n("Delete Task"), "editdelete", 0, TQT_TQOBJECT(this), + actionDeleteTask = new TDEAction(i18n("Delete Task"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteTask()), actionCollection(), "delete_task"); - actionEditResource = new KAction(i18n("Edit Resource..."), "edit", 0, TQT_TQOBJECT(this), + actionEditResource = new TDEAction(i18n("Edit Resource..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditResource()), actionCollection(), "edit_resource"); // ------------------- Actions with a key binding and no GUI item // Temporary, till we get a menu entry - actNoInformation = new KAction("Toggle no information", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttNoInformation()), actionCollection(), "show_noinformation"); + actNoInformation = new TDEAction("Toggle no information", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttNoInformation()), actionCollection(), "show_noinformation"); #ifndef NDEBUG - //new KAction("Print Debug", CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), TQT_SLOT( slotPrintDebug()), actionCollection(), "print_debug"); - new KAction("Print Debug", CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrintSelectedDebug()), actionCollection(), "print_debug"); - new KAction("Print Calendar Debug", CTRL+SHIFT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotPrintCalendarDebug()), actionCollection(), "print_calendar_debug"); -// new KAction("Print Test Debug", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotPrintTestDebug()), actionCollection(), "print_test_debug"); + //new TDEAction("Print Debug", CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), TQT_SLOT( slotPrintDebug()), actionCollection(), "print_debug"); + new TDEAction("Print Debug", CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrintSelectedDebug()), actionCollection(), "print_debug"); + new TDEAction("Print Calendar Debug", CTRL+SHIFT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotPrintCalendarDebug()), actionCollection(), "print_calendar_debug"); +// new TDEAction("Print Test Debug", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotPrintTestDebug()), actionCollection(), "print_test_debug"); - KAction* actExportGantt = new KAction( i18n( "Export Gantt" ), CTRL+SHIFT+Key_G, + TDEAction* actExportGantt = new TDEAction( i18n( "Export Gantt" ), CTRL+SHIFT+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotExportGantt() ), actionCollection(), "export_gantt" ); #endif diff --git a/kplato/kptview.h b/kplato/kptview.h index aa1f737d..eecbeabd 100644 --- a/kplato/kptview.h +++ b/kplato/kptview.h @@ -30,13 +30,13 @@ class TQHBoxLayout; class TQTabWidget; class TQWidgetStack; -class KListView; +class TDEListView; class KPrinter; -class KAction; -class KActionMenu; -class KSelectAction; -class KToggleAction; -class KRadioAction; +class TDEAction; +class TDEActionMenu; +class TDESelectAction; +class TDEToggleAction; +class TDERadioAction; class KStatusBarLabel; class DCOPObject; @@ -200,75 +200,75 @@ private: DCOPObject* m_dcop; // ------ Edit - KAction *actionCut; - KAction *actionCopy; - KAction *actionPaste; - - KAction *actionIndentTask; - KAction *actionUnindentTask; - KAction *actionMoveTaskUp; - KAction *actionMoveTaskDown; + TDEAction *actionCut; + TDEAction *actionCopy; + TDEAction *actionPaste; + + TDEAction *actionIndentTask; + TDEAction *actionUnindentTask; + TDEAction *actionMoveTaskUp; + TDEAction *actionMoveTaskDown; // ------ View - KAction *actionViewGantt; - KRadioAction *actionViewExpected; - KRadioAction *actionViewOptimistic; - KRadioAction *actionViewPessimistic; + TDEAction *actionViewGantt; + TDERadioAction *actionViewExpected; + TDERadioAction *actionViewOptimistic; + TDERadioAction *actionViewPessimistic; - KToggleAction *actionViewGanttResources; - KToggleAction *actionViewGanttTaskName; - KToggleAction *actionViewGanttTaskLinks; - KToggleAction *actionViewGanttProgress; - KToggleAction *actionViewGanttFloat; - KToggleAction *actionViewGanttCriticalTasks; - KToggleAction *actionViewGanttCriticalPath; - KToggleAction *actionViewGanttNotScheduled; - KToggleAction *actionViewTaskAppointments; - KAction *actionViewPert; - KAction *actionViewResources; - KToggleAction *actionViewResourceAppointments; - KAction *actionViewAccounts; - KAction *actionViewReports; + TDEToggleAction *actionViewGanttResources; + TDEToggleAction *actionViewGanttTaskName; + TDEToggleAction *actionViewGanttTaskLinks; + TDEToggleAction *actionViewGanttProgress; + TDEToggleAction *actionViewGanttFloat; + TDEToggleAction *actionViewGanttCriticalTasks; + TDEToggleAction *actionViewGanttCriticalPath; + TDEToggleAction *actionViewGanttNotScheduled; + TDEToggleAction *actionViewTaskAppointments; + TDEAction *actionViewPert; + TDEAction *actionViewResources; + TDEToggleAction *actionViewResourceAppointments; + TDEAction *actionViewAccounts; + TDEAction *actionViewReports; // ------ Insert - KAction *actionAddTask; - KAction *actionAddSubtask; - KAction *actionAddMilestone; + TDEAction *actionAddTask; + TDEAction *actionAddSubtask; + TDEAction *actionAddMilestone; // ------ Project - KAction *actionEditMainProject; - KAction *actionEditStandardWorktime; - KAction *actionEditCalendar; - KAction *actionEditAccounts; - KAction *actionEditResources; - KActionMenu *actionCalculate; - KAction *actionCalculateExpected; - KAction *actionCalculateOptimistic; - KAction *actionCalculatePessimistic; + TDEAction *actionEditMainProject; + TDEAction *actionEditStandardWorktime; + TDEAction *actionEditCalendar; + TDEAction *actionEditAccounts; + TDEAction *actionEditResources; + TDEActionMenu *actionCalculate; + TDEAction *actionCalculateExpected; + TDEAction *actionCalculateOptimistic; + TDEAction *actionCalculatePessimistic; // ------ Reports - KAction *actionFirstpage; - KAction *actionPriorpage; - KAction *actionNextpage; - KAction *actionLastpage; + TDEAction *actionFirstpage; + TDEAction *actionPriorpage; + TDEAction *actionNextpage; + TDEAction *actionLastpage; // ------ Tools - KAction *actionDefineWBS; - KAction *actionGenerateWBS; + TDEAction *actionDefineWBS; + TDEAction *actionGenerateWBS; // ------ Export (testing) - KAction *actionExportGantt; + TDEAction *actionExportGantt; // ------ Settings - KAction *actionConfigure; + TDEAction *actionConfigure; // ------ Popup - KAction *actionOpenNode; - KAction *actionTaskProgress; - KAction *actionDeleteTask; - KAction *actionEditResource; + TDEAction *actionOpenNode; + TDEAction *actionTaskProgress; + TDEAction *actionDeleteTask; + TDEAction *actionEditResource; //Test - KAction *actNoInformation; + TDEAction *actNoInformation; }; } //Kplato namespace diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index cc47ad3f..af913ca2 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -34,7 +34,7 @@ unnamed - + Resource Group diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index eafdca61..6843dfd8 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -166,7 +166,7 @@ when there is no calendar defined for a resource. unnamed - + Weekday diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 8c1d244c..358c852b 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -2306,7 +2306,7 @@ void KPrCanvas::setMouseSelectedObject(bool b) void KPrCanvas::setupMenus() { // create right button presentation menu - m_presMenu = new KPopupMenu(); + m_presMenu = new TDEPopupMenu(); TQ_CHECK_PTR( m_presMenu ); m_presMenu->setCheckable( true ); m_presMenu->insertTitle( i18n( "Slide Show" ) ); diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index e19911a7..ec42bfa0 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -49,7 +49,7 @@ class TQPainter; class KTextEdit; class KPrTextObject; class KPrObject; -class KPopupMenu; +class TDEPopupMenu; class TQResizeEvent; class TQPaintEvent; class TQDragEnterEvent; @@ -791,7 +791,7 @@ private: static const int KEY_SNAP_DISTANCE; // variables /// Popup menu used in presentation mode. - KPopupMenu *m_presMenu; + TDEPopupMenu *m_presMenu; bool showingLastSlide; bool mousePressed; bool drawContour; diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index e6e706cc..4009382c 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -798,8 +798,8 @@ void KPrConfigureDefaultDocPage::slotDefault() void KPrConfigureDefaultDocPage::selectNewDefaultFont() { TQStringList list; - KFontChooser::getFontList(list, KFontChooser::SmoothScalableFonts); - KFontDialog dlg( this, "Font Selector", false, true, list, true ); + TDEFontChooser::getFontList(list, TDEFontChooser::SmoothScalableFonts); + TDEFontDialog dlg( this, "Font Selector", false, true, list, true ); dlg.setFont(*font); int result = dlg.exec(); if (KDialog::Accepted == result) { @@ -939,7 +939,7 @@ KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *parent, ch KPrDocument* doc = m_pView->kPresenterDoc(); config = KPrFactory::global()->config(); - m_pPathView = new KListView( this ); + m_pPathView = new TDEListView( this ); m_pPathView->setResizeMode(TQListView::NoColumn); m_pPathView->addColumn( i18n( "Type" ) ); m_pPathView->addColumn( i18n( "Path" ) ); diff --git a/kpresenter/KPrConfig.h b/kpresenter/KPrConfig.h index 2616298a..b1696eb4 100644 --- a/kpresenter/KPrConfig.h +++ b/kpresenter/KPrConfig.h @@ -181,7 +181,7 @@ private slots: private: KPrView* m_pView; TDEConfig* config; - KListView* m_pPathView; + TDEListView* m_pPathView; TQPushButton *m_modifyPath; }; diff --git a/kpresenter/KPrMSPresentationSetup.h b/kpresenter/KPrMSPresentationSetup.h index 6da45782..293971ce 100644 --- a/kpresenter/KPrMSPresentationSetup.h +++ b/kpresenter/KPrMSPresentationSetup.h @@ -34,7 +34,7 @@ class KPrView; class KURLRequester; class KColorButton; -class KListView; +class TDEListView; class KIntNumInput; class KLineEdit; class KComboBox; diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 67813eb1..2591e4c5 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -58,7 +58,7 @@ KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name, void KPrPresDurationDia::setupSlideList( TQWidget *_page ) { - slides = new KListView( _page ); + slides = new TDEListView( _page ); slides->addColumn( i18n( "No." ) ); slides->addColumn( i18n( "Display Duration" ) ); slides->addColumn( i18n( "Slide Title" ) ); @@ -69,7 +69,7 @@ void KPrPresDurationDia::setupSlideList( TQWidget *_page ) for ( int i = doc->getPageNums() - 1; i >= 0; --i ) { if ( doc->pageList().at( i )->isSlideSelected() ) { - KListViewItem *item = new KListViewItem( slides ); + TDEListViewItem *item = new TDEListViewItem( slides ); item->setPixmap( 0, KPBarIcon( "slide" ) ); item->setText( 0, TQString( "%1" ).arg( i + 1 ) ); item->setText( 1, *m_durationListString.at( i ) ); diff --git a/kpresenter/KPrPresDurationDia.h b/kpresenter/KPrPresDurationDia.h index 1007955a..888cb9db 100644 --- a/kpresenter/KPrPresDurationDia.h +++ b/kpresenter/KPrPresDurationDia.h @@ -24,7 +24,7 @@ #include class KPrDocument; -class KListView; +class TDEListView; class TQLabel; class KPrPresDurationDia : public KDialogBase @@ -43,7 +43,7 @@ protected: private: KPrDocument *doc; - KListView *slides; + TDEListView *slides; TQLabel *label; TQStringList m_durationListString; diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 715bdf02..29d56561 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -89,11 +89,11 @@ private: }; -class OutlineSlideItem: public KListViewItem +class OutlineSlideItem: public TDEListViewItem { public: - OutlineSlideItem( KListView * parent, KPrPage* page, bool _masterPage ); - OutlineSlideItem( KListView * parent, OutlineSlideItem *after, KPrPage* page, bool _masterPage ); + OutlineSlideItem( TDEListView * parent, KPrPage* page, bool _masterPage ); + OutlineSlideItem( TDEListView * parent, OutlineSlideItem *after, KPrPage* page, bool _masterPage ); KPrPage* page() const { return m_page; } @@ -107,7 +107,7 @@ private: bool m_masterPage; }; -class OutlineObjectItem: public KListViewItem +class OutlineObjectItem: public TDEListViewItem { public: OutlineObjectItem( OutlineSlideItem * parent, KPrObject* object, @@ -577,16 +577,16 @@ void KPrThumbBar::slotRefreshItems() refreshItems(); } -OutlineSlideItem::OutlineSlideItem( KListView* parent, KPrPage* _page, bool _masterPage ) - : KListViewItem( parent ), m_page( _page ), m_masterPage( _masterPage ) +OutlineSlideItem::OutlineSlideItem( TDEListView* parent, KPrPage* _page, bool _masterPage ) + : TDEListViewItem( parent ), m_page( _page ), m_masterPage( _masterPage ) { setDragEnabled(true); setPage( _page ); setPixmap( 0, KPBarIcon( "slide" ) ); } -OutlineSlideItem::OutlineSlideItem( KListView* parent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage ) - : KListViewItem( parent, after ), m_page( _page ), m_masterPage( _masterPage ) +OutlineSlideItem::OutlineSlideItem( TDEListView* parent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage ) + : TDEListViewItem( parent, after ), m_page( _page ), m_masterPage( _masterPage ) { setDragEnabled(true); setPage( _page ); @@ -678,7 +678,7 @@ void OutlineSlideItem::updateTitle() OutlineObjectItem::OutlineObjectItem( OutlineSlideItem* parent, KPrObject* _object, const TQString& name ) - : KListViewItem( parent ), m_object( _object ) + : TDEListViewItem( parent ), m_object( _object ) { setObject( m_object ); setDragEnabled( false ); @@ -756,7 +756,7 @@ void OutlineObjectItem::setObject( KPrObject* object ) } KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ) - : KListView( parent ), KPrSideBarBase( d, v) + : TDEListView( parent ), KPrSideBarBase( d, v) { rebuildItems(); setSorting( -1 ); @@ -767,8 +767,8 @@ KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ) connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint&) ) ); + connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint&) ) ); connect( this, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), this, TQT_SLOT(renamePageTitle())); @@ -883,7 +883,7 @@ void KPrOutline::moveItem( int oldPos, int newPos ) item->updateTitle(); } - KListView::moveItem( itemToMove, 0, itemAfter ); + TDEListView::moveItem( itemToMove, 0, itemAfter ); } void KPrOutline::removeItem( int pos ) @@ -954,7 +954,7 @@ void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *parent, TQL if ( parent ) return; - // This code is taken from KListView + // This code is taken from TDEListView for (TQListViewItem *i = firstChild(), *iNext = 0; i != 0; i = iNext) { iNext = i->itemBelow(); @@ -1000,7 +1000,7 @@ void KPrOutline::setCurrentPage( int pg ) void KPrOutline::contentsDropEvent( TQDropEvent *e ) { disconnect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - KListView::contentsDropEvent( e ); + TDEListView::contentsDropEvent( e ); connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); } @@ -1058,7 +1058,7 @@ void KPrOutline::rightButtonPressed( TQListViewItem *, const TQPoint &pnt, int ) } } -void KPrOutline::slotContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ) +void KPrOutline::slotContextMenu( TDEListView*, TQListViewItem* item, const TQPoint& p ) { rightButtonPressed( item, p, 0 ); } @@ -1105,7 +1105,7 @@ TQDragObject* KPrOutline::dragObject() return 0; } - return KListView::dragObject(); + return TDEListView::dragObject(); } #include "KPrSideBar.moc" diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index 161ae88b..542e8c39 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -100,7 +100,7 @@ private: int m_offsetY; }; -class KPrOutline: public KListView, public KPrSideBarBase +class KPrOutline: public TDEListView, public KPrSideBarBase { Q_OBJECT @@ -109,7 +109,7 @@ public: KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ); ~KPrOutline(); void setCurrentPage( int pg ); - TQSize sizeHint() const { return TQSize( 145, KListView::sizeHint().height() ); } + TQSize sizeHint() const { return TQSize( 145, TDEListView::sizeHint().height() ); } void updateItem( int pagenr, bool sticky = false); void addItem( int pos ); void moveItem( int oldPos, int newPos ); @@ -136,7 +136,7 @@ private slots: void itemClicked( TQListViewItem *i ); void slotDropped( TQDropEvent *e, TQListViewItem *parent, TQListViewItem *target ); void rightButtonPressed( TQListViewItem *i, const TQPoint &pnt, int c ); - void slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &p ); + void slotContextMenu( TDEListView*, TQListViewItem *item, const TQPoint &p ); private: TQListViewItem *m_movedItem, *m_movedAfter; diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 6ae9bec0..d0782541 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -2211,14 +2211,14 @@ void KPrTextView::mouseReleaseEvent( TQMouseEvent *, const TQPoint & ) handleMouseReleaseEvent(); } -void KPrTextView::showPopup( KPrView *view, const TQPoint &point, TQPtrList& actionList ) +void KPrTextView::showPopup( KPrView *view, const TQPoint &point, TQPtrList& actionList ) { TQString word = wordUnderCursor( *cursor() ); view->unplugActionList( "datatools" ); view->unplugActionList( "datatools_link" ); view->unplugActionList( "spell_result_action" ); view->unplugActionList( "variable_action" ); - TQPtrList &variableList = view->variableActionList(); + TQPtrList &variableList = view->variableActionList(); variableList.clear(); actionList.clear(); @@ -2259,7 +2259,7 @@ void KPrTextView::showPopup( KPrView *view, const TQPoint &point, TQPtrList actionCheckSpellList =view->listOfResultOfCheckWord( word ); + TQPtrList actionCheckSpellList =view->listOfResultOfCheckWord( word ); if ( actionCheckSpellList.count()>0) { view->plugActionList( "spell_result_action", actionCheckSpellList ); diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index d843bdb3..8f164d73 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -258,7 +258,7 @@ public: virtual void drawCursor( bool b ); const KoParagLayout & currentParagLayout() const { return m_paragLayout; } - void showPopup( KPrView *view, const TQPoint &point, TQPtrList &actionList ); + void showPopup( KPrView *view, const TQPoint &point, TQPtrList &actionList ); void insertVariable( int type, int subtype = 0 ); void insertCustomVariable( const TQString &name); void insertLink(const TQString &_linkName, const TQString & hrefName); @@ -307,7 +307,7 @@ protected: KPrTextObject *m_kptextobj; KPrCanvas *m_canvas; KoParagLayout m_paragLayout; - TQPtrList m_actionList; // for the kodatatools + TQPtrList m_actionList; // for the kodatatools }; diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index d6407823..ee68f7a5 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -2323,18 +2323,18 @@ void KPrView::setupActions() actionEditPaste, TQT_SLOT( setEnabled( bool ) ) ); m_pKPresenterDoc->clipboardDataChanged(); // set paste's initial state - actionEditDelete = new KAction( i18n( "&Delete" ), "editdelete", CTRL + TQt::Key_Delete, + actionEditDelete = new TDEAction( i18n( "&Delete" ), "editdelete", CTRL + TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( editDelete() ), actionCollection(), "edit_delete" ); actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); actionEditDeSelectAll= KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); - actionEditCopyPage = new KAction( i18n( "Copy Slide" ), "editcopy", + actionEditCopyPage = new TDEAction( i18n( "Copy Slide" ), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( editCopyPage() ), actionCollection(), "edit_copypage" ); - actionEditDuplicatePage = new KAction( i18n( "Duplicate Slide" ), "newslide", + actionEditDuplicatePage = new TDEAction( i18n( "Duplicate Slide" ), "newslide", 0, TQT_TQOBJECT(this), TQT_SLOT( editDuplicatePage() ), actionCollection(), "edit_duplicatepage" ); - actionEditDelPage = new KAction( i18n( "Delete Slide" ), "delslide", 0, + actionEditDelPage = new TDEAction( i18n( "Delete Slide" ), "delslide", 0, TQT_TQOBJECT(this), TQT_SLOT( editDelPage() ), actionCollection(), "edit_delpage" ); @@ -2347,108 +2347,108 @@ void KPrView::setupActions() if ( !m_pKPresenterDoc->isEmbedded() ) { - actionViewShowSideBar = new KToggleAction( i18n("Show Sidebar"), 0, + actionViewShowSideBar = new TDEToggleAction( i18n("Show Sidebar"), 0, TQT_TQOBJECT(this), TQT_SLOT( viewShowSideBar() ), actionCollection(), "view_showsidebar" ); actionViewShowSideBar->setCheckedState(i18n("Hide Sidebar")); - actionViewShowNoteBar = new KToggleAction( i18n("Show Notebar"), 0, + actionViewShowNoteBar = new TDEToggleAction( i18n("Show Notebar"), 0, TQT_TQOBJECT(this), TQT_SLOT( viewShowNoteBar() ), actionCollection(), "view_shownotebar" ); actionViewShowNoteBar->setCheckedState(i18n("Hide Notebar")); } - actionViewFormattingChars = new KToggleAction( i18n( "&Formatting Characters" ), 0, + actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.

    When this is enabled, KPresenter shows you tabs, spaces, carriage returns and other non-printing characters." ) ); - actionViewSlideMaster = new KToggleAction( i18n( "Slide &Master" ), 0, + actionViewSlideMaster = new TDEToggleAction( i18n( "Slide &Master" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewSlideMaster() ), actionCollection(), "view_master" ); - actionViewShowGuideLine= new KToggleAction( i18n( "Guide Lines" ), 0, + actionViewShowGuideLine= new TDEToggleAction( i18n( "Guide Lines" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); - actionViewShowGrid = new KToggleAction( i18n( "Show &Grid" ), 0, + actionViewShowGrid = new TDEToggleAction( i18n( "Show &Grid" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGrid() ), actionCollection(), "view_grid" ); actionViewShowGrid->setCheckedState(i18n("Hide &Grid")); - actionViewSnapToGrid= new KToggleAction( i18n( "Snap to Grid" ), 0, + actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, TQT_TQOBJECT(this), TQT_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); // ---------------- insert actions - actionInsertPage = new KAction( i18n( "&Slide..." ), "slide", TQt::Key_F2, + actionInsertPage = new TDEAction( i18n( "&Slide..." ), "slide", TQt::Key_F2, TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), actionCollection(), "insert_page" ); - new KAction( i18n( "Insert &Slide..." ), "newslide", 0, + new TDEAction( i18n( "Insert &Slide..." ), "newslide", 0, TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), actionCollection(), "insert_page_popup" ); - actionInsertPicture = new KAction( i18n( "P&icture..." ), "frame_image", TQt::SHIFT+TQt::Key_F5, + actionInsertPicture = new TDEAction( i18n( "P&icture..." ), "frame_image", TQt::SHIFT+TQt::Key_F5, TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); // ----------------- tools actions - actionToolsMouse = new KToggleAction( i18n( "Select" ), "select", 0, + actionToolsMouse = new TDEToggleAction( i18n( "Select" ), "select", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsMouse() ), actionCollection(), "tools_mouse" ); actionToolsMouse->setExclusiveGroup( "tools" ); actionToolsMouse->setChecked( true ); - actionToolsRotate = new KToggleAction( i18n( "&Rotate" ), "rotate", 0, + actionToolsRotate = new TDEToggleAction( i18n( "&Rotate" ), "rotate", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsRotate() ), actionCollection(), "tools_rotate" ); actionToolsRotate->setExclusiveGroup( "tools" ); - actionToolsZoom = new KToggleAction( i18n( "&Zoom" ), "viewmag", 0, + actionToolsZoom = new TDEToggleAction( i18n( "&Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsZoom() ), actionCollection(), "tools_zoom" ); actionToolsZoom->setExclusiveGroup( "tools" ); - actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle", + actionToolsShapePopup = new TDEActionMenu( i18n( "&Shape" ), "rectangle", actionCollection(), "tools_shapepopup" ); actionToolsShapePopup->setDelayed(true); connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup())); - actionToolsRectangle = new KToggleAction( i18n( "&Rectangle" ), "rectangle", + actionToolsRectangle = new TDEToggleAction( i18n( "&Rectangle" ), "rectangle", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsRectangle() ), actionCollection(), "tools_rectangle" ); actionToolsRectangle->setExclusiveGroup( "tools" ); - actionToolsCircleOrEllipse = new KToggleAction( i18n( "&Circle/Ellipse" ), "circle", + actionToolsCircleOrEllipse = new TDEToggleAction( i18n( "&Circle/Ellipse" ), "circle", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsCircleOrEllipse() ), actionCollection(), "tools_circle" ); actionToolsCircleOrEllipse->setExclusiveGroup( "tools" ); - actionToolsPie = new KToggleAction( i18n( "&Pie/Arc/Chord" ), "pie", 0, + actionToolsPie = new TDEToggleAction( i18n( "&Pie/Arc/Chord" ), "pie", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsPie() ), actionCollection(), "tools_pie" ); actionToolsPie->setExclusiveGroup( "tools" ); - actionToolsText = new KToggleAction( i18n( "&Text" ), "frame_text", TQt::Key_F10, // same shortcut as KWord + actionToolsText = new TDEToggleAction( i18n( "&Text" ), "frame_text", TQt::Key_F10, // same shortcut as KWord TQT_TQOBJECT(this), TQT_SLOT( toolsText() ), actionCollection(), "tools_text" ); actionToolsText->setExclusiveGroup( "tools" ); - actionToolsAutoform = new KToggleAction( i18n( "&Arrows && Connections" ), "autoform", + actionToolsAutoform = new TDEToggleAction( i18n( "&Arrows && Connections" ), "autoform", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsAutoform() ), actionCollection(), "tools_autoform" ); actionToolsAutoform->setExclusiveGroup( "tools" ); - actionToolsDiagramm = new KToggleAction( i18n( "&Chart" ), "frame_chart", 0, + actionToolsDiagramm = new TDEToggleAction( i18n( "&Chart" ), "frame_chart", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsDiagramm() ), actionCollection(), "tools_diagramm" ); actionToolsDiagramm->setExclusiveGroup( "tools" ); - actionToolsTable = new KToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", TQt::Key_F5 /*same as kword*/, + actionToolsTable = new TDEToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", TQt::Key_F5 /*same as kword*/, TQT_TQOBJECT(this), TQT_SLOT( toolsTable() ), actionCollection(), "tools_table" ); actionToolsTable->setExclusiveGroup( "tools" ); @@ -2457,137 +2457,137 @@ void KPrView::setupActions() TQT_TQOBJECT(this), TQT_SLOT( toolsObject() ), actionCollection(), "tools_object" ); - actionToolsLinePopup = new KActionMenu( i18n( "&Line" ), "line", + actionToolsLinePopup = new TDEActionMenu( i18n( "&Line" ), "line", actionCollection(), "tools_linepopup" ); actionToolsLinePopup->setDelayed(true); connect(actionToolsLinePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsLinePopup())); - actionToolsLine = new KToggleAction( i18n( "&Line" ), "line", 0, + actionToolsLine = new TDEToggleAction( i18n( "&Line" ), "line", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsLine() ), actionCollection(), "tools_line" ); actionToolsLine->setExclusiveGroup( "tools" ); - actionToolsFreehand = new KToggleAction( i18n( "&Freehand" ), "freehand", 0, + actionToolsFreehand = new TDEToggleAction( i18n( "&Freehand" ), "freehand", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsFreehand() ), actionCollection(), "tools_freehand" ); actionToolsFreehand->setExclusiveGroup( "tools" ); - actionToolsPolyline = new KToggleAction( i18n( "Po&lyline" ), "polyline", 0, + actionToolsPolyline = new TDEToggleAction( i18n( "Po&lyline" ), "polyline", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsPolyline() ), actionCollection(), "tools_polyline" ); actionToolsPolyline->setExclusiveGroup( "tools" ); - actionToolsQuadricBezierCurve = new KToggleAction( i18n( "&Quadric Bezier Curve" ), "quadricbeziercurve", 0, + actionToolsQuadricBezierCurve = new TDEToggleAction( i18n( "&Quadric Bezier Curve" ), "quadricbeziercurve", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsQuadricBezierCurve() ), actionCollection(), "tools_quadricbeziercurve" ); actionToolsQuadricBezierCurve->setExclusiveGroup( "tools" ); - actionToolsCubicBezierCurve = new KToggleAction( i18n( "C&ubic Bezier Curve" ), "cubicbeziercurve", 0, + actionToolsCubicBezierCurve = new TDEToggleAction( i18n( "C&ubic Bezier Curve" ), "cubicbeziercurve", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsCubicBezierCurve() ), actionCollection(), "tools_cubicbeziercurve" ); actionToolsCubicBezierCurve->setExclusiveGroup( "tools" ); - actionToolsConvexOrConcavePolygon = new KToggleAction( i18n( "Co&nvex/Concave Polygon" ), "polygon", 0, + actionToolsConvexOrConcavePolygon = new TDEToggleAction( i18n( "Co&nvex/Concave Polygon" ), "polygon", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsConvexOrConcavePolygon() ), actionCollection(), "tools_polygon" ); actionToolsConvexOrConcavePolygon->setExclusiveGroup( "tools" ); - actionToolsClosedLinePopup = new KActionMenu( i18n( "&Closed Line" ), "closed_freehand", + actionToolsClosedLinePopup = new TDEActionMenu( i18n( "&Closed Line" ), "closed_freehand", actionCollection(), "tools_closed_linepopup" ); actionToolsClosedLinePopup->setDelayed(true); connect(actionToolsClosedLinePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsClosedLinePopup())); - actionToolsClosedFreehand = new KToggleAction( i18n( "Closed &Freehand" ), "closed_freehand", 0, + actionToolsClosedFreehand = new TDEToggleAction( i18n( "Closed &Freehand" ), "closed_freehand", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsClosedFreehand() ), actionCollection(), "tools_closed_freehand" ); actionToolsClosedFreehand->setExclusiveGroup( "tools" ); - actionToolsClosedPolyline = new KToggleAction( i18n( "Closed Po&lyline" ), "closed_polyline", 0, + actionToolsClosedPolyline = new TDEToggleAction( i18n( "Closed Po&lyline" ), "closed_polyline", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsClosedPolyline() ), actionCollection(), "tools_closed_polyline" ); actionToolsClosedPolyline->setExclusiveGroup( "tools" ); - actionToolsClosedQuadricBezierCurve = new KToggleAction( i18n( "Closed &Quadric Bezier Curve" ), "closed_quadricbeziercurve", 0, + actionToolsClosedQuadricBezierCurve = new TDEToggleAction( i18n( "Closed &Quadric Bezier Curve" ), "closed_quadricbeziercurve", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsClosedQuadricBezierCurve() ), actionCollection(), "tools_closed_quadricbeziercurve" ); actionToolsClosedQuadricBezierCurve->setExclusiveGroup( "tools" ); - actionToolsClosedCubicBezierCurve = new KToggleAction( i18n( "Closed C&ubic Bezier Curve" ), "closed_cubicbeziercurve", 0, + actionToolsClosedCubicBezierCurve = new TDEToggleAction( i18n( "Closed C&ubic Bezier Curve" ), "closed_cubicbeziercurve", 0, TQT_TQOBJECT(this), TQT_SLOT( toolsClosedCubicBezierCurve() ), actionCollection(), "tools_closed_cubicbeziercurve" ); actionToolsClosedCubicBezierCurve->setExclusiveGroup( "tools" ); // ----------------- text actions - actionTextFont = new KAction( i18n( "&Font..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( mtextFont() ), + actionTextFont = new TDEAction( i18n( "&Font..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( mtextFont() ), actionCollection(), "text_font" ); - actionTextFontSize = new KFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "text_fontsize" ); + actionTextFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "text_fontsize" ); connect( actionTextFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( sizeSelected( int ) ) ); #ifdef KFONTACTION_HAS_CRITERIA_ARG - actionTextFontFamily = new KFontAction( KFontChooser::SmoothScalableFonts, + actionTextFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, i18n( "Font Family" ), 0, actionCollection(), "text_fontfamily" ); #else - actionTextFontFamily = new KFontAction( i18n( "Font Family" ), 0, + actionTextFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "text_fontfamily" ); #endif connect( actionTextFontFamily , TQT_SIGNAL( activated( const TQString & ) ), TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString & ) ) ); - actionTextBold = new KToggleAction( i18n( "&Bold" ), "text_bold", CTRL + TQt::Key_B, + actionTextBold = new TDEToggleAction( i18n( "&Bold" ), "text_bold", CTRL + TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT( textBold() ), actionCollection(), "text_bold" ); - actionTextItalic = new KToggleAction( i18n( "&Italic" ), "text_italic", CTRL + TQt::Key_I, + actionTextItalic = new TDEToggleAction( i18n( "&Italic" ), "text_italic", CTRL + TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT( textItalic() ), actionCollection(), "text_italic" ); - actionTextUnderline = new KToggleAction( i18n( "&Underline" ), "text_under", CTRL + TQt::Key_U, + actionTextUnderline = new TDEToggleAction( i18n( "&Underline" ), "text_under", CTRL + TQt::Key_U, TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ), actionCollection(), "text_underline" ); - actionFormatStrikeOut = new KToggleAction( i18n( "&Strike Out" ), "text_strike", 0 , + actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "text_strike", 0 , TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); - actionTextColor = new TKSelectColorAction( i18n( "&Color..." ), TKSelectColorAction::TextColor, + actionTextColor = new TTDESelectColorAction( i18n( "&Color..." ), TTDESelectColorAction::TextColor, actionCollection(), "text_color" ,true); connect( actionTextColor, TQT_SIGNAL( activated() ), TQT_SLOT( textColor() ) ); actionTextColor->setDefaultColor(TQColor()); - actionTextAlignLeft = new KToggleAction( i18n( "Align &Left" ), "text_left", ALT + TQt::Key_L, + actionTextAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "text_left", ALT + TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), actionCollection(), "text_alignleft" ); actionTextAlignLeft->setExclusiveGroup( "align" ); actionTextAlignLeft->setChecked( true ); - actionTextAlignCenter = new KToggleAction( i18n( "Align &Center" ), "text_center", ALT + TQt::Key_C, + actionTextAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", ALT + TQt::Key_C, TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), actionCollection(), "text_aligncenter" ); actionTextAlignCenter->setExclusiveGroup( "align" ); - actionTextAlignRight = new KToggleAction( i18n( "Align &Right" ), "text_right", ALT + TQt::Key_R, + actionTextAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "text_right", ALT + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), actionCollection(), "text_alignright" ); actionTextAlignRight->setExclusiveGroup( "align" ); - actionTextAlignBlock = new KToggleAction( i18n( "Align &Block" ), "text_block", CTRL + TQt::Key_J, + actionTextAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", CTRL + TQt::Key_J, TQT_TQOBJECT(this), TQT_SLOT( textAlignBlock() ), actionCollection(), "text_alignblock" ); actionTextAlignBlock->setExclusiveGroup( "align" ); - actionFormatNumber = new KActionMenu( i18n( "Number" ), "enumList", actionCollection(), "format_number" ); + actionFormatNumber = new TDEActionMenu( i18n( "Number" ), "enumList", actionCollection(), "format_number" ); actionFormatNumber->setDelayed( false ); - actionFormatBullet = new KActionMenu( i18n( "Bullet" ), "unsortedList", actionCollection(), "format_bullet" ); + actionFormatBullet = new TDEActionMenu( i18n( "Bullet" ), "unsortedList", actionCollection(), "format_bullet" ); actionFormatBullet->setDelayed( false ); TQPtrList stylesList; KoCounterStyleWidget::makeCounterRepresenterList( stylesList ); @@ -2595,7 +2595,7 @@ void KPrView::setupActions() for ( ; styleIt.current() ; ++styleIt ) { // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu - KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ + TDEToggleAction* act = new TDEToggleAction( styleIt.current()->name(), /*TODO icon,*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); @@ -2608,140 +2608,140 @@ void KPrView::setupActions() else actionFormatNumber->insert( act ); } - actionTextDepthPlus = new KAction( i18n( "&Increase Depth" ), TQApplication::reverseLayout() ?"format_decreaseindent" : "format_increaseindent", + actionTextDepthPlus = new TDEAction( i18n( "&Increase Depth" ), TQApplication::reverseLayout() ?"format_decreaseindent" : "format_increaseindent", CTRL + TQt::Key_Plus, TQT_TQOBJECT(this), TQT_SLOT( textDepthPlus() ), actionCollection(), "text_depthPlus" ); - actionTextDepthMinus = new KAction( i18n( "&Decrease Depth" ), TQApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", + actionTextDepthMinus = new TDEAction( i18n( "&Decrease Depth" ), TQApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", CTRL + TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( textDepthMinus() ), actionCollection(), "text_depthMinus" ); - actionTextExtentCont2Height = new KAction( i18n( "Extend Contents to Object &Height" ), 0, + actionTextExtentCont2Height = new TDEAction( i18n( "Extend Contents to Object &Height" ), 0, TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), actionCollection(), "text_con2hei" ); - actionTextExtendObj2Cont = new KAction( i18n( "&Extend Object to Fit Contents" ), 0, + actionTextExtendObj2Cont = new TDEAction( i18n( "&Extend Object to Fit Contents" ), 0, TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), actionCollection(), "text_obj2cont" ); - actionTextInsertPageNum = new KAction( i18n( "&Insert Slide Number" ), "pgnum", 0, + actionTextInsertPageNum = new TDEAction( i18n( "&Insert Slide Number" ), "pgnum", 0, TQT_TQOBJECT(this), TQT_SLOT( textInsertPageNum() ), actionCollection(), "text_inspgnum" ); // ----------------- format actions - actionExtraProperties = new KAction( i18n( "&Properties" ), "penbrush", 0, + actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, TQT_TQOBJECT(this), TQT_SLOT( extraProperties() ), actionCollection(), "extra_properties" ); - actionExtraArrangePopup = new KActionMenu( i18n( "Arra&nge Objects" ), "arrange", + actionExtraArrangePopup = new TDEActionMenu( i18n( "Arra&nge Objects" ), "arrange", actionCollection(), "extra_arrangepopup" ); actionExtraArrangePopup->setDelayed( false ); - actionExtraRaise = new KAction( i18n( "Ra&ise Objects" ), "raise", + actionExtraRaise = new TDEAction( i18n( "Ra&ise Objects" ), "raise", CTRL+TQt::SHIFT+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT( extraRaise() ), actionCollection(), "extra_raise" ); - actionExtraLower = new KAction( i18n( "&Lower Objects" ), "lower", CTRL +TQt::SHIFT+ TQt::Key_L, + actionExtraLower = new TDEAction( i18n( "&Lower Objects" ), "lower", CTRL +TQt::SHIFT+ TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT( extraLower() ), actionCollection(), "extra_lower" ); - actionExtraBringForward= new KAction( i18n( "Bring to Front" ), "bring_forward", + actionExtraBringForward= new TDEAction( i18n( "Bring to Front" ), "bring_forward", 0, TQT_TQOBJECT(this), TQT_SLOT( extraBringForward() ), actionCollection(), "extra_bring_forward" ); - actionExtraSendBackward= new KAction( i18n( "Send to Back" ), "send_backward", + actionExtraSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", 0, TQT_TQOBJECT(this), TQT_SLOT( extraSendBackward() ), actionCollection(), "extra_send_backward" ); - actionExtraRotate = new KAction( i18n( "R&otate Objects..." ), "rotate_cw", 0, + actionExtraRotate = new TDEAction( i18n( "R&otate Objects..." ), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT( extraRotate() ), actionCollection(), "extra_rotate" ); - actionExtraShadow = new KAction( i18n( "&Shadow Objects..." ), "shadow", 0, + actionExtraShadow = new TDEAction( i18n( "&Shadow Objects..." ), "shadow", 0, TQT_TQOBJECT(this), TQT_SLOT( extraShadow() ), actionCollection(), "extra_shadow" ); - actionExtraAlignObjLeft = new KAction( i18n( "Align &Left" ), "aoleft", 0, + actionExtraAlignObjLeft = new TDEAction( i18n( "Align &Left" ), "aoleft", 0, TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjLeft() ), actionCollection(), "extra_alignleft" ); - actionExtraAlignObjCenterH = new KAction( i18n( "Align Center (&horizontally)" ), + actionExtraAlignObjCenterH = new TDEAction( i18n( "Align Center (&horizontally)" ), "aocenterh", 0, TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterH() ), actionCollection(), "extra_aligncenterh" ); - actionExtraAlignObjRight = new KAction( i18n( "Align &Right" ), "aoright", 0, + actionExtraAlignObjRight = new TDEAction( i18n( "Align &Right" ), "aoright", 0, TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjRight() ), actionCollection(), "extra_alignright" ); - actionExtraAlignObjTop = new KAction( i18n( "Align &Top" ), "aotop", 0, + actionExtraAlignObjTop = new TDEAction( i18n( "Align &Top" ), "aotop", 0, TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjTop() ), actionCollection(), "extra_aligntop" ); - actionExtraAlignObjCenterV = new KAction( i18n( "Align Center (&vertically)" ), + actionExtraAlignObjCenterV = new TDEAction( i18n( "Align Center (&vertically)" ), "aocenterv", 0, TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterV() ), actionCollection(), "extra_aligncenterv" ); - actionExtraAlignObjBottom = new KAction( i18n( "Align &Bottom" ), "aobottom", 0, + actionExtraAlignObjBottom = new TDEAction( i18n( "Align &Bottom" ), "aobottom", 0, TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjBottom() ), actionCollection(), "extra_alignbottom" ); - actionExtraBackground = new KAction( i18n( "Slide Bac&kground..." ), "background", 0, + actionExtraBackground = new TDEAction( i18n( "Slide Bac&kground..." ), "background", 0, TQT_TQOBJECT(this), TQT_SLOT( extraBackground() ), actionCollection(), "extra_background" ); - actionExtraLayout = new KAction( i18n( "Page &Layout..." ), 0, + actionExtraLayout = new TDEAction( i18n( "Page &Layout..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraLayout() ), actionCollection(), "extra_layout" ); - m_actionExtraHeader = new KToggleAction( i18n( "Enable Document &Header" ), 0, + m_actionExtraHeader = new TDEToggleAction( i18n( "Enable Document &Header" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewHeader() ), actionCollection(), "extra_header" ); m_actionExtraHeader->setCheckedState( i18n( "Disable Document &Header" ) ); m_actionExtraHeader->setToolTip( i18n( "Shows and hides header display for the current slide." ) ); - m_actionExtraFooter = new KToggleAction( i18n( "Enable Document Foo&ter" ), 0, + m_actionExtraFooter = new TDEToggleAction( i18n( "Enable Document Foo&ter" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewFooter() ), actionCollection(), "extra_footer" ); m_actionExtraFooter->setCheckedState( i18n( "Disable Document Foo&ter" ) ); m_actionExtraFooter->setToolTip( i18n( "Shows and hides footer display for the current slide." ) ); - actionExtraConfigure = new KAction( i18n( "Configure KPresenter..." ), + actionExtraConfigure = new TDEAction( i18n( "Configure KPresenter..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( extraConfigure() ), actionCollection(), "extra_configure" ); - actionExtraWebPres = new KAction( i18n( "Create &HTML Slideshow..." ), + actionExtraWebPres = new TDEAction( i18n( "Create &HTML Slideshow..." ), "webpres", 0, TQT_TQOBJECT(this), TQT_SLOT( extraWebPres() ), actionCollection(), "extra_webpres" ); - actionExtraMSPres = new KAction( i18n( "Create Memor&y Stick Slideshow..." ), + actionExtraMSPres = new TDEAction( i18n( "Create Memor&y Stick Slideshow..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraMSPres() ), actionCollection(), "extra_mspres" ); - actionExtraCreateTemplate = new KAction( i18n( "Template Manager" ), 0, + actionExtraCreateTemplate = new TDEAction( i18n( "Template Manager" ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); - actionExtraDefaultTemplate = new KAction( i18n( "Use Current Slide as Default Template" ), 0, + actionExtraDefaultTemplate = new TDEAction( i18n( "Use Current Slide as Default Template" ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraDefaultTemplate() ), actionCollection(), "extra_defaulttemplate" ); - actionExtraAlignObjsPopup = new KActionMenu( i18n("Align O&bjects"), "alignobjs", + actionExtraAlignObjsPopup = new TDEActionMenu( i18n("Align O&bjects"), "alignobjs", actionCollection(), "extra_alignobjs" ); actionExtraAlignObjsPopup->setDelayed( false ); - actionExtraLineBegin = new KAction( i18n("Line Begin"), "line_begin", 0, + actionExtraLineBegin = new TDEAction( i18n("Line Begin"), "line_begin", 0, TQT_TQOBJECT(this), TQT_SLOT( extraLineBegin() ), actionCollection(), "extra_linebegin" ); - actionExtraLineEnd = new KAction( i18n("Line End"), "line_end", 0, + actionExtraLineEnd = new TDEAction( i18n("Line End"), "line_end", 0, TQT_TQOBJECT(this), TQT_SLOT( extraLineEnd() ), actionCollection(), "extra_lineend" ); @@ -2758,138 +2758,138 @@ void KPrView::setupActions() connect( kPresenterDoc(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), actionExtraPenWidth, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); - actionExtraGroup = new KAction( i18n( "&Group Objects" ), "group", + actionExtraGroup = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), TQT_TQOBJECT(this), TQT_SLOT( extraGroup() ), actionCollection(), "extra_group" ); - actionExtraUnGroup = new KAction( i18n( "&Ungroup Objects" ), "ungroup", + actionExtraUnGroup = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), TQT_TQOBJECT(this), TQT_SLOT( extraUnGroup() ), actionCollection(), "extra_ungroup" ); // ----------------- slideshow actions - actionScreenConfigPages = new KAction( i18n( "&Configure Slide Show..." ), + actionScreenConfigPages = new TDEAction( i18n( "&Configure Slide Show..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( screenConfigPages() ), actionCollection(), "screen_configpages" ); - actionScreenAssignEffect = new KAction( i18n( "Edit &Object Effect..." ), + actionScreenAssignEffect = new TDEAction( i18n( "Edit &Object Effect..." ), "effect", 0, TQT_TQOBJECT(this), TQT_SLOT( screenAssignEffect() ), actionCollection(), "screen_assigneffect"); - actionScreenTransEffect = new KAction( i18n( "Edit Slide &Transition..." ), + actionScreenTransEffect = new TDEAction( i18n( "Edit Slide &Transition..." ), "slide_effect", 0, TQT_TQOBJECT(this), TQT_SLOT( screenTransEffect() ), actionCollection(), "screen_transeffect"); - actionScreenStart = new KAction( i18n( "&Start" ), + actionScreenStart = new TDEAction( i18n( "&Start" ), "2rightarrow", TQt::Key_F12, TQT_TQOBJECT(this), TQT_SLOT( screenStart() ), actionCollection(), "screen_start" ); - actionScreenStartFromFirst = new KAction( i18n( "Start From &First Slide" ), + actionScreenStartFromFirst = new TDEAction( i18n( "Start From &First Slide" ), "1rightarrow", 0, TQT_TQOBJECT(this), TQT_SLOT( screenStartFromFirst() ), actionCollection(), "screen_startfromfirst" ); - actionScreenFirst = new KAction( i18n( "&Go to Start" ), + actionScreenFirst = new TDEAction( i18n( "&Go to Start" ), "start", 0, TQT_TQOBJECT(this), TQT_SLOT( screenFirst() ), actionCollection(), "screen_first" ); - actionScreenPrev = new KAction( i18n( "&Previous Slide" ), + actionScreenPrev = new TDEAction( i18n( "&Previous Slide" ), "back", TQt::Key_Prior, TQT_TQOBJECT(this), TQT_SLOT( screenPrev() ), actionCollection(), "screen_prev" ); - actionScreenNext = new KAction( i18n( "&Next Slide" ), + actionScreenNext = new TDEAction( i18n( "&Next Slide" ), "forward", TQt::Key_Next, TQT_TQOBJECT(this), TQT_SLOT( screenNext() ), actionCollection(), "screen_next" ); - actionScreenLast = new KAction( i18n( "Go to &End" ), + actionScreenLast = new TDEAction( i18n( "Go to &End" ), "finish", 0, TQT_TQOBJECT(this), TQT_SLOT( screenLast() ), actionCollection(), "screen_last" ); - actionScreenSkip = new KAction( i18n( "Goto &Slide..." ), + actionScreenSkip = new TDEAction( i18n( "Goto &Slide..." ), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT( screenSkip() ), actionCollection(), "screen_skip" ); // ----------------- colorbar(Brush and Pen) action - actionBrushColor = new TKSelectColorAction( i18n( "Fill Color..." ), TKSelectColorAction::FillColor, + actionBrushColor = new TTDESelectColorAction( i18n( "Fill Color..." ), TTDESelectColorAction::FillColor, actionCollection(), "brush_color" ,true); connect( actionBrushColor, TQT_SIGNAL( activated() ), TQT_SLOT( brushChosen() ) ); actionBrushColor->setDefaultColor(TQColor()); - actionPenColor = new TKSelectColorAction( i18n( "Outline Color..." ), TKSelectColorAction::LineColor, + actionPenColor = new TTDESelectColorAction( i18n( "Outline Color..." ), TTDESelectColorAction::LineColor, actionCollection(), "pen_color" ); connect( actionPenColor, TQT_SIGNAL( activated() ), TQT_SLOT( penChosen() ) ); actionPenColor->setDefaultColor(TQColor()); - actionExtendObjectHeight = new KAction( i18n( "&Extend Contents to Object Height" ),0, TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), + actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), actionCollection(), "extendobjectheight" ); - actionResizeTextObject = new KAction( i18n( "&Resize Object to Fit Contents" ),0, TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), + actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), actionCollection(), "resizetextobject" ); - actionRenamePage=new KAction(i18n( "&Rename Slide..." ),0,TQT_TQOBJECT(this), + actionRenamePage=new TDEAction(i18n( "&Rename Slide..." ),0,TQT_TQOBJECT(this), TQT_SLOT( renamePageTitle() ), actionCollection(), "rename_page" ); - actionPicOriginalSize = new KAction( i18n( "Sca&le to Original Size" ), 0, TQT_TQOBJECT(this), + actionPicOriginalSize = new TDEAction( i18n( "Sca&le to Original Size" ), 0, TQT_TQOBJECT(this), TQT_SLOT( picViewOriginalSize() ), actionCollection(), "pic_original_size" ); - actionPic640x480=new KAction(i18n( "640x480" ),0,TQT_TQOBJECT(this), + actionPic640x480=new TDEAction(i18n( "640x480" ),0,TQT_TQOBJECT(this), TQT_SLOT( picViewOrig640x480() ), actionCollection(), "pic_640_480" ); - actionPic800x600=new KAction(i18n( "800x600" ),0,TQT_TQOBJECT(this), + actionPic800x600=new TDEAction(i18n( "800x600" ),0,TQT_TQOBJECT(this), TQT_SLOT( picViewOrig800x600() ), actionCollection(), "pic_800_600" ); - actionPic1024x768=new KAction(i18n( "1024x768" ),0,TQT_TQOBJECT(this), + actionPic1024x768=new TDEAction(i18n( "1024x768" ),0,TQT_TQOBJECT(this), TQT_SLOT( picViewOrig1024x768() ), actionCollection(), "pic_1024_768" ); - actionPic1280x1024=new KAction(i18n( "1280x1024" ),0,TQT_TQOBJECT(this), + actionPic1280x1024=new TDEAction(i18n( "1280x1024" ),0,TQT_TQOBJECT(this), TQT_SLOT( picViewOrig1280x1024() ), actionCollection(), "pic_1280_1024" ); - actionPic1600x1200=new KAction(i18n( "1600x1200" ),0,TQT_TQOBJECT(this), + actionPic1600x1200=new TDEAction(i18n( "1600x1200" ),0,TQT_TQOBJECT(this), TQT_SLOT( picViewOrig1600x1200() ), actionCollection(), "pic_1600_1200" ); - actionChangePic=new KAction( i18n( "&Change Picture..." ),"frame_image",0,TQT_TQOBJECT(this), + actionChangePic=new TDEAction( i18n( "&Change Picture..." ),"frame_image",0,TQT_TQOBJECT(this), TQT_SLOT( chPic() ), actionCollection(), "change_picture" ); - actionImageEffect = new KAction( i18n("Image &Effect..."), 0, TQT_TQOBJECT(this), + actionImageEffect = new TDEAction( i18n("Image &Effect..."), 0, TQT_TQOBJECT(this), TQT_SLOT(imageEffect()), actionCollection(), "image_effect"); - actionFormatSuper = new KToggleAction( i18n( "Superscript" ), "super", 0, + actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), actionCollection(), "format_super" ); actionFormatSuper->setExclusiveGroup( "valign" ); - actionFormatSub = new KToggleAction( i18n( "Subscript" ), "sub", 0, + actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), actionCollection(), "format_sub" ); actionFormatSub->setExclusiveGroup( "valign" ); - actionInsertSpecialChar = new KAction( i18n( "Sp&ecial Character..." ), "char", + actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", ALT + TQt::SHIFT + TQt::Key_C, TQT_TQOBJECT(this), TQT_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); - actionInsertLink = new KAction( i18n( "Link..." ), 0, + actionInsertLink = new TDEAction( i18n( "Link..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertLink() ), actionCollection(), "insert_link" ); @@ -2899,58 +2899,58 @@ void KPrView::setupActions() picResizeMenu->insertSeparator(); picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), TQT_TQOBJECT(this), TQT_SLOT( picViewOrigFactor() ) ); #endif - (void) new KAction( i18n( "Configure &Autocorrection..." ), 0, + (void) new TDEAction( i18n( "Configure &Autocorrection..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraAutoFormat() ), actionCollection(), "extra_autocorrection" ); actionExtraSpellCheck = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); - actionFormatParag = new KAction( i18n( "&Paragraph..." ), ALT + CTRL + TQt::Key_P, + actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), ALT + CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); - actionFormatDefault=new KAction( i18n( "Default Format" ), 0, + actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, TQT_TQOBJECT(this), TQT_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); - actionOpenLink = new KAction( i18n( "Open Link" ), 0, + actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, TQT_TQOBJECT(this), TQT_SLOT( openLink() ), actionCollection(), "open_link" ); - actionChangeLink=new KAction( i18n("Change Link..."), 0, + actionChangeLink=new TDEAction( i18n("Change Link..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changeLink()), actionCollection(), "change_link"); - actionCopyLink = new KAction( i18n( "Copy Link" ), 0, + actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, TQT_TQOBJECT(this), TQT_SLOT( copyLink() ), actionCollection(), "copy_link" ); - actionRemoveLink = new KAction( i18n( "Remove Link" ), 0, + actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeLink() ), actionCollection(), "remove_link" ); - actionAddLinkToBookmak = new KAction( i18n( "Add to Bookmark" ), 0, + actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, TQT_TQOBJECT(this), TQT_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); - actionEditCustomVarsEdit = new KAction( i18n( "&Custom Variables..." ), 0, + actionEditCustomVarsEdit = new TDEAction( i18n( "&Custom Variables..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( editCustomVars() ), actionCollection(), "edit_vars" ); - actionEditCustomVars = new KAction( i18n( "Edit Variable..." ), 0, + actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); m_variableDefMap.clear(); - actionInsertVariable = new KActionMenu( i18n( "&Variable" ), + actionInsertVariable = new TDEActionMenu( i18n( "&Variable" ), actionCollection(), "insert_variable" ); // The last argument is only needed if a submenu is to be created addVariableActions( VT_FIELD, KoFieldVariable::actionTexts(), actionInsertVariable, i18n("&Property") ); addVariableActions( VT_DATE, KoDateVariable::actionTexts(), actionInsertVariable, i18n("&Date") ); addVariableActions( VT_TIME, KoTimeVariable::actionTexts(), actionInsertVariable, i18n("&Time") ); - actionInsertCustom = new KActionMenu( i18n( "&Custom" ), + actionInsertCustom = new TDEActionMenu( i18n( "&Custom" ), actionCollection(), "insert_custom" ); actionInsertVariable->insert(actionInsertCustom); refreshCustomMenu(); @@ -2959,200 +2959,200 @@ void KPrView::setupActions() addVariableActions( VT_STATISTIC, KPrStatisticVariable::actionTexts(), actionInsertVariable, i18n("&Statistic") ); actionInsertVariable->popupMenu()->insertSeparator(); - actionRefreshAllVariable = new KAction( i18n( "&Refresh All Variables" ), 0, + actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, TQT_TQOBJECT(this), TQT_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); actionInsertVariable->insert(actionRefreshAllVariable); - actionIncreaseFontSize = new KAction( i18n("Increase Font Size"),"fontsizeup", 0, + actionIncreaseFontSize = new TDEAction( i18n("Increase Font Size"),"fontsizeup", 0, TQT_TQOBJECT(this), TQT_SLOT( increaseFontSize() ), actionCollection(), "increaseFontSize" ); - actionDecreaseFontSize = new KAction( i18n("Decrease Font Size"),"fontsizedown", 0, + actionDecreaseFontSize = new TDEAction( i18n("Decrease Font Size"),"fontsizedown", 0, TQT_TQOBJECT(this), TQT_SLOT( decreaseFontSize() ), actionCollection(), "decreaseFontSize" ); - actionChangeCase=new KAction( i18n( "Change Case..." ), 0, + actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); - actionViewZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, + actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); connect( actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), TQT_TQOBJECT(this), TQT_SLOT( viewZoom( const TQString & ) ) ); actionViewZoom->setEditable(true); changeZoomMenu( ); - actionFormatStylist = new KAction( i18n( "&Style Manager" ), ALT + CTRL + TQt::Key_S, + actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), ALT + CTRL + TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); - actionFormatStyleMenu = new KActionMenu( i18n( "St&yle" ), 0, + actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, actionCollection(), "format_stylemenu" ); - actionFormatStyle = new KSelectAction( i18n( "St&yle" ), 0, + actionFormatStyle = new TDESelectAction( i18n( "St&yle" ), 0, actionCollection(), "format_style" ); connect( actionFormatStyle, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( textStyleSelected( int ) ) ); actionFormatStyle->setMenuAccelsEnabled( true ); updateStyleList(); - actionAllowAutoFormat = new KToggleAction( i18n( "Enable Autocorrection" ), 0, + actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); // ------------------- Actions with a key binding and no GUI item - new KAction( i18n( "Insert Non-Breaking Space" ), CTRL+TQt::Key_Space, + new TDEAction( i18n( "Insert Non-Breaking Space" ), CTRL+TQt::Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); - new KAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+TQt::SHIFT+TQt::Key_Minus, + new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+TQt::SHIFT+TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); - new KAction( i18n( "Insert Soft Hyphen" ), CTRL+TQt::Key_Minus, + new TDEAction( i18n( "Insert Soft Hyphen" ), CTRL+TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); - new KAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, + new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); - new KAction( i18n( "Completion" ), KStdAccel::shortcut(KStdAccel::TextCompletion), + new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), TQT_TQOBJECT(this), TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); - new KAction( i18n( "Increase Numbering Level" ), ALT+TQt::Key_Right, + new TDEAction( i18n( "Increase Numbering Level" ), ALT+TQt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); - new KAction( i18n( "Decrease Numbering Level" ), ALT+TQt::Key_Left, + new TDEAction( i18n( "Decrease Numbering Level" ), ALT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); - actionInsertComment = new KAction( i18n( "Comment..." ), 0, + actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertComment() ), actionCollection(), "insert_comment" ); - actionEditComment = new KAction( i18n("Edit Comment..."), 0, + actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, TQT_TQOBJECT(this), TQT_SLOT(editComment()), actionCollection(), "edit_comment"); - actionAddGuideLine = new KAction( i18n( "Add Guide Line..."), 0, + actionAddGuideLine = new TDEAction( i18n( "Add Guide Line..."), 0, TQT_TQOBJECT(this), TQT_SLOT( addGuideLine()), actionCollection(), "add_guideline"); - actionRemoveComment = new KAction( i18n("Remove Comment"), 0, + actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, TQT_TQOBJECT(this), TQT_SLOT(removeComment()), actionCollection(), "remove_comment"); - actionCopyTextOfComment = new KAction( i18n("Copy Text of Comment..."), 0, + actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, TQT_TQOBJECT(this), TQT_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); - actionConfigureCompletion = new KAction( i18n( "&Configure Completion..." ), 0, + actionConfigureCompletion = new TDEAction( i18n( "&Configure Completion..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); - actionZoomMinus = new KAction( i18n( "Zoom Out" ), "viewmag-",0, + actionZoomMinus = new TDEAction( i18n( "Zoom Out" ), "viewmag-",0, TQT_TQOBJECT(this), TQT_SLOT( zoomMinus() ), actionCollection(), "zoom_minus" ); - actionZoomPlus = new KAction( i18n( "Zoom In" ), "viewmag+",0, + actionZoomPlus = new TDEAction( i18n( "Zoom In" ), "viewmag+",0, TQT_TQOBJECT(this), TQT_SLOT( zoomPlus() ), actionCollection(), "zoom_plus" ); - actionZoomEntirePage = new KAction( i18n( "Zoom Entire Slide" ), 0, + actionZoomEntirePage = new TDEAction( i18n( "Zoom Entire Slide" ), 0, TQT_TQOBJECT(this), TQT_SLOT( zoomEntirePage() ), actionCollection(), "zoom_entire_page" ); - actionZoomMinus = new KAction( i18n( "Zoom Slide Width" ), 0, + actionZoomMinus = new TDEAction( i18n( "Zoom Slide Width" ), 0, TQT_TQOBJECT(this), TQT_SLOT( zoomPageWidth() ), actionCollection(), "zoom_page_width" ); - actionZoomSelectedObject= new KAction( i18n( "Zoom Selected Objects" ), "viewmagfit",0, + actionZoomSelectedObject= new TDEAction( i18n( "Zoom Selected Objects" ), "viewmagfit",0, TQT_TQOBJECT(this), TQT_SLOT( zoomSelectedObject() ), actionCollection(), "zoom_selected_object" ); - actionZoomPageHeight= new KAction( i18n( "Zoom Slide Height" ), 0, + actionZoomPageHeight= new TDEAction( i18n( "Zoom Slide Height" ), 0, TQT_TQOBJECT(this), TQT_SLOT( zoomPageHeight() ), actionCollection(), "zoom_page_height" ); - actionZoomAllObject= new KAction( i18n( "Zoom All Objects" ), 0, + actionZoomAllObject= new TDEAction( i18n( "Zoom All Objects" ), 0, TQT_TQOBJECT(this), TQT_SLOT( zoomAllObject() ), actionCollection(), "zoom_all_object" ); - actionFlipHorizontal= new KAction( i18n( "Horizontal Flip" ), 0, + actionFlipHorizontal= new TDEAction( i18n( "Horizontal Flip" ), 0, TQT_TQOBJECT(this), TQT_SLOT( flipHorizontal() ), actionCollection(), "horizontal_flip" ); - actionFlipVertical= new KAction( i18n( "Vertical Flip" ), 0, + actionFlipVertical= new TDEAction( i18n( "Vertical Flip" ), 0, TQT_TQOBJECT(this), TQT_SLOT( flipVertical() ), actionCollection(), "vertical_flip" ); - actionDuplicateObj = new KAction( i18n( "Duplicate Object..." ), 0, + actionDuplicateObj = new TDEAction( i18n( "Duplicate Object..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( duplicateObj() ), actionCollection(), "duplicate_obj" ); - actionApplyAutoFormat= new KAction( i18n( "Apply Autocorrection" ), 0, + actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, TQT_TQOBJECT(this), TQT_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); - actionCreateStyleFromSelection = new KAction( i18n( "Create Style From Selection..." ), 0, + actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); - actionCloseObject = new KAction( i18n( "Close Object" ), 0, + actionCloseObject = new TDEAction( i18n( "Close Object" ), 0, TQT_TQOBJECT(this), TQT_SLOT( closeObject()), actionCollection(), "close_object" ); - actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0, + actionAlignVerticalTop = new TDEToggleAction( i18n( "Align Top" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalTop->setChecked( true ); - actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0, + actionAlignVerticalBottom = new TDEToggleAction( i18n( "Align Bottom" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); - actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0, + actionAlignVerticalCenter = new TDEToggleAction( i18n( "Align Middle" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); - actionSavePicture= new KAction( i18n("Save Picture..."), 0, + actionSavePicture= new TDEAction( i18n("Save Picture..."), 0, TQT_TQOBJECT(this), TQT_SLOT( savePicture() ), actionCollection(), "save_picture"); - actionAllowBgSpellCheck = new KToggleAction( i18n( "Autospellcheck" ), 0, + actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, TQT_TQOBJECT(this), TQT_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); - actionInsertFile= new KAction( i18n( "File..." ), 0, + actionInsertFile= new TDEAction( i18n( "File..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertFile() ), actionCollection(), "insert_file" ); - actionImportStyle= new KAction( i18n( "Import Styles..." ), 0, + actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( importStyle() ), actionCollection(), "import_style" ); - actionSaveBackgroundPicture= new KAction( i18n( "Save Background Picture..." ), 0, + actionSaveBackgroundPicture= new TDEAction( i18n( "Save Background Picture..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(backgroundPicture() ), actionCollection(), "save_bgpicture" ); #if 0 - actionInsertDirectCursor = new KToggleAction( i18n( "Type Anywhere Cursor" ), 0, + actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif - actionSpellIgnoreAll = new KAction( i18n( "Ignore All" ), 0, + actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); - actionAddWordToPersonalDictionary=new KAction( i18n( "Add Word to Dictionary" ),0, + actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, TQT_TQOBJECT(this), TQT_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); - actionCustomSlideShow = new KAction( i18n( "Custom Slide Show..." ), 0, + actionCustomSlideShow = new TDEAction( i18n( "Custom Slide Show..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( customSlideShow() ), actionCollection(), "custom_slide_show" ); - actionDisplayObjectFromMasterPage = new KToggleAction( i18n( "Hide Object From Slide Master" ), 0, + actionDisplayObjectFromMasterPage = new TDEToggleAction( i18n( "Hide Object From Slide Master" ), 0, TQT_TQOBJECT(this), TQT_SLOT( displayObjectFromMasterPage() ), actionCollection(), "display_object_from_master_page" ); actionDisplayObjectFromMasterPage->setCheckedState(i18n("Display Object From Slide Master")); - actionDisplayBackgroundPage = new KToggleAction( i18n( "Hide Background" ), 0, + actionDisplayBackgroundPage = new TDEToggleAction( i18n( "Hide Background" ), 0, TQT_TQOBJECT(this), TQT_SLOT( displayBackground() ), actionCollection(), "display_background" ); actionDisplayBackgroundPage->setCheckedState(i18n("Display Background")); @@ -3617,11 +3617,11 @@ void KPrView::doAutomaticScreenPres() void KPrView::updateReadWrite( bool readwrite ) { // First disable or enable everything - TQValueList actions = actionCollection()->actions(); + TQValueList actions = actionCollection()->actions(); // Also grab actions from the document actions += m_pKPresenterDoc->actionCollection()->actions(); - TQValueList::ConstIterator aIt = actions.begin(); - TQValueList::ConstIterator aEnd = actions.end(); + TQValueList::ConstIterator aIt = actions.begin(); + TQValueList::ConstIterator aEnd = actions.end(); for (; aIt != aEnd; ++aIt ) (*aIt)->setEnabled( readwrite ); @@ -4230,8 +4230,8 @@ void KPrView::openPopupMenuMenuPage( const TQPoint & _point ) { if(!koDocument()->isReadWrite() || !factory()) return; - TQPtrList actionList= TQPtrList(); - KActionSeparator *separator=new KActionSeparator(); + TQPtrList actionList= TQPtrList(); + TDEActionSeparator *separator=new TDEActionSeparator(); switch( m_canvas->activePage()->getBackType()) { case BT_COLOR: @@ -4721,7 +4721,7 @@ void KPrView::showCounter( KoParagCounter &c ) TQString styleStr("counterstyle_"); styleStr += TQString::number( c.style() ); //kdDebug(33001) << "KWView::showCounter styleStr=" << styleStr << endl; - KToggleAction* act = static_cast( actionCollection()->action( styleStr.latin1() ) ); + TDEToggleAction* act = static_cast( actionCollection()->action( styleStr.latin1() ) ); Q_ASSERT( act ); if ( act ) act->setChecked( true ); @@ -4819,13 +4819,13 @@ TQPopupMenu * KPrView::popupMenu( const TQString& name ) } void KPrView::addVariableActions( int type, const TQStringList & texts, - KActionMenu * parentMenu, const TQString & menuText ) + TDEActionMenu * parentMenu, const TQString & menuText ) { // Single items go directly into parentMenu. // For multiple items we create a submenu. if ( texts.count() > 1 && !menuText.isEmpty() ) { - KActionMenu * subMenu = new KActionMenu( menuText, actionCollection() ); + TDEActionMenu * subMenu = new TDEActionMenu( menuText, actionCollection() ); parentMenu->insert( subMenu ); parentMenu = subMenu; } @@ -4837,7 +4837,7 @@ void KPrView::addVariableActions( int type, const TQStringList & texts, VariableDef v; v.type = type; v.subtype = i; - KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), actionCollection(), "var-action" ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); @@ -4847,11 +4847,11 @@ void KPrView::addVariableActions( int type, const TQStringList & texts, void KPrView::refreshCustomMenu() { - KActionPtrList lst2 = actionCollection()->actions("custom-variable-action"); - TQValueList actions = lst2; - TQValueList::ConstIterator it2 = lst2.begin(); - TQValueList::ConstIterator end = lst2.end(); - TQMap shortCuts; + TDEActionPtrList lst2 = actionCollection()->actions("custom-variable-action"); + TQValueList actions = lst2; + TQValueList::ConstIterator it2 = lst2.begin(); + TQValueList::ConstIterator end = lst2.end(); + TQMap shortCuts; for (; it2 != end; ++it2 ) { @@ -4860,7 +4860,7 @@ void KPrView::refreshCustomMenu() } delete actionInsertCustom; - actionInsertCustom = new KActionMenu( i18n( "&Custom" ), + actionInsertCustom = new TDEActionMenu( i18n( "&Custom" ), actionCollection(), "insert_custom" ); actionInsertVariable->insert(actionInsertCustom, 0); @@ -4868,7 +4868,7 @@ void KPrView::refreshCustomMenu() actionInsertCustom->popupMenu()->clear(); TQPtrListIterator it( m_pKPresenterDoc->getVariableCollection()->getVariables() ); - KAction * act=0; + TDEAction * act=0; TQStringList lst; TQString varName; int i = 0; @@ -4882,7 +4882,7 @@ void KPrView::refreshCustomMenu() { lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); - act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), + act = new TDEAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); act->setGroup( "custom-variable-action" ); @@ -4895,7 +4895,7 @@ void KPrView::refreshCustomMenu() if(state) actionInsertCustom->popupMenu()->insertSeparator(); - act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), + act = new TDEAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), TQString("custom-action_%1").arg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -4912,7 +4912,7 @@ void KPrView::insertCustomVariable() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( edit ) { - KAction * act = (KAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); edit->insertCustomVariable(act->text()); } } @@ -4992,7 +4992,7 @@ void KPrView::insertVariable() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( edit ) { - KAction * act = (KAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); VariableDefMap::ConstIterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning(33001) << "Action not found in m_variableDefMap." << endl; @@ -5456,22 +5456,22 @@ void KPrView::updateStyleList() // Generate list of styles const TQStringList lst = m_pKPresenterDoc->styleCollection()->displayNameList(); const int pos = lst.findIndex( currentStyle ); - // Fill the combo - using a KSelectAction + // Fill the combo - using a TDESelectAction actionFormatStyle->setItems( lst ); if ( pos > -1 ) actionFormatStyle->setCurrentItem( pos ); - // Fill the menu - using a KActionMenu, so that it's possible to bind keys + // Fill the menu - using a TDEActionMenu, so that it's possible to bind keys // to individual actions TQStringList lstWithAccels; // Generate unique accelerators for the menu items - KAccelGen::generate( lst, lstWithAccels ); - TQMap shortCuts; + TDEAccelGen::generate( lst, lstWithAccels ); + TQMap shortCuts; - KActionPtrList lst2 = actionCollection()->actions("styleList"); - TQValueList actions = lst2; - TQValueList::ConstIterator it = lst2.begin(); - TQValueList::ConstIterator end = lst2.end(); + TDEActionPtrList lst2 = actionCollection()->actions("styleList"); + TQValueList actions = lst2; + TQValueList::ConstIterator it = lst2.begin(); + TQValueList::ConstIterator end = lst2.end(); for (; it != end; ++it ) { shortCuts.insert( TQString::fromUtf8( (*it)->name() ), (*it)->shortcut() ); @@ -5487,7 +5487,7 @@ void KPrView::updateStyleList() if ( style ) { TQString name = "paragstyle_" + style->name(); - KToggleAction* act = new KToggleAction( (*it), + TDEToggleAction* act = new TDEToggleAction( (*it), shortCuts[name], TQT_TQOBJECT(this), TQT_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); @@ -6364,9 +6364,9 @@ void KPrView::spellAddAutoCorrect (const TQString & originalword, const TQString m_pKPresenterDoc->getAutoFormat()->addAutoFormatEntry( originalword, newword ); } -TQPtrList KPrView::listOfResultOfCheckWord( const TQString &word ) +TQPtrList KPrView::listOfResultOfCheckWord( const TQString &word ) { - TQPtrList listAction; + TQPtrList listAction; DefaultDictionary *dict = m_broker->defaultDictionary(); TQStringList lst = dict->suggest( word ); if ( !lst.contains( word )) @@ -6376,7 +6376,7 @@ TQPtrList KPrView::listOfResultOfCheckWord( const TQString &word ) { if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { - KAction * act = new KAction( (*it)); + TDEAction * act = new TDEAction( (*it)); connect( act, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotCorrectWord()) ); listAction.append( act ); } @@ -6388,7 +6388,7 @@ TQPtrList KPrView::listOfResultOfCheckWord( const TQString &word ) void KPrView::slotCorrectWord() { - KAction * act = (KAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); KPrTextView* edit = m_canvas->currentTextObjectView(); if ( edit ) { diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index 8c199bad..abb7ac59 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -59,10 +59,10 @@ class TQToolButton; class KPrSideBar; class KPrNoteBar; -class KAction; -class KActionMenu; -class KToggleAction; -class TKSelectColorAction; +class TDEAction; +class TDEActionMenu; +class TDEToggleAction; +class TTDESelectColorAction; class KoPartSelectAction; class KoPicture; class KoParagStyle; @@ -77,12 +77,12 @@ class KoTextZoomHandler; class KCommand; class KMacroCommand; -class KFontSizeAction; +class TDEFontSizeAction; class KColorAction; -class KSelectAction; -class KFontAction; +class TDESelectAction; +class TDEFontAction; class KoParagCounter; -class KActionMenu; +class TDEActionMenu; class KoSearchContext; class KPrFindReplace; class KPrCanvas; @@ -171,7 +171,7 @@ public: void insertFile(const TQString &path); void testAndCloseAllTextObjectProtectedContent(); void updateRulerInProtectContentMode(); - TQPtrList listOfResultOfCheckWord( const TQString &word ); + TQPtrList listOfResultOfCheckWord( const TQString &word ); /** * Returns the KPresenter global KSpell2 Broker object. @@ -528,8 +528,8 @@ public: bool getGUnbalanced() const { return gUnbalanced; } int getGXFactor() const { return gXFactor; } int getGYFactor() const { return gYFactor; } - TKSelectColorAction* getActionBrushColor() const { return actionBrushColor; } - TKSelectColorAction* getActionPenColor() const { return actionPenColor; } + TTDESelectColorAction* getActionBrushColor() const { return actionBrushColor; } + TTDESelectColorAction* getActionPenColor() const { return actionPenColor; } void setPieType(PieType _pieType) { pieType = _pieType; } void setPieAngle(int _pieAngle) { pieAngle = _pieAngle; } @@ -632,9 +632,9 @@ public: KPrNoteBar *getNoteBar() const { return notebar; } // Used by Page to plug/unplug the datatool actions - TQPtrList& actionList() { return m_actionList; } + TQPtrList& actionList() { return m_actionList; } // Used by Page to plug/unplug the variable actions - TQPtrList &variableActionList() { return m_variableActionList; } + TQPtrList &variableActionList() { return m_variableActionList; } // for Polygon object bool getCheckConcavePolygon() const { return checkConcavePolygon; } @@ -781,7 +781,7 @@ protected: virtual void updateReadWrite( bool readwrite ); void addVariableActions( int type, const TQStringList & texts, - KActionMenu * parentMenu, const TQString & menuText ); + TDEActionMenu * parentMenu, const TQString & menuText ); void showParagraphDialog( int initialPage = -1, double initialTabPos = 0.0 ); @@ -832,8 +832,8 @@ private: // right button popup menus TQPopupMenu *rb_lbegin, *rb_lend; TQPopupMenu *m_arrangeObjectsPopup; - TQPtrList m_actionList; // for the kodatatools - TQPtrList m_variableActionList; + TQPtrList m_actionList; // for the kodatatools + TQPtrList m_variableActionList; // scrollbars TQScrollBar *vert, *horz; @@ -906,160 +906,160 @@ private: KStatusBarLabel* m_sbZoomLabel; // actions - KAction *actionEditCut; - KAction *actionEditCustomVars; - KAction *actionEditCopy; - KAction *actionEditPaste; - KAction *actionEditDelete; - KAction *actionEditSelectAll; - KAction *actionEditDeSelectAll; - KAction *actionEditCopyPage; - KAction *actionEditDuplicatePage; - KAction *actionEditDelPage; - - KToggleAction *actionViewShowSideBar; - KToggleAction *actionViewShowNoteBar; - KToggleAction *actionViewSlideMaster; - - KToggleAction *actionViewShowGuideLine; - - KToggleAction *actionViewFormattingChars; - KToggleAction *actionViewShowGrid; - KToggleAction *actionViewSnapToGrid; - - KAction *actionInsertPage; - KAction *actionInsertPicture; - - KToggleAction *actionToolsMouse; - KToggleAction *actionToolsRotate; - KToggleAction *actionToolsZoom; - KToggleAction *actionToolsLine; - KToggleAction *actionToolsRectangle; - KToggleAction *actionToolsCircleOrEllipse; - KToggleAction *actionToolsPie; - KToggleAction *actionToolsText; - KToggleAction *actionToolsAutoform; - KToggleAction *actionToolsDiagramm; - KToggleAction *actionToolsTable; - KToggleAction *actionToolsFormula; - KToggleAction *actionToolsFreehand; - KToggleAction *actionToolsPolyline; - KToggleAction *actionToolsQuadricBezierCurve; - KToggleAction *actionToolsCubicBezierCurve; - KToggleAction *actionToolsConvexOrConcavePolygon; - KToggleAction *actionToolsClosedFreehand; - KToggleAction *actionToolsClosedPolyline; - KToggleAction *actionToolsClosedQuadricBezierCurve; - KToggleAction *actionToolsClosedCubicBezierCurve; + TDEAction *actionEditCut; + TDEAction *actionEditCustomVars; + TDEAction *actionEditCopy; + TDEAction *actionEditPaste; + TDEAction *actionEditDelete; + TDEAction *actionEditSelectAll; + TDEAction *actionEditDeSelectAll; + TDEAction *actionEditCopyPage; + TDEAction *actionEditDuplicatePage; + TDEAction *actionEditDelPage; + + TDEToggleAction *actionViewShowSideBar; + TDEToggleAction *actionViewShowNoteBar; + TDEToggleAction *actionViewSlideMaster; + + TDEToggleAction *actionViewShowGuideLine; + + TDEToggleAction *actionViewFormattingChars; + TDEToggleAction *actionViewShowGrid; + TDEToggleAction *actionViewSnapToGrid; + + TDEAction *actionInsertPage; + TDEAction *actionInsertPicture; + + TDEToggleAction *actionToolsMouse; + TDEToggleAction *actionToolsRotate; + TDEToggleAction *actionToolsZoom; + TDEToggleAction *actionToolsLine; + TDEToggleAction *actionToolsRectangle; + TDEToggleAction *actionToolsCircleOrEllipse; + TDEToggleAction *actionToolsPie; + TDEToggleAction *actionToolsText; + TDEToggleAction *actionToolsAutoform; + TDEToggleAction *actionToolsDiagramm; + TDEToggleAction *actionToolsTable; + TDEToggleAction *actionToolsFormula; + TDEToggleAction *actionToolsFreehand; + TDEToggleAction *actionToolsPolyline; + TDEToggleAction *actionToolsQuadricBezierCurve; + TDEToggleAction *actionToolsCubicBezierCurve; + TDEToggleAction *actionToolsConvexOrConcavePolygon; + TDEToggleAction *actionToolsClosedFreehand; + TDEToggleAction *actionToolsClosedPolyline; + TDEToggleAction *actionToolsClosedQuadricBezierCurve; + TDEToggleAction *actionToolsClosedCubicBezierCurve; KoPartSelectAction *actionToolsObject; - KActionMenu *actionToolsLinePopup; - KActionMenu *actionToolsShapePopup; - KActionMenu *actionToolsClosedLinePopup; - - KAction *actionTextFont; - KFontSizeAction *actionTextFontSize; - KFontAction *actionTextFontFamily; - KToggleAction *actionTextAlignLeft; - KToggleAction *actionTextAlignCenter; - KToggleAction *actionTextAlignRight; - KToggleAction *actionTextAlignBlock; - - KActionMenu *actionFormatBullet; - KActionMenu *actionFormatNumber; - - - KAction *actionTextDepthPlus; - KAction *actionTextDepthMinus; - KAction *actionTextExtentCont2Height; - KAction *actionTextExtendObj2Cont; - KToggleAction *actionTextBold; - KToggleAction *actionTextItalic; - KToggleAction *actionTextUnderline; - KToggleAction *actionFormatStrikeOut; - KAction *actionTextInsertPageNum; - - KAction *actionExtraProperties; - KAction *actionExtraRaise; - KAction *actionExtraLower; - - KAction *actionExtraBringForward; - KAction *actionExtraSendBackward; - KActionMenu *actionExtraArrangePopup; - - KAction *actionExtraRotate; - KAction *actionExtraShadow; - KActionMenu *actionExtraAlignObjsPopup; - KAction *actionExtraAlignObjLeft; - KAction *actionExtraAlignObjCenterH; - KAction *actionExtraAlignObjRight; - KAction *actionExtraAlignObjTop; - KAction *actionExtraAlignObjCenterV; - KAction *actionExtraAlignObjBottom; - KAction *actionExtraBackground; - KAction *actionExtraLayout; - KAction *actionExtraConfigure; - KAction *actionExtraWebPres; - KAction *actionExtraMSPres; - KAction *actionExtraCreateTemplate; - KAction *actionExtraLineBegin; - KAction *actionExtraLineEnd; - KAction *actionExtraGroup; - KAction *actionExtraUnGroup; + TDEActionMenu *actionToolsLinePopup; + TDEActionMenu *actionToolsShapePopup; + TDEActionMenu *actionToolsClosedLinePopup; + + TDEAction *actionTextFont; + TDEFontSizeAction *actionTextFontSize; + TDEFontAction *actionTextFontFamily; + TDEToggleAction *actionTextAlignLeft; + TDEToggleAction *actionTextAlignCenter; + TDEToggleAction *actionTextAlignRight; + TDEToggleAction *actionTextAlignBlock; + + TDEActionMenu *actionFormatBullet; + TDEActionMenu *actionFormatNumber; + + + TDEAction *actionTextDepthPlus; + TDEAction *actionTextDepthMinus; + TDEAction *actionTextExtentCont2Height; + TDEAction *actionTextExtendObj2Cont; + TDEToggleAction *actionTextBold; + TDEToggleAction *actionTextItalic; + TDEToggleAction *actionTextUnderline; + TDEToggleAction *actionFormatStrikeOut; + TDEAction *actionTextInsertPageNum; + + TDEAction *actionExtraProperties; + TDEAction *actionExtraRaise; + TDEAction *actionExtraLower; + + TDEAction *actionExtraBringForward; + TDEAction *actionExtraSendBackward; + TDEActionMenu *actionExtraArrangePopup; + + TDEAction *actionExtraRotate; + TDEAction *actionExtraShadow; + TDEActionMenu *actionExtraAlignObjsPopup; + TDEAction *actionExtraAlignObjLeft; + TDEAction *actionExtraAlignObjCenterH; + TDEAction *actionExtraAlignObjRight; + TDEAction *actionExtraAlignObjTop; + TDEAction *actionExtraAlignObjCenterV; + TDEAction *actionExtraAlignObjBottom; + TDEAction *actionExtraBackground; + TDEAction *actionExtraLayout; + TDEAction *actionExtraConfigure; + TDEAction *actionExtraWebPres; + TDEAction *actionExtraMSPres; + TDEAction *actionExtraCreateTemplate; + TDEAction *actionExtraLineBegin; + TDEAction *actionExtraLineEnd; + TDEAction *actionExtraGroup; + TDEAction *actionExtraUnGroup; KoLineStyleAction *actionExtraPenStyle; KoLineWidthAction *actionExtraPenWidth; - KAction *actionScreenConfigPages; - KAction *actionScreenAssignEffect; - KAction *actionScreenTransEffect; - KAction *actionScreenStart; - KAction *actionScreenStartFromFirst; - KAction *actionScreenStop; - KAction *actionScreenPause; - KAction *actionScreenFirst; - KAction *actionScreenPrev; - KAction *actionScreenNext; - KAction *actionScreenLast; - KAction *actionScreenSkip; + TDEAction *actionScreenConfigPages; + TDEAction *actionScreenAssignEffect; + TDEAction *actionScreenTransEffect; + TDEAction *actionScreenStart; + TDEAction *actionScreenStartFromFirst; + TDEAction *actionScreenStop; + TDEAction *actionScreenPause; + TDEAction *actionScreenFirst; + TDEAction *actionScreenPrev; + TDEAction *actionScreenNext; + TDEAction *actionScreenLast; + TDEAction *actionScreenSkip; - KAction *actionEditFind; - KAction *actionEditFindNext; - KAction *actionEditFindPrevious; - KAction *actionEditReplace; + TDEAction *actionEditFind; + TDEAction *actionEditFindNext; + TDEAction *actionEditFindPrevious; + TDEAction *actionEditReplace; - KAction *actionCustomSlideShow; + TDEAction *actionCustomSlideShow; - KAction *actionColorBar; - KAction *actionExtraDefaultTemplate; + TDEAction *actionColorBar; + TDEAction *actionExtraDefaultTemplate; - TKSelectColorAction* actionBrushColor; - TKSelectColorAction* actionPenColor; - TKSelectColorAction* actionTextColor; + TTDESelectColorAction* actionBrushColor; + TTDESelectColorAction* actionPenColor; + TTDESelectColorAction* actionTextColor; - KAction *actionResizeTextObject; - KAction *actionExtendObjectHeight; - KAction *actionObjectProperties; + TDEAction *actionResizeTextObject; + TDEAction *actionExtendObjectHeight; + TDEAction *actionObjectProperties; - KAction *actionRenamePage; + TDEAction *actionRenamePage; - KAction *actionPicOriginalSize; - KAction *actionPic640x480; - KAction *actionPic800x600; - KAction *actionPic1024x768; - KAction *actionPic1280x1024; - KAction *actionPic1600x1200; - KAction *actionChangePic; - KAction *actionExtraSpellCheck; - KAction *actionFormatDefault; + TDEAction *actionPicOriginalSize; + TDEAction *actionPic640x480; + TDEAction *actionPic800x600; + TDEAction *actionPic1024x768; + TDEAction *actionPic1280x1024; + TDEAction *actionPic1600x1200; + TDEAction *actionChangePic; + TDEAction *actionExtraSpellCheck; + TDEAction *actionFormatDefault; - KAction *actionImageEffect; + TDEAction *actionImageEffect; - KAction *actionInsertComment; - KAction *actionEditComment; - KAction *actionRemoveComment; - KAction *actionCopyTextOfComment; + TDEAction *actionInsertComment; + TDEAction *actionEditComment; + TDEAction *actionRemoveComment; + TDEAction *actionCopyTextOfComment; - KAction *actionImportStyle; + TDEAction *actionImportStyle; DCOPObject *dcop; @@ -1069,79 +1069,79 @@ private: TQSplitter *splitter; PageBase *pageBase; - KToggleAction *actionFormatSuper; - KToggleAction *actionFormatSub; + TDEToggleAction *actionFormatSuper; + TDEToggleAction *actionFormatSub; - KToggleAction *m_actionExtraHeader; - KToggleAction *m_actionExtraFooter; + TDEToggleAction *m_actionExtraHeader; + TDEToggleAction *m_actionExtraFooter; - KAction* actionInsertSpecialChar; - KAction *actionInsertLink; + TDEAction* actionInsertSpecialChar; + TDEAction *actionInsertLink; - KAction * actionChangeLink; - KAction *actionCopyLink; - KAction *actionRemoveLink; + TDEAction * actionChangeLink; + TDEAction *actionCopyLink; + TDEAction *actionRemoveLink; - KAction *actionAddLinkToBookmak; - KAction *actionFormatParag; - KAction *actionOpenLink; - KAction *actionIncreaseFontSize; - KAction *actionDecreaseFontSize; - KAction *actionChangeCase; - KAction *actionRefreshAllVariable; + TDEAction *actionAddLinkToBookmak; + TDEAction *actionFormatParag; + TDEAction *actionOpenLink; + TDEAction *actionIncreaseFontSize; + TDEAction *actionDecreaseFontSize; + TDEAction *actionChangeCase; + TDEAction *actionRefreshAllVariable; - KSelectAction *actionViewZoom; + TDESelectAction *actionViewZoom; - KSelectAction *actionFormatStyle; + TDESelectAction *actionFormatStyle; - KToggleAction *actionAllowAutoFormat; + TDEToggleAction *actionAllowAutoFormat; - KToggleAction *actionDisplayObjectFromMasterPage; + TDEToggleAction *actionDisplayObjectFromMasterPage; - KToggleAction *actionDisplayBackgroundPage; + TDEToggleAction *actionDisplayBackgroundPage; - KAction *actionFormatStylist; + TDEAction *actionFormatStylist; - KAction *actionAddGuideLine; + TDEAction *actionAddGuideLine; - KAction *actionConfigureCompletion; + TDEAction *actionConfigureCompletion; - KAction *actionZoomMinus; - KAction *actionZoomPageWidth; - KAction *actionZoomEntirePage; - KAction *actionZoomPlus; - KAction *actionZoomSelectedObject; - KAction *actionZoomPageHeight; - KAction *actionZoomAllObject; + TDEAction *actionZoomMinus; + TDEAction *actionZoomPageWidth; + TDEAction *actionZoomEntirePage; + TDEAction *actionZoomPlus; + TDEAction *actionZoomSelectedObject; + TDEAction *actionZoomPageHeight; + TDEAction *actionZoomAllObject; - KAction *actionFlipHorizontal; - KAction *actionFlipVertical; - KAction *actionCloseObject; + TDEAction *actionFlipHorizontal; + TDEAction *actionFlipVertical; + TDEAction *actionCloseObject; - KAction *actionDuplicateObj; - KAction *actionApplyAutoFormat; + TDEAction *actionDuplicateObj; + TDEAction *actionApplyAutoFormat; - KAction *actionCreateStyleFromSelection; + TDEAction *actionCreateStyleFromSelection; - KAction *actionSavePicture; + TDEAction *actionSavePicture; - KAction *actionSaveBackgroundPicture; + TDEAction *actionSaveBackgroundPicture; - KAction *actionInsertFile; + TDEAction *actionInsertFile; - KAction *actionSpellIgnoreAll; + TDEAction *actionSpellIgnoreAll; - KToggleAction *actionAlignVerticalTop; - KToggleAction *actionAlignVerticalBottom; - KToggleAction *actionAlignVerticalCenter; + TDEToggleAction *actionAlignVerticalTop; + TDEToggleAction *actionAlignVerticalBottom; + TDEToggleAction *actionAlignVerticalCenter; - KToggleAction *actionAllowBgSpellCheck; - KAction *actionEditCustomVarsEdit; - KActionMenu *actionFormatStyleMenu; - KToggleAction *actionInsertDirectCursor; + TDEToggleAction *actionAllowBgSpellCheck; + TDEAction *actionEditCustomVarsEdit; + TDEActionMenu *actionFormatStyleMenu; + TDEToggleAction *actionInsertDirectCursor; - KAction *actionAddWordToPersonalDictionary; + TDEAction *actionAddWordToPersonalDictionary; /// timer for automatic presentation mode TQTimer m_autoPresTimer; @@ -1205,14 +1205,14 @@ private: - KActionMenu *actionInsertVariable; - KActionMenu *actionInsertCustom; + TDEActionMenu *actionInsertVariable; + TDEActionMenu *actionInsertCustom; struct VariableDef { int type; int subtype; }; - typedef TQMap VariableDefMap; + typedef TQMap VariableDefMap; VariableDefMap m_variableDefMap; KoSearchContext *m_searchEntry, *m_replaceEntry; diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index d87a82c4..9dd7e2f8 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -932,7 +932,7 @@ void KPrWebPresentationWizard::setupPage4() connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slideTitleChanged( const TQString & ) ) ); - slideTitles = new KListView( canvas ); + slideTitles = new TDEListView( canvas ); layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); slideTitles->addColumn( i18n( "No." ) ); slideTitles->addColumn( i18n( "Slide Title" ) ); @@ -945,7 +945,7 @@ void KPrWebPresentationWizard::setupPage4() TQValueList infos = webPres.getSlideInfos(); for ( int i = infos.count() - 1; i >= 0; --i ) { - KListViewItem *item = new KListViewItem( slideTitles ); + TDEListViewItem *item = new TDEListViewItem( slideTitles ); item->setText( 0, TQString::number( i + 1 ) ); //kdDebug(33001) << "KPrWebPresentationWizard::setupPage3 " << infos[ i ].slideTitle << endl; item->setText( 1, infos[ i ].slideTitle ); diff --git a/kpresenter/KPrWebPresentation.h b/kpresenter/KPrWebPresentation.h index 99b90ef6..3c7aba93 100644 --- a/kpresenter/KPrWebPresentation.h +++ b/kpresenter/KPrWebPresentation.h @@ -32,7 +32,7 @@ class KPrView; class KURLRequester; class KColorButton; -class KListView; +class TDEListView; class KIntNumInput; class KLineEdit; class KComboBox; @@ -179,7 +179,7 @@ protected: KComboBox *encoding, *doctype; KIntNumInput *zoom, *timeBetweenSlides; // PAU KURLRequester *path; - KListView *slideTitles; + TDEListView *slideTitles; KLineEdit *slideTitle; protected slots: diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui index 6e0b3c0d..9e6dfc84 100644 --- a/kspread/dialogs/SheetSelectWidget.ui +++ b/kspread/dialogs/SheetSelectWidget.ui @@ -83,7 +83,7 @@ Remove sheets.     - + Available Sheets @@ -175,7 +175,7 @@ You can insert a sheet as often as you like, this way it will be printed multipl Move selected sheet to the bottom. - + Selected Sheets diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 0130e863..946ee3c5 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -189,7 +189,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_SelectSheetLabel->setText( i18n( "Select tables:" ) ); Frame5_2Layout->addWidget( m_SelectSheetLabel, 1, 0 ); - m_sheetView = new KListView( Frame5_2, "m_tableView" ); + m_sheetView = new TDEListView( Frame5_2, "m_tableView" ); m_sheetView->addColumn( i18n( "Sheet" ) ); m_sheetView->setRootIsDecorated( FALSE ); @@ -219,7 +219,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame5_2_2Layout->addWidget( TextLabel11_2, 0, 0 ); - m_columnView = new KListView( Frame5_2_2, "m_columnView" ); + m_columnView = new TDEListView( Frame5_2_2, "m_columnView" ); m_columnView->addColumn( i18n( "Column" ) ); m_columnView->addColumn( i18n( "Sheet" ) ); m_columnView->addColumn( i18n( "Data Type" ) ); diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index 9dec13fc..2604bf41 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -41,7 +41,7 @@ class TQTextEdit; class TQVBoxLayout; class TQWidget; -class KListView; +class TDEListView; class KPushButton; namespace KSpread { @@ -101,9 +101,9 @@ class DatabaseDialog : public KWizard KPushButton * m_connectButton; TQLabel * m_sheetStatus; TQLabel * m_SelectSheetLabel; - KListView * m_sheetView; + TDEListView * m_sheetView; TQWidget * m_columns; - KListView * m_columnView; + TDEListView * m_columnView; TQLabel * m_columnsStatus; TQWidget * m_options; TQComboBox * m_columns_1; diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 26ec4580..2821f5e2 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -44,9 +44,9 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) { TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "layout"); - m_styleList = new KListView( this, "m_styleList" ); + m_styleList = new TDEListView( this, "m_styleList" ); m_styleList->addColumn( i18n( "Styles" ) ); - m_styleList->setResizeMode( KListView::AllColumns ); + m_styleList->setResizeMode( TDEListView::AllColumns ); layout->addWidget( m_styleList ); m_displayBox = new KComboBox( FALSE, this, "m_displayBox" ); @@ -99,11 +99,11 @@ StyleDlg::~StyleDlg() void StyleDlg::fillComboBox() { - class Map : public TQMap {}; + class Map : public TQMap {}; Map entries; entries.clear(); - entries[m_styleManager->defaultStyle()] = new KListViewItem( m_dlg->m_styleList, i18n( "Default" ) ); + entries[m_styleManager->defaultStyle()] = new TDEListViewItem( m_dlg->m_styleList, i18n( "Default" ) ); StyleManager::Styles::const_iterator iter = m_styleManager->m_styles.begin(); StyleManager::Styles::const_iterator end = m_styleManager->m_styles.end(); @@ -114,12 +114,12 @@ void StyleDlg::fillComboBox() if ( entries.find( iter.data() ) == entries.end() ) { if ( iter.data()->parent() == 0 ) - entries[iter.data()] = new KListViewItem( m_dlg->m_styleList, iter.data()->name() ); + entries[iter.data()] = new TDEListViewItem( m_dlg->m_styleList, iter.data()->name() ); else { Map::const_iterator i = entries.find( iter.data()->parent() ); if ( i != entries.end() ) - entries[iter.data()] = new KListViewItem( i.data(), iter.data()->name() ); + entries[iter.data()] = new TDEListViewItem( i.data(), iter.data()->name() ); } } @@ -144,7 +144,7 @@ void StyleDlg::slotDisplayMode( int mode ) } if ( mode != 2 ) - new KListViewItem( m_dlg->m_styleList, i18n( "Default" ) ); + new TDEListViewItem( m_dlg->m_styleList, i18n( "Default" ) ); StyleManager::Styles::iterator iter = m_styleManager->m_styles.begin(); StyleManager::Styles::iterator end = m_styleManager->m_styles.end(); @@ -161,15 +161,15 @@ void StyleDlg::slotDisplayMode( int mode ) if ( mode == 2 ) { if ( styleData->type() == Style::CUSTOM ) - new KListViewItem( m_dlg->m_styleList, styleData->name() ); + new TDEListViewItem( m_dlg->m_styleList, styleData->name() ); } else if ( mode == 1 ) { if ( styleData->usage() > 0 ) - new KListViewItem( m_dlg->m_styleList, styleData->name() ); + new TDEListViewItem( m_dlg->m_styleList, styleData->name() ); } else - new KListViewItem( m_dlg->m_styleList, styleData->name() ); + new TDEListViewItem( m_dlg->m_styleList, styleData->name() ); ++iter; } @@ -177,7 +177,7 @@ void StyleDlg::slotDisplayMode( int mode ) void StyleDlg::slotOk() { - KListViewItem * item = (KListViewItem *) m_dlg->m_styleList->currentItem(); + TDEListViewItem * item = (TDEListViewItem *) m_dlg->m_styleList->currentItem(); if ( !item ) { @@ -218,7 +218,7 @@ void StyleDlg::slotUser1() { CustomStyle * s = 0; - KListViewItem * item = (KListViewItem *) m_dlg->m_styleList->currentItem(); + TDEListViewItem * item = (TDEListViewItem *) m_dlg->m_styleList->currentItem(); if ( item ) { @@ -257,7 +257,7 @@ void StyleDlg::slotUser1() void StyleDlg::slotUser2() { - KListViewItem * item = (KListViewItem *) m_dlg->m_styleList->currentItem(); + TDEListViewItem * item = (TDEListViewItem *) m_dlg->m_styleList->currentItem(); if ( !item ) return; @@ -279,7 +279,7 @@ void StyleDlg::slotUser2() void StyleDlg::slotUser3() { - KListViewItem * item = (KListViewItem *) m_dlg->m_styleList->currentItem(); + TDEListViewItem * item = (TDEListViewItem *) m_dlg->m_styleList->currentItem(); if ( !item ) return; diff --git a/kspread/dialogs/kspread_dlg_styles.h b/kspread/dialogs/kspread_dlg_styles.h index b6a1f7c7..fda66536 100644 --- a/kspread/dialogs/kspread_dlg_styles.h +++ b/kspread/dialogs/kspread_dlg_styles.h @@ -25,7 +25,7 @@ #include class KComboBox; -class KListView; +class TDEListView; class TQListViewItem; @@ -43,7 +43,7 @@ class StyleWidget : public TQWidget StyleWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~StyleWidget(); - KListView * m_styleList; + TDEListView * m_styleList; KComboBox * m_displayBox; signals: void modifyStyle(); diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index 23cf3317..9523cf83 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -115,7 +115,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) // populate recent files - TQStringList fileList = KRecentDocument::recentDocuments(); + TQStringList fileList = TDERecentDocument::recentDocuments(); for( TQStringList::ConstIterator it = fileList.begin();it != fileList.end(); ++it ) { KDesktopFile f(*it, true /* read only */); diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index 1edef10d..6fefd272 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -304,7 +304,7 @@ class FunctionCompletion::Private public: CellEditor* editor; TQVBox *completionPopup; - KListBox *completionListBox; + TDEListBox *completionListBox; TQLabel* hintLabel; }; @@ -321,7 +321,7 @@ TQObject( editor ) d->completionPopup->installEventFilter( this ); d->completionPopup->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum); - d->completionListBox = new KListBox( d->completionPopup ); + d->completionListBox = new TDEListBox( d->completionPopup ); d->completionPopup->setFocusProxy( d->completionListBox ); d->completionListBox->setFrameStyle( TQFrame::NoFrame ); d->completionListBox->setVariableWidth( true ); diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index 6de55b61..ede60281 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -190,7 +190,7 @@ public: // all UI actions ViewActions* actions; - // If updateEditWidget is called it changes some KToggleActions. + // If updateEditWidget is called it changes some TDEToggleActions. // That causes them to emit a signal. If this lock is true, then these // signals are ignored. bool toolbarLock; @@ -294,168 +294,168 @@ class ViewActions public: // cell formatting - KAction* cellLayout; - KAction *actionExtraProperties; - KAction* defaultFormat; - KToggleAction* bold; - KToggleAction* italic; - KToggleAction* underline; - KToggleAction* strikeOut; - KFontAction* selectFont; - KFontSizeAction* selectFontSize; - KAction* fontSizeUp; - KAction* fontSizeDown; - TKSelectColorAction* textColor; - KToggleAction* alignLeft; - KToggleAction* alignCenter; - KToggleAction* alignRight; - KToggleAction* alignTop; - KToggleAction* alignMiddle; - KToggleAction* alignBottom; - KToggleAction* wrapText; - KToggleAction* verticalText; - KAction* increaseIndent; - KAction* decreaseIndent; - KAction* changeAngle; - KToggleAction* percent; - KAction* precplus; - KAction* precminus; - KToggleAction* money; - KAction* upper; - KAction* lower; - KAction* firstLetterUpper; - TKSelectColorAction* bgColor; - KAction* borderLeft; - KAction* borderRight; - KAction* borderTop; - KAction* borderBottom; - KAction* borderAll; - KAction* borderOutline; - KAction* borderRemove; - TKSelectColorAction* borderColor; - KSelectAction* selectStyle; - KAction* createStyle; + TDEAction* cellLayout; + TDEAction *actionExtraProperties; + TDEAction* defaultFormat; + TDEToggleAction* bold; + TDEToggleAction* italic; + TDEToggleAction* underline; + TDEToggleAction* strikeOut; + TDEFontAction* selectFont; + TDEFontSizeAction* selectFontSize; + TDEAction* fontSizeUp; + TDEAction* fontSizeDown; + TTDESelectColorAction* textColor; + TDEToggleAction* alignLeft; + TDEToggleAction* alignCenter; + TDEToggleAction* alignRight; + TDEToggleAction* alignTop; + TDEToggleAction* alignMiddle; + TDEToggleAction* alignBottom; + TDEToggleAction* wrapText; + TDEToggleAction* verticalText; + TDEAction* increaseIndent; + TDEAction* decreaseIndent; + TDEAction* changeAngle; + TDEToggleAction* percent; + TDEAction* precplus; + TDEAction* precminus; + TDEToggleAction* money; + TDEAction* upper; + TDEAction* lower; + TDEAction* firstLetterUpper; + TTDESelectColorAction* bgColor; + TDEAction* borderLeft; + TDEAction* borderRight; + TDEAction* borderTop; + TDEAction* borderBottom; + TDEAction* borderAll; + TDEAction* borderOutline; + TDEAction* borderRemove; + TTDESelectColorAction* borderColor; + TDESelectAction* selectStyle; + TDEAction* createStyle; // cell operations - KAction* editCell; - KAction* insertCell; - KAction* removeCell; - KAction* deleteCell; - KToolBarPopupAction* mergeCell; - KAction* mergeCellHorizontal; - KAction* mergeCellVertical; - KAction* dissociateCell; - KAction* clearText; - KAction* conditional; - KAction* clearConditional; - KAction* validity; - KAction* clearValidity; - KAction* addModifyComment; - KAction* removeComment; - KAction* clearComment; + TDEAction* editCell; + TDEAction* insertCell; + TDEAction* removeCell; + TDEAction* deleteCell; + TDEToolBarPopupAction* mergeCell; + TDEAction* mergeCellHorizontal; + TDEAction* mergeCellVertical; + TDEAction* dissociateCell; + TDEAction* clearText; + TDEAction* conditional; + TDEAction* clearConditional; + TDEAction* validity; + TDEAction* clearValidity; + TDEAction* addModifyComment; + TDEAction* removeComment; + TDEAction* clearComment; // column & row operations - KAction* resizeColumn; - KAction* insertColumn; - KAction* deleteColumn; - KAction* hideColumn; - KAction* showColumn; - KAction* equalizeColumn; - KAction* showSelColumns; - KAction* resizeRow; - KAction* insertRow; - KAction* deleteRow; - KAction* hideRow; - KAction* showRow; - KAction* equalizeRow; - KAction* showSelRows; - KAction* adjust; + TDEAction* resizeColumn; + TDEAction* insertColumn; + TDEAction* deleteColumn; + TDEAction* hideColumn; + TDEAction* showColumn; + TDEAction* equalizeColumn; + TDEAction* showSelColumns; + TDEAction* resizeRow; + TDEAction* insertRow; + TDEAction* deleteRow; + TDEAction* hideRow; + TDEAction* showRow; + TDEAction* equalizeRow; + TDEAction* showSelRows; + TDEAction* adjust; // sheet/workbook operations - KAction* sheetProperties; - KAction* insertSheet; - KAction* menuInsertSheet; - KAction* removeSheet; - KAction* renameSheet; - KAction* hideSheet; - KAction* showSheet; - KAction* autoFormat; - KAction* areaName; - KAction* showArea; - KAction* insertSeries; - KAction* insertFunction; - KAction* insertSpecialChar; - KAction* insertFromDatabase; - KAction* insertFromTextfile; - KAction* insertFromClipboard; - KAction* transform; - KAction* sort; - KAction* sortDec; - KAction* sortInc; - KAction* fillRight; - KAction* fillLeft; - KAction* fillUp; - KAction* fillDown; - KAction* paperLayout; - KAction* definePrintRange; - KAction* resetPrintRange; - KToggleAction* showPageBorders; - KAction* recalcWorksheet; - KAction* recalcWorkbook; - KToggleAction* protectSheet; - KToggleAction* protectDoc; + TDEAction* sheetProperties; + TDEAction* insertSheet; + TDEAction* menuInsertSheet; + TDEAction* removeSheet; + TDEAction* renameSheet; + TDEAction* hideSheet; + TDEAction* showSheet; + TDEAction* autoFormat; + TDEAction* areaName; + TDEAction* showArea; + TDEAction* insertSeries; + TDEAction* insertFunction; + TDEAction* insertSpecialChar; + TDEAction* insertFromDatabase; + TDEAction* insertFromTextfile; + TDEAction* insertFromClipboard; + TDEAction* transform; + TDEAction* sort; + TDEAction* sortDec; + TDEAction* sortInc; + TDEAction* fillRight; + TDEAction* fillLeft; + TDEAction* fillUp; + TDEAction* fillDown; + TDEAction* paperLayout; + TDEAction* definePrintRange; + TDEAction* resetPrintRange; + TDEToggleAction* showPageBorders; + TDEAction* recalcWorksheet; + TDEAction* recalcWorkbook; + TDEToggleAction* protectSheet; + TDEToggleAction* protectDoc; // general editing - KAction* cut; - KAction* copy; - KAction* paste; - KAction* specialPaste; - KAction* insertCellCopy; - KAction* find; - KAction* replace; + TDEAction* cut; + TDEAction* copy; + TDEAction* paste; + TDEAction* specialPaste; + TDEAction* insertCellCopy; + TDEAction* find; + TDEAction* replace; // navigation - KAction* gotoCell; - KAction* nextSheet; - KAction* prevSheet; - KAction* firstSheet; - KAction* lastSheet; + TDEAction* gotoCell; + TDEAction* nextSheet; + TDEAction* prevSheet; + TDEAction* firstSheet; + TDEAction* lastSheet; // misc - KAction* styleDialog; - KAction* autoSum; - KSelectAction* formulaSelection; - KAction* insertLink; - KAction* removeLink; - KAction* consolidate; - KAction* goalSeek; - KAction* subTotals; - KAction* textToColumns; - KAction* multipleOperations; - KAction* createTemplate; + TDEAction* styleDialog; + TDEAction* autoSum; + TDESelectAction* formulaSelection; + TDEAction* insertLink; + TDEAction* removeLink; + TDEAction* consolidate; + TDEAction* goalSeek; + TDEAction* subTotals; + TDEAction* textToColumns; + TDEAction* multipleOperations; + TDEAction* createTemplate; KoPartSelectAction *insertPart; - KToggleAction* insertChartFrame; - KAction* insertPicture; - KAction* customList; - KAction* spellChecking; - KAction* internalTests; - KAction* inspector; + TDEToggleAction* insertChartFrame; + TDEAction* insertPicture; + TDEAction* customList; + TDEAction* spellChecking; + TDEAction* internalTests; + TDEAction* inspector; // settings KoZoomAction* viewZoom; - KToggleAction* showStatusBar; - KToggleAction* showTabBar; - KToggleAction* showFormulaBar; - KAction* preference; + TDEToggleAction* showStatusBar; + TDEToggleAction* showTabBar; + TDEToggleAction* showFormulaBar; + TDEAction* preference; // running calculation - KToggleAction* calcNone; - KToggleAction* calcMin; - KToggleAction* calcMax; - KToggleAction* calcAverage; - KToggleAction* calcCount; - KToggleAction* calcSum; - KToggleAction* calcCountA; + TDEToggleAction* calcNone; + TDEToggleAction* calcMin; + TDEToggleAction* calcMax; + TDEToggleAction* calcAverage; + TDEToggleAction* calcCount; + TDEToggleAction* calcSum; + TDEToggleAction* calcCountA; }; @@ -463,406 +463,406 @@ void View::Private::initActions() { actions = new ViewActions; - KActionCollection* ac = view->actionCollection(); + TDEActionCollection* ac = view->actionCollection(); // -- cell formatting actions -- - actions->cellLayout = new KAction( i18n("Cell Format..."), "cell_layout", + actions->cellLayout = new TDEAction( i18n("Cell Format..."), "cell_layout", TQt::CTRL+ TQt::ALT+ TQt::Key_F, TQT_TQOBJECT(view), TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); actions->cellLayout->setToolTip( i18n("Set the cell formatting.") ); - actions->actionExtraProperties = new KAction( i18n( "&Properties" ), "penbrush", 0, + actions->actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, TQT_TQOBJECT(view), TQT_SLOT( extraProperties() ), ac, "extra_properties" ); - actions->defaultFormat = new KAction( i18n("Default"), + actions->defaultFormat = new TDEAction( i18n("Default"), 0, TQT_TQOBJECT(view), TQT_SLOT( defaultSelection() ), ac, "default" ); actions->defaultFormat->setToolTip( i18n("Resets to the default format.") ); - actions->bold = new KToggleAction( i18n("Bold"), "text_bold", + actions->bold = new TDEToggleAction( i18n("Bold"), "text_bold", TQt::CTRL+TQt::Key_B, ac, "bold"); TQT_BASE_OBJECT_NAME::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( bold( bool ) ) ); - actions->italic = new KToggleAction( i18n("Italic"), "text_italic", + actions->italic = new TDEToggleAction( i18n("Italic"), "text_italic", TQt::CTRL+TQt::Key_I, ac, "italic"); TQT_BASE_OBJECT_NAME::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( italic( bool ) ) ); - actions->underline = new KToggleAction( i18n("Underline"), "text_under", + actions->underline = new TDEToggleAction( i18n("Underline"), "text_under", TQt::CTRL+TQt::Key_U, ac, "underline"); TQT_BASE_OBJECT_NAME::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( underline( bool ) ) ); - actions->strikeOut = new KToggleAction( i18n("Strike Out"), "text_strike", + actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "text_strike", 0, ac, "strikeout"); TQT_BASE_OBJECT_NAME::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( strikeOut( bool ) ) ); - actions->selectFont = new KFontAction( i18n("Select Font..."), + actions->selectFont = new TDEFontAction( i18n("Select Font..."), 0, ac, "selectFont" ); TQT_BASE_OBJECT_NAME::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), TQT_TQOBJECT(view), TQT_SLOT( fontSelected( const TQString& ) ) ); - actions->selectFontSize = new KFontSizeAction( i18n("Select Font Size"), + actions->selectFontSize = new TDEFontSizeAction( i18n("Select Font Size"), 0, ac, "selectFontSize" ); TQT_BASE_OBJECT_NAME::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(view), TQT_SLOT( fontSizeSelected( int ) ) ); - actions->fontSizeUp = new KAction( i18n("Increase Font Size"), "fontsizeup", + actions->fontSizeUp = new TDEAction( i18n("Increase Font Size"), "fontsizeup", 0, TQT_TQOBJECT(view), TQT_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); - actions->fontSizeDown = new KAction( i18n("Decrease Font Size"), "fontsizedown", + actions->fontSizeDown = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", 0, TQT_TQOBJECT(view), TQT_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); - actions->textColor = new TKSelectColorAction( i18n("Text Color"), - TKSelectColorAction::TextColor, TQT_TQOBJECT(view), TQT_SLOT( changeTextColor() ), + actions->textColor = new TTDESelectColorAction( i18n("Text Color"), + TTDESelectColorAction::TextColor, TQT_TQOBJECT(view), TQT_SLOT( changeTextColor() ), ac, "textColor",true ); actions->textColor->setDefaultColor(TQColor()); - actions->alignLeft = new KToggleAction( i18n("Align Left"), "text_left", + actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "text_left", 0, ac, "left"); TQT_BASE_OBJECT_NAME::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignLeft( bool ) ) ); actions->alignLeft->setExclusiveGroup( "Align" ); actions->alignLeft->setToolTip(i18n("Left justify the cell contents.")); - actions->alignCenter = new KToggleAction( i18n("Align Center"), "text_center", + actions->alignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", 0, ac, "center"); TQT_BASE_OBJECT_NAME::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignCenter( bool ) ) ); actions->alignCenter->setExclusiveGroup( "Align" ); actions->alignCenter->setToolTip(i18n("Center the cell contents.")); - actions->alignRight = new KToggleAction( i18n("Align Right"), "text_right", + actions->alignRight = new TDEToggleAction( i18n("Align Right"), "text_right", 0, ac, "right"); TQT_BASE_OBJECT_NAME::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignRight( bool ) ) ); actions->alignRight->setExclusiveGroup( "Align" ); actions->alignRight->setToolTip(i18n("Right justify the cell contents.")); - actions->alignTop = new KToggleAction( i18n("Align Top"), "text_top", + actions->alignTop = new TDEToggleAction( i18n("Align Top"), "text_top", 0, ac, "top"); TQT_BASE_OBJECT_NAME::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignTop( bool ) ) ); actions->alignTop->setExclusiveGroup( "Pos" ); actions->alignTop->setToolTip(i18n("Align cell contents along the top of the cell.")); - actions->alignMiddle = new KToggleAction( i18n("Align Middle"), "middle", + actions->alignMiddle = new TDEToggleAction( i18n("Align Middle"), "middle", 0, ac, "middle"); TQT_BASE_OBJECT_NAME::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignMiddle( bool ) ) ); actions->alignMiddle->setExclusiveGroup( "Pos" ); actions->alignMiddle->setToolTip(i18n("Align cell contents centered in the cell.")); - actions->alignBottom = new KToggleAction( i18n("Align Bottom"), "text_bottom", + actions->alignBottom = new TDEToggleAction( i18n("Align Bottom"), "text_bottom", 0, ac, "bottom"); TQT_BASE_OBJECT_NAME::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignBottom( bool ) ) ); actions->alignBottom->setExclusiveGroup( "Pos" ); actions->alignBottom->setToolTip(i18n("Align cell contents along the bottom of the cell.")); - actions->wrapText = new KToggleAction( i18n("Wrap Text"), "multirow", + actions->wrapText = new TDEToggleAction( i18n("Wrap Text"), "multirow", 0, ac, "multiRow" ); TQT_BASE_OBJECT_NAME::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( wrapText( bool ) ) ); actions->wrapText->setToolTip(i18n("Make the cell text wrap onto multiple lines.")); - actions->verticalText = new KToggleAction( i18n("Vertical Text"),"vertical_text" , + actions->verticalText = new TDEToggleAction( i18n("Vertical Text"),"vertical_text" , 0 ,ac, "verticaltext" ); TQT_BASE_OBJECT_NAME::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( verticalText( bool ) ) ); actions->verticalText->setToolTip(i18n("Print cell contents vertically.")); - actions->increaseIndent = new KAction( i18n("Increase Indent"), + actions->increaseIndent = new TDEAction( i18n("Increase Indent"), TQApplication::reverseLayout() ? "format_decreaseindent":"format_increaseindent", 0, TQT_TQOBJECT(view), TQT_SLOT( increaseIndent() ), ac, "increaseindent" ); actions->increaseIndent->setToolTip(i18n("Increase the indentation.")); - actions->decreaseIndent = new KAction( i18n("Decrease Indent"), + actions->decreaseIndent = new TDEAction( i18n("Decrease Indent"), TQApplication::reverseLayout() ? "format_increaseindent" : "format_decreaseindent", 0, TQT_TQOBJECT(view), TQT_SLOT( decreaseIndent() ), ac, "decreaseindent"); actions->decreaseIndent->setToolTip(i18n("Decrease the indentation.")); - actions->changeAngle = new KAction( i18n("Change Angle..."), + actions->changeAngle = new TDEAction( i18n("Change Angle..."), 0, TQT_TQOBJECT(view), TQT_SLOT( changeAngle() ), ac, "changeangle" ); actions->changeAngle->setToolTip(i18n("Change the angle that cell contents are printed.")); - actions->percent = new KToggleAction( i18n("Percent Format"), "percent", + actions->percent = new TDEToggleAction( i18n("Percent Format"), "percent", 0, ac, "percent"); TQT_BASE_OBJECT_NAME::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( percent( bool ) ) ); actions->percent->setToolTip(i18n("Set the cell formatting to look like a percentage.")); - actions->precplus = new KAction( i18n("Increase Precision"), "prec_plus", + actions->precplus = new TDEAction( i18n("Increase Precision"), "prec_plus", 0, TQT_TQOBJECT(view), TQT_SLOT( precisionPlus() ), ac, "precplus"); actions->precplus->setToolTip(i18n("Increase the decimal precision shown onscreen.")); - actions->precminus = new KAction( i18n("Decrease Precision"), "prec_minus", + actions->precminus = new TDEAction( i18n("Decrease Precision"), "prec_minus", 0, TQT_TQOBJECT(view), TQT_SLOT( precisionMinus() ), ac, "precminus"); actions->precminus->setToolTip(i18n("Decrease the decimal precision shown onscreen.")); - actions->money = new KToggleAction( i18n("Money Format"), "money", + actions->money = new TDEToggleAction( i18n("Money Format"), "money", 0, ac, "money"); TQT_BASE_OBJECT_NAME::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( moneyFormat( bool ) ) ); actions->money->setToolTip(i18n("Set the cell formatting to look like your local currency.")); - actions->upper = new KAction( i18n("Upper Case"), "fontsizeup", + actions->upper = new TDEAction( i18n("Upper Case"), "fontsizeup", 0, TQT_TQOBJECT(view), TQT_SLOT( upper() ), ac, "upper" ); actions->upper->setToolTip(i18n("Convert all letters to upper case.")); - actions->lower = new KAction( i18n("Lower Case"), "fontsizedown", + actions->lower = new TDEAction( i18n("Lower Case"), "fontsizedown", 0, TQT_TQOBJECT(view), TQT_SLOT( lower() ), ac, "lower" ); actions->lower->setToolTip(i18n("Convert all letters to lower case.")); - actions->firstLetterUpper = new KAction( i18n("Convert First Letter to Upper Case"), "first_letter_upper", + actions->firstLetterUpper = new TDEAction( i18n("Convert First Letter to Upper Case"), "first_letter_upper", 0, TQT_TQOBJECT(view), TQT_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); actions->firstLetterUpper->setToolTip(i18n("Capitalize the first letter.")); - actions->bgColor = new TKSelectColorAction( i18n("Background Color"), - TKSelectColorAction::FillColor, ac, "backgroundColor", true ); + actions->bgColor = new TTDESelectColorAction( i18n("Background Color"), + TTDESelectColorAction::FillColor, ac, "backgroundColor", true ); TQT_BASE_OBJECT_NAME::connect(actions->bgColor, TQT_SIGNAL( activated() ), TQT_TQOBJECT(view), TQT_SLOT( changeBackgroundColor() ) ); actions->bgColor->setDefaultColor(TQColor()); actions->bgColor->setToolTip(i18n("Set the background color.")); - actions->borderLeft = new KAction( i18n("Border Left"), "border_left", + actions->borderLeft = new TDEAction( i18n("Border Left"), "border_left", 0, TQT_TQOBJECT(view), TQT_SLOT( borderLeft() ), ac, "borderLeft" ); actions->borderLeft->setToolTip(i18n("Set a left border to the selected area.")); - actions->borderRight = new KAction( i18n("Border Right"), "border_right", + actions->borderRight = new TDEAction( i18n("Border Right"), "border_right", 0, TQT_TQOBJECT(view), TQT_SLOT( borderRight() ), ac, "borderRight" ); actions->borderRight->setToolTip(i18n("Set a right border to the selected area.")); - actions->borderTop = new KAction( i18n("Border Top"), "border_top", + actions->borderTop = new TDEAction( i18n("Border Top"), "border_top", 0, TQT_TQOBJECT(view), TQT_SLOT( borderTop() ), ac, "borderTop" ); actions->borderTop->setToolTip(i18n("Set a top border to the selected area.")); - actions->borderBottom = new KAction( i18n("Border Bottom"), "border_bottom", + actions->borderBottom = new TDEAction( i18n("Border Bottom"), "border_bottom", 0, TQT_TQOBJECT(view), TQT_SLOT( borderBottom() ), ac, "borderBottom" ); actions->borderBottom->setToolTip(i18n("Set a bottom border to the selected area.")); - actions->borderAll = new KAction( i18n("All Borders"), "border_all", + actions->borderAll = new TDEAction( i18n("All Borders"), "border_all", 0, TQT_TQOBJECT(view), TQT_SLOT( borderAll() ), ac, "borderAll" ); actions->borderAll->setToolTip(i18n("Set a border around all cells in the selected area.")); - actions->borderRemove = new KAction( i18n("Remove Borders"), "border_remove", + actions->borderRemove = new TDEAction( i18n("Remove Borders"), "border_remove", 0, TQT_TQOBJECT(view), TQT_SLOT( borderRemove() ), ac, "borderRemove" ); actions->borderRemove->setToolTip(i18n("Remove all borders in the selected area.")); - actions->borderOutline = new KAction( i18n("Border Outline"), ("border_outline"), + actions->borderOutline = new TDEAction( i18n("Border Outline"), ("border_outline"), 0, TQT_TQOBJECT(view), TQT_SLOT( borderOutline() ), ac, "borderOutline" ); actions->borderOutline->setToolTip(i18n("Set a border to the outline of the selected area.")); - actions->borderColor = new TKSelectColorAction( i18n("Border Color"), - TKSelectColorAction::LineColor, ac, "borderColor" ); + actions->borderColor = new TTDESelectColorAction( i18n("Border Color"), + TTDESelectColorAction::LineColor, ac, "borderColor" ); TQT_BASE_OBJECT_NAME::connect( actions->borderColor, TQT_SIGNAL( activated() ), TQT_TQOBJECT(view), TQT_SLOT( changeBorderColor() ) ); actions->borderColor->setToolTip( i18n( "Select a new border color." ) ); - actions->selectStyle = new KSelectAction( i18n( "St&yle" ), + actions->selectStyle = new TDESelectAction( i18n( "St&yle" ), 0, ac, "stylemenu" ); actions->selectStyle->setToolTip( i18n( "Apply a predefined style to the selected cells." ) ); TQT_BASE_OBJECT_NAME::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), TQT_TQOBJECT(view), TQT_SLOT( styleSelected( const TQString & ) ) ); - actions->createStyle = new KAction( i18n( "Create Style From Cell..." ), + actions->createStyle = new TDEAction( i18n( "Create Style From Cell..." ), 0, TQT_TQOBJECT(view), TQT_SLOT( createStyleFromCell()), ac, "createStyle" ); actions->createStyle->setToolTip( i18n( "Create a new style based on the currently selected cell." ) ); // -- cell operation actions -- - actions->editCell = new KAction( i18n("Modify Cell"),"cell_edit", + actions->editCell = new TDEAction( i18n("Modify Cell"),"cell_edit", TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(view), TQT_SLOT( editCell() ), ac, "editCell" ); actions->editCell->setToolTip(i18n("Edit the highlighted cell.")); - actions->insertCell = new KAction( i18n("Insert Cells..."), "insertcell", + actions->insertCell = new TDEAction( i18n("Insert Cells..."), "insertcell", 0, TQT_TQOBJECT(view), TQT_SLOT( slotInsert() ), ac, "insertCell" ); actions->insertCell->setToolTip(i18n("Insert a blank cell into the spreadsheet.")); - actions->removeCell = new KAction( i18n("Remove Cells..."), "removecell", + actions->removeCell = new TDEAction( i18n("Remove Cells..."), "removecell", 0, TQT_TQOBJECT(view), TQT_SLOT( slotRemove() ), ac, "removeCell" ); actions->removeCell->setToolTip(i18n("Removes the current cell from the spreadsheet.")); - actions->deleteCell = new KAction( i18n("Delete"), "deletecell", + actions->deleteCell = new TDEAction( i18n("Delete"), "deletecell", 0, TQT_TQOBJECT(view), TQT_SLOT( deleteSelection() ), ac, "delete" ); actions->deleteCell->setToolTip(i18n("Delete all contents and formatting of the current cell.")); - actions->mergeCell = new KToolBarPopupAction( i18n("Merge Cells"),"mergecell", + actions->mergeCell = new TDEToolBarPopupAction( i18n("Merge Cells"),"mergecell", 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCell() ), ac, "mergecell" ); actions->mergeCell->setToolTip(i18n("Merge the selected region.")); actions->mergeCell->plug( actions->mergeCell->popupMenu() ); - actions->mergeCellHorizontal = new KAction( i18n("Merge CellsQt::Horizontally"),"mergecell-horizontal", + actions->mergeCellHorizontal = new TDEAction( i18n("Merge CellsQt::Horizontally"),"mergecell-horizontal", 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); actions->mergeCellHorizontal->setToolTip(i18n("Merge the selected region horizontally.")); actions->mergeCellHorizontal->plug( actions->mergeCell->popupMenu() ); - actions->mergeCellVertical = new KAction( i18n("Merge CellsQt::Vertically"),"mergecell-vertical", + actions->mergeCellVertical = new TDEAction( i18n("Merge CellsQt::Vertically"),"mergecell-vertical", 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); actions->mergeCellVertical->setToolTip(i18n("Merge the selected region vertically.")); actions->mergeCellVertical->plug( actions->mergeCell->popupMenu() ); - actions->dissociateCell = new KAction( i18n("Dissociate Cells"),"dissociatecell", + actions->dissociateCell = new TDEAction( i18n("Dissociate Cells"),"dissociatecell", 0, TQT_TQOBJECT(view), TQT_SLOT( dissociateCell() ), ac, "dissociatecell" ); actions->dissociateCell->setToolTip(i18n("Unmerge the selected region.")); - actions->clearText = new KAction( i18n("Text"), + actions->clearText = new TDEAction( i18n("Text"), 0, TQT_TQOBJECT(view), TQT_SLOT( clearTextSelection() ), ac, "cleartext" ); actions->clearText->setToolTip(i18n("Remove the contents of the current cell.")); - actions->conditional = new KAction( i18n("Conditional Cell Attributes..."), + actions->conditional = new TDEAction( i18n("Conditional Cell Attributes..."), 0, TQT_TQOBJECT(view), TQT_SLOT( conditional() ), ac, "conditional" ); actions->conditional->setToolTip(i18n("Set cell format based on certain conditions.")); - actions->clearConditional = new KAction( i18n("Conditional Cell Attributes"), + actions->clearConditional = new TDEAction( i18n("Conditional Cell Attributes"), 0, TQT_TQOBJECT(view), TQT_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); actions->clearConditional->setToolTip(i18n("Remove the conditional cell formatting.")); - actions->validity = new KAction( i18n("Validity..."), + actions->validity = new TDEAction( i18n("Validity..."), 0, TQT_TQOBJECT(view), TQT_SLOT( validity() ), ac, "validity" ); actions->validity->setToolTip(i18n("Set tests to confirm cell data is valid.")); - actions->clearValidity = new KAction( i18n("Validity"), + actions->clearValidity = new TDEAction( i18n("Validity"), 0, TQT_TQOBJECT(view), TQT_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); actions->clearValidity->setToolTip(i18n("Remove the validity tests on this cell.")); - actions->addModifyComment = new KAction( i18n("&Add/Modify Comment..."),"comment", + actions->addModifyComment = new TDEAction( i18n("&Add/Modify Comment..."),"comment", 0, TQT_TQOBJECT(view), TQT_SLOT( addModifyComment() ), ac, "addmodifycomment" ); actions->addModifyComment->setToolTip(i18n("Edit a comment for this cell.")); - actions->removeComment = new KAction( i18n("&Remove Comment"),"removecomment", + actions->removeComment = new TDEAction( i18n("&Remove Comment"),"removecomment", 0, TQT_TQOBJECT(view), TQT_SLOT( removeComment() ), ac, "removecomment" ); actions->removeComment->setToolTip(i18n("Remove this cell's comment.")); - actions->clearComment = new KAction( i18n("Comment"), + actions->clearComment = new TDEAction( i18n("Comment"), 0, TQT_TQOBJECT(view), TQT_SLOT( clearCommentSelection() ), ac, "clearcomment" ); actions->clearComment->setToolTip(i18n("Remove this cell's comment.")); // -- column & row actions -- - actions->resizeColumn = new KAction( i18n("Resize Column..."), "resizecol", + actions->resizeColumn = new TDEAction( i18n("Resize Column..."), "resizecol", 0, TQT_TQOBJECT(view), TQT_SLOT( resizeColumn() ), ac, "resizeCol" ); actions->resizeColumn->setToolTip(i18n("Change the width of a column.")); - actions->insertColumn = new KAction( i18n("Insert Columns"), "insert_table_col", + actions->insertColumn = new TDEAction( i18n("Insert Columns"), "insert_table_col", 0, TQT_TQOBJECT(view), TQT_SLOT( insertColumn() ), ac, "insertColumn" ); actions->insertColumn->setToolTip(i18n("Inserts a new column into the spreadsheet.")); - actions->deleteColumn = new KAction( i18n("Delete Columns"), "delete_table_col", + actions->deleteColumn = new TDEAction( i18n("Delete Columns"), "delete_table_col", 0, TQT_TQOBJECT(view), TQT_SLOT( deleteColumn() ), ac, "deleteColumn" ); actions->deleteColumn->setToolTip(i18n("Removes a column from the spreadsheet.")); - actions->hideColumn = new KAction( i18n("Hide Columns"), "hide_table_column", + actions->hideColumn = new TDEAction( i18n("Hide Columns"), "hide_table_column", 0, TQT_TQOBJECT(view), TQT_SLOT( hideColumn() ), ac, "hideColumn" ); actions->hideColumn->setToolTip(i18n("Hide the column from view.")); - actions->showColumn = new KAction( i18n("Show Columns..."), "show_table_column", + actions->showColumn = new TDEAction( i18n("Show Columns..."), "show_table_column", 0, TQT_TQOBJECT(view), TQT_SLOT( showColumn() ), ac, "showColumn" ); actions->showColumn->setToolTip(i18n("Show hidden columns.")); - actions->equalizeColumn = new KAction( i18n("Equalize Column"), "adjustcol", + actions->equalizeColumn = new TDEAction( i18n("Equalize Column"), "adjustcol", 0, TQT_TQOBJECT(view), TQT_SLOT( equalizeColumn() ), ac, "equalizeCol" ); actions->equalizeColumn->setToolTip(i18n("Resizes selected columns to be the same size.")); - actions->showSelColumns = new KAction( i18n("Show Columns"), "show_sheet_column", + actions->showSelColumns = new TDEAction( i18n("Show Columns"), "show_sheet_column", 0, TQT_TQOBJECT(view), TQT_SLOT( showSelColumns() ), ac, "showSelColumns" ); actions->showSelColumns->setToolTip(i18n("Show hidden columns in the selection.")); actions->showSelColumns->setEnabled(false); - actions->resizeRow = new KAction( i18n("Resize Row..."), "resizerow", + actions->resizeRow = new TDEAction( i18n("Resize Row..."), "resizerow", 0, TQT_TQOBJECT(view), TQT_SLOT( resizeRow() ), ac, "resizeRow" ); actions->resizeRow->setToolTip(i18n("Change the height of a row.")); - actions->insertRow = new KAction( i18n("Insert Rows"), "insert_table_row", + actions->insertRow = new TDEAction( i18n("Insert Rows"), "insert_table_row", 0, TQT_TQOBJECT(view), TQT_SLOT( insertRow() ), ac, "insertRow" ); actions->insertRow->setToolTip(i18n("Inserts a new row into the spreadsheet.")); - actions->deleteRow = new KAction( i18n("Delete Rows"), "delete_table_row", + actions->deleteRow = new TDEAction( i18n("Delete Rows"), "delete_table_row", 0, TQT_TQOBJECT(view), TQT_SLOT( deleteRow() ), ac, "deleteRow" ); actions->deleteRow->setToolTip(i18n("Removes a row from the spreadsheet.")); - actions->hideRow = new KAction( i18n("Hide Rows"), "hide_table_row", + actions->hideRow = new TDEAction( i18n("Hide Rows"), "hide_table_row", 0, TQT_TQOBJECT(view), TQT_SLOT( hideRow() ), ac, "hideRow" ); actions->hideRow->setToolTip(i18n("Hide a row from view.")); - actions->showRow = new KAction( i18n("Show Rows..."), "show_table_row", + actions->showRow = new TDEAction( i18n("Show Rows..."), "show_table_row", 0, TQT_TQOBJECT(view), TQT_SLOT( showRow() ), ac, "showRow" ); actions->showRow->setToolTip(i18n("Show hidden rows.")); - actions->equalizeRow = new KAction( i18n("Equalize Row"), "adjustrow", + actions->equalizeRow = new TDEAction( i18n("Equalize Row"), "adjustrow", 0, TQT_TQOBJECT(view), TQT_SLOT( equalizeRow() ), ac, "equalizeRow" ); actions->equalizeRow->setToolTip(i18n("Resizes selected rows to be the same size.")); - actions->showSelRows = new KAction( i18n("Show Rows"), "show_table_row", + actions->showSelRows = new TDEAction( i18n("Show Rows"), "show_table_row", 0, TQT_TQOBJECT(view), TQT_SLOT( showSelRows() ), ac, "showSelRows" ); actions->showSelRows->setEnabled(false); actions->showSelRows->setToolTip(i18n("Show hidden rows in the selection.")); - actions->adjust = new KAction( i18n("Adjust Row && Column"), + actions->adjust = new TDEAction( i18n("Adjust Row && Column"), 0, TQT_TQOBJECT(view), TQT_SLOT( adjust() ), ac, "adjust" ); actions->adjust->setToolTip(i18n("Adjusts row/column size so that the contents will fit.")); // -- sheet/workbook actions -- - actions->sheetProperties = new KAction( i18n("Sheet Properties"), + actions->sheetProperties = new TDEAction( i18n("Sheet Properties"), 0, TQT_TQOBJECT(view), TQT_SLOT( sheetProperties() ), ac, "sheetProperties" ); actions->sheetProperties->setToolTip(i18n("Modify current sheet's properties.")); - actions->insertSheet = new KAction( i18n("Insert Sheet"),"inserttable", + actions->insertSheet = new TDEAction( i18n("Insert Sheet"),"inserttable", 0, TQT_TQOBJECT(view), TQT_SLOT( insertSheet() ), ac, "insertSheet" ); actions->insertSheet->setToolTip(i18n("Insert a new sheet.")); // same action as insertSheet, but without 'insert' in the caption - actions->menuInsertSheet = new KAction( i18n("&Sheet"),"inserttable", + actions->menuInsertSheet = new TDEAction( i18n("&Sheet"),"inserttable", 0, TQT_TQOBJECT(view), TQT_SLOT( insertSheet() ), ac, "menuInsertSheet" ); actions->menuInsertSheet->setToolTip(i18n("Insert a new sheet.")); - actions->removeSheet = new KAction( i18n("Remove Sheet"), "delete_table", + actions->removeSheet = new TDEAction( i18n("Remove Sheet"), "delete_table", 0, TQT_TQOBJECT(view), TQT_SLOT( removeSheet() ), ac, "removeSheet" ); actions->removeSheet->setToolTip(i18n("Remove the active sheet.")); - actions->renameSheet=new KAction( i18n("Rename Sheet..."), + actions->renameSheet=new TDEAction( i18n("Rename Sheet..."), 0, TQT_TQOBJECT(view), TQT_SLOT( slotRename() ), ac, "renameSheet" ); actions->renameSheet->setToolTip(i18n("Rename the active sheet.")); - actions->showSheet = new KAction(i18n("Show Sheet..."), + actions->showSheet = new TDEAction(i18n("Show Sheet..."), 0, TQT_TQOBJECT(view), TQT_SLOT( showSheet()), ac, "showSheet" ); actions->showSheet->setToolTip(i18n("Show a hidden sheet.")); - actions->hideSheet = new KAction(i18n("Hide Sheet"), + actions->hideSheet = new TDEAction(i18n("Hide Sheet"), 0, TQT_TQOBJECT(view), TQT_SLOT( hideSheet() ), ac, "hideSheet" ); actions->hideSheet->setToolTip(i18n("Hide the active sheet.")); - actions->autoFormat = new KAction( i18n("AutoFormat..."), + actions->autoFormat = new TDEAction( i18n("AutoFormat..."), 0, TQT_TQOBJECT(view), TQT_SLOT( sheetFormat() ), ac, "sheetFormat" ); actions->autoFormat->setToolTip(i18n("Set the worksheet formatting.")); - actions->areaName = new KAction( i18n("Area Name..."), + actions->areaName = new TDEAction( i18n("Area Name..."), 0, TQT_TQOBJECT(view), TQT_SLOT( setAreaName() ), ac, "areaname" ); actions->areaName->setToolTip(i18n("Set a name for a region of the spreadsheet.")); - actions->showArea = new KAction( i18n("Show Area..."), + actions->showArea = new TDEAction( i18n("Show Area..."), 0, TQT_TQOBJECT(view), TQT_SLOT( showAreaName() ), ac, "showArea" ); actions->showArea->setToolTip(i18n("Display a named area.")); - actions->insertFunction = new KAction( i18n("&Function..."), "funct", + actions->insertFunction = new TDEAction( i18n("&Function..."), "funct", 0, TQT_TQOBJECT(view), TQT_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); actions->insertFunction->setToolTip(i18n("Insert math expression.")); - actions->insertSeries = new KAction( i18n("&Series..."),"series", + actions->insertSeries = new TDEAction( i18n("&Series..."),"series", 0, TQT_TQOBJECT(view), TQT_SLOT( insertSeries() ), ac, "series"); actions->insertSeries ->setToolTip(i18n("Insert a series.")); - actions->insertLink = new KAction( i18n("&Link..."), "insert_link", + actions->insertLink = new TDEAction( i18n("&Link..."), "insert_link", 0, TQT_TQOBJECT(view), TQT_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); actions->insertLink->setToolTip(i18n("Insert an Internet hyperlink.")); - actions->removeLink = new KAction( i18n("&Remove Link"), + actions->removeLink = new TDEAction( i18n("&Remove Link"), 0, TQT_TQOBJECT(view), TQT_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); actions->removeLink->setToolTip(i18n("Remove a link.")); - actions->insertSpecialChar = new KAction( i18n( "S&pecial Character..." ), "char", + actions->insertSpecialChar = new TDEAction( i18n( "S&pecial Character..." ), "char", TQT_TQOBJECT(view), TQT_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); actions->insertSpecialChar->setToolTip( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); @@ -870,79 +870,79 @@ void View::Private::initActions() TQT_TQOBJECT(view), TQT_SLOT( insertObject() ), ac, "insertPart"); actions->insertPart->setToolTip(i18n("Insert an object from another program.")); - actions->insertChartFrame = new KToggleAction( i18n("&Chart"), "insert_chart", + actions->insertChartFrame = new TDEToggleAction( i18n("&Chart"), "insert_chart", 0, TQT_TQOBJECT(view), TQT_SLOT( insertChart() ), ac, "insertChart" ); actions->insertChartFrame->setToolTip(i18n("Insert a chart.")); - actions->insertPicture = new KAction( i18n("&Picture"), + actions->insertPicture = new TDEAction( i18n("&Picture"), 0, TQT_TQOBJECT(view), TQT_SLOT( insertPicture() ), ac, "insertPicture" ); actions->insertPicture->setToolTip(i18n("Insert a picture.")); #ifndef TQT_NO_SQL - actions->insertFromDatabase = new KAction( i18n("From &Database..."), + actions->insertFromDatabase = new TDEAction( i18n("From &Database..."), 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); actions->insertFromDatabase->setToolTip(i18n("Insert data from a SQL database.")); #endif - actions->insertFromTextfile = new KAction( i18n("From &Text File..."), + actions->insertFromTextfile = new TDEAction( i18n("From &Text File..."), 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); actions->insertFromTextfile->setToolTip(i18n("Insert data from a text file to the current cursor position/selection.")); - actions->insertFromClipboard = new KAction( i18n("From &Clipboard..."), + actions->insertFromClipboard = new TDEAction( i18n("From &Clipboard..."), 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); actions->insertFromClipboard->setToolTip(i18n("Insert CSV data from the clipboard to the current cursor position/selection.")); -// actions->transform = new KAction( i18n("Transform Object..."), "rotate", +// actions->transform = new TDEAction( i18n("Transform Object..."), "rotate", // 0, TQT_TQOBJECT(view), TQT_SLOT( transformPart() ), ac, "transform" ); // actions->transform->setToolTip(i18n("Rotate the contents of the cell.")); // actions->transform->setEnabled( false ); - actions->sort = new KAction( i18n("&Sort..."), + actions->sort = new TDEAction( i18n("&Sort..."), 0, TQT_TQOBJECT(view), TQT_SLOT( sort() ), ac, "sort" ); actions->sort->setToolTip(i18n("Sort a group of cells.")); - actions->sortDec = new KAction( i18n("Sort &Decreasing"), "sort_decrease", + actions->sortDec = new TDEAction( i18n("Sort &Decreasing"), "sort_decrease", 0, TQT_TQOBJECT(view), TQT_SLOT( sortDec() ), ac, "sortDec" ); actions->sortDec->setToolTip(i18n("Sort a group of cells in decreasing (last to first) order.")); - actions->sortInc = new KAction( i18n("Sort &Increasing"), "sort_incr", + actions->sortInc = new TDEAction( i18n("Sort &Increasing"), "sort_incr", 0, TQT_TQOBJECT(view), TQT_SLOT( sortInc() ), ac, "sortInc" ); actions->sortInc->setToolTip(i18n("Sort a group of cells in ascending (first to last) order.")); - actions->paperLayout = new KAction( i18n("Page Layout..."), + actions->paperLayout = new TDEAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout.")); - actions->definePrintRange = new KAction( i18n("Define Print Range"), + actions->definePrintRange = new TDEAction( i18n("Define Print Range"), 0, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); - actions->resetPrintRange = new KAction( i18n("Reset Print Range"), + actions->resetPrintRange = new TDEAction( i18n("Reset Print Range"), 0, TQT_TQOBJECT(view), TQT_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); - actions->showPageBorders = new KToggleAction( i18n("Show Page Borders"), + actions->showPageBorders = new TDEToggleAction( i18n("Show Page Borders"), 0, ac, "showPageBorders"); actions->showPageBorders->setCheckedState(i18n("Hide Page Borders")); TQT_BASE_OBJECT_NAME::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( togglePageBorders( bool ) ) ); actions->showPageBorders->setToolTip( i18n( "Show on the spreadsheet where the page borders will be." ) ); - actions->recalcWorksheet = new KAction( i18n("Recalculate Sheet"), + actions->recalcWorksheet = new TDEAction( i18n("Recalculate Sheet"), TQt::SHIFT + TQt::Key_F9, TQT_TQOBJECT(view), TQT_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); actions->recalcWorksheet->setToolTip(i18n("Recalculate the value of every cell in the current worksheet.")); - actions->recalcWorkbook = new KAction( i18n("Recalculate Document"), + actions->recalcWorkbook = new TDEAction( i18n("Recalculate Document"), TQt::Key_F9, TQT_TQOBJECT(view), TQT_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); actions->recalcWorkbook->setToolTip(i18n("Recalculate the value of every cell in all worksheets.")); - actions->protectSheet = new KToggleAction( i18n( "Protect &Sheet..." ), + actions->protectSheet = new TDEToggleAction( i18n( "Protect &Sheet..." ), 0, ac, "protectSheet" ); actions->protectSheet->setToolTip( i18n( "Protect the sheet from being modified." ) ); TQT_BASE_OBJECT_NAME::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( toggleProtectSheet( bool ) ) ); - actions->protectDoc = new KToggleAction( i18n( "Protect &Document..." ), + actions->protectDoc = new TDEToggleAction( i18n( "Protect &Document..." ), 0, ac, "protectDoc" ); actions->protectDoc->setToolTip( i18n( "Protect the document from being modified." ) ); TQT_BASE_OBJECT_NAME::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), @@ -959,11 +959,11 @@ void View::Private::initActions() actions->cut = KStdAction::cut( TQT_TQOBJECT(view), TQT_SLOT( cutSelection() ), ac, "cut" ); actions->cut->setToolTip(i18n("Move the cell object to the clipboard.")); - actions->specialPaste = new KAction( i18n("Special Paste..."), "special_paste", + actions->specialPaste = new TDEAction( i18n("Special Paste..."), "special_paste", 0, TQT_TQOBJECT(view), TQT_SLOT( specialPaste() ), ac, "specialPaste" ); actions->specialPaste->setToolTip(i18n("Paste the contents of the clipboard with special options.")); - actions->insertCellCopy = new KAction( i18n("Paste with Insertion"), "insertcellcopy", + actions->insertCellCopy = new TDEAction( i18n("Paste with Insertion"), "insertcellcopy", 0, TQT_TQOBJECT(view), TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); actions->insertCellCopy->setToolTip(i18n("Inserts a cell from the clipboard into the spreadsheet.")); @@ -973,25 +973,25 @@ void View::Private::initActions() actions->replace = KStdAction::replace( TQT_TQOBJECT(view), TQT_SLOT(replace()), ac ); - actions->fillRight = new KAction( i18n( "&Right" ), 0, + actions->fillRight = new TDEAction( i18n( "&Right" ), 0, 0, TQT_TQOBJECT(view), TQT_SLOT( fillRight() ), ac, "fillRight" ); - actions->fillLeft = new KAction( i18n( "&Left" ), 0, + actions->fillLeft = new TDEAction( i18n( "&Left" ), 0, 0, TQT_TQOBJECT(view), TQT_SLOT( fillLeft() ), ac, "fillLeft" ); - actions->fillDown = new KAction( i18n( "&Down" ), 0, + actions->fillDown = new TDEAction( i18n( "&Down" ), 0, 0, TQT_TQOBJECT(view), TQT_SLOT( fillDown() ), ac, "fillDown" ); - actions->fillUp = new KAction( i18n( "&Up" ), 0, + actions->fillUp = new TDEAction( i18n( "&Up" ), 0, 0, TQT_TQOBJECT(view), TQT_SLOT( fillUp() ), ac, "fillUp" ); // -- misc actions -- - actions->styleDialog = new KAction( i18n( "Style Manager" ), + actions->styleDialog = new TDEAction( i18n( "Style Manager" ), 0, TQT_TQOBJECT(view), TQT_SLOT( styleDialog() ), ac, "styles" ); actions->styleDialog->setToolTip( i18n( "Edit and organize cell styles." ) ); - actions->autoSum = new KAction( i18n("Autosum"), "black_sum", + actions->autoSum = new TDEAction( i18n("Autosum"), "black_sum", 0, TQT_TQOBJECT(view), TQT_SLOT( autoSum() ), ac, "autoSum" ); actions->autoSum->setToolTip(i18n("Insert the 'sum' function")); @@ -999,7 +999,7 @@ void View::Private::initActions() ac, "spelling" ); actions->spellChecking->setToolTip(i18n("Check the spelling.")); - actions->formulaSelection = new KSelectAction(i18n("Formula Selection"), + actions->formulaSelection = new TDESelectAction(i18n("Formula Selection"), 0, ac, "formulaSelection"); actions->formulaSelection->setToolTip(i18n("Insert a function.")); TQStringList lst; @@ -1010,7 +1010,7 @@ void View::Private::initActions() lst.append( "MIN"); lst.append( "MAX"); lst.append( i18n("Others...") ); - ((KSelectAction*) actions->formulaSelection)->setItems( lst ); + ((TDESelectAction*) actions->formulaSelection)->setItems( lst ); actions->formulaSelection->setComboWidth( 80 ); actions->formulaSelection->setCurrentItem(0); TQT_BASE_OBJECT_NAME::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), @@ -1020,121 +1020,121 @@ void View::Private::initActions() TQT_BASE_OBJECT_NAME::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), TQT_TQOBJECT(view), TQT_SLOT( viewZoom( const TQString & ) ) ); - actions->consolidate = new KAction( i18n("&Consolidate..."), + actions->consolidate = new TDEAction( i18n("&Consolidate..."), 0, TQT_TQOBJECT(view), TQT_SLOT( consolidate() ), ac, "consolidate" ); actions->consolidate->setToolTip(i18n("Create a region of summary data from a group of similar regions.")); - actions->goalSeek = new KAction( i18n("&Goal Seek..."), + actions->goalSeek = new TDEAction( i18n("&Goal Seek..."), 0, TQT_TQOBJECT(view), TQT_SLOT( goalSeek() ), ac, "goalSeek" ); actions->goalSeek->setToolTip( i18n("Repeating calculation to find a specific value.") ); - actions->subTotals = new KAction( i18n("&Subtotals..."), + actions->subTotals = new TDEAction( i18n("&Subtotals..."), 0, TQT_TQOBJECT(view), TQT_SLOT( subtotals() ), ac, "subtotals" ); actions->subTotals->setToolTip( i18n("Create different kind of subtotals to a list or database.") ); - actions->textToColumns = new KAction( i18n("&Text to Columns..."), + actions->textToColumns = new TDEAction( i18n("&Text to Columns..."), 0, TQT_TQOBJECT(view), TQT_SLOT( textToColumns() ), ac, "textToColumns" ); actions->textToColumns->setToolTip( i18n("Expand the content of cells to multiple columns.") ); - actions->multipleOperations = new KAction( i18n("&Multiple Operations..."), + actions->multipleOperations = new TDEAction( i18n("&Multiple Operations..."), 0, TQT_TQOBJECT(view), TQT_SLOT( multipleOperations() ), ac, "multipleOperations" ); actions->multipleOperations->setToolTip( i18n("Apply the same formula to various cells using different values for the parameter.") ); - actions->createTemplate = new KAction( i18n( "&Create Template From Document..." ), + actions->createTemplate = new TDEAction( i18n( "&Create Template From Document..." ), 0, TQT_TQOBJECT(view), TQT_SLOT( createTemplate() ), ac, "createTemplate" ); - actions->customList = new KAction( i18n("Custom Lists..."), + actions->customList = new TDEAction( i18n("Custom Lists..."), 0, TQT_TQOBJECT(view), TQT_SLOT( sortList() ), ac, "sortlist" ); actions->customList->setToolTip(i18n("Create custom lists for sorting or autofill.")); // -- navigation actions -- - actions->gotoCell = new KAction( i18n("Goto Cell..."),"goto", + actions->gotoCell = new TDEAction( i18n("Goto Cell..."),"goto", 0, TQT_TQOBJECT(view), TQT_SLOT( gotoCell() ), ac, "gotoCell" ); actions->gotoCell->setToolTip(i18n("Move to a particular cell.")); - actions->nextSheet = new KAction( i18n("Next Sheet"), "forward", + actions->nextSheet = new TDEAction( i18n("Next Sheet"), "forward", TQt::CTRL+TQt::Key_PageDown, TQT_TQOBJECT(view), TQT_SLOT( nextSheet() ), ac, "nextSheet"); actions->nextSheet->setToolTip(i18n("Move to the next sheet.")); - actions->prevSheet = new KAction( i18n("Previous Sheet"), "back", + actions->prevSheet = new TDEAction( i18n("Previous Sheet"), "back", TQt::CTRL+TQt::Key_PageUp, TQT_TQOBJECT(view), TQT_SLOT( previousSheet() ), ac, "previousSheet"); actions->prevSheet->setToolTip(i18n("Move to the previous sheet.")); - actions->firstSheet = new KAction( i18n("First Sheet"), "start", + actions->firstSheet = new TDEAction( i18n("First Sheet"), "start", 0, TQT_TQOBJECT(view), TQT_SLOT( firstSheet() ), ac, "firstSheet"); actions->firstSheet->setToolTip(i18n("Move to the first sheet.")); - actions->lastSheet = new KAction( i18n("Last Sheet"), "finish", + actions->lastSheet = new TDEAction( i18n("Last Sheet"), "finish", 0, TQT_TQOBJECT(view), TQT_SLOT( lastSheet() ), ac, "lastSheet"); actions->lastSheet->setToolTip(i18n("Move to the last sheet.")); // -- settings actions -- - actions->showStatusBar = new KToggleAction( i18n("Show Status Bar"), + actions->showStatusBar = new TDEToggleAction( i18n("Show Status Bar"), 0, ac, "showStatusBar" ); actions->showStatusBar->setCheckedState(i18n("Hide Status Bar")); TQT_BASE_OBJECT_NAME::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( showStatusBar( bool ) ) ); actions->showStatusBar->setToolTip(i18n("Show the status bar.")); - actions->showTabBar = new KToggleAction( i18n("Show Tab Bar"), + actions->showTabBar = new TDEToggleAction( i18n("Show Tab Bar"), 0, ac, "showTabBar" ); actions->showTabBar->setCheckedState(i18n("Hide Tab Bar")); TQT_BASE_OBJECT_NAME::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( showTabBar( bool ) ) ); actions->showTabBar->setToolTip(i18n("Show the tab bar.")); - actions->showFormulaBar = new KToggleAction( i18n("Show Formula Bar"), + actions->showFormulaBar = new TDEToggleAction( i18n("Show Formula Bar"), 0, ac, "showFormulaBar" ); actions->showFormulaBar->setCheckedState(i18n("Hide Formula Bar")); TQT_BASE_OBJECT_NAME::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( showFormulaBar( bool ) ) ); actions->showFormulaBar->setToolTip(i18n("Show the formula bar.")); - actions->preference = new KAction( i18n("Configure KSpread..."),"configure", + actions->preference = new TDEAction( i18n("Configure KSpread..."),"configure", 0, TQT_TQOBJECT(view), TQT_SLOT( preference() ), ac, "preference" ); actions->preference->setToolTip(i18n("Set various KSpread options.")); // -- running calculation actions -- - actions->calcNone = new KToggleAction( i18n("None"), 0, ac, "menu_none"); + actions->calcNone = new TDEToggleAction( i18n("None"), 0, ac, "menu_none"); TQT_BASE_OBJECT_NAME::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcNone->setExclusiveGroup( "Calc" ); actions->calcNone->setToolTip(i18n("No calculation")); - actions->calcSum = new KToggleAction( i18n("Sum"), 0, ac, "menu_sum"); + actions->calcSum = new TDEToggleAction( i18n("Sum"), 0, ac, "menu_sum"); TQT_BASE_OBJECT_NAME::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcSum->setExclusiveGroup( "Calc" ); actions->calcSum->setToolTip(i18n("Calculate using sum.")); - actions->calcMin = new KToggleAction( i18n("Min"), 0, ac, "menu_min"); + actions->calcMin = new TDEToggleAction( i18n("Min"), 0, ac, "menu_min"); TQT_BASE_OBJECT_NAME::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcMin->setExclusiveGroup( "Calc" ); actions->calcMin->setToolTip(i18n("Calculate using minimum.")); - actions->calcMax = new KToggleAction( i18n("Max"), 0, ac, "menu_max"); + actions->calcMax = new TDEToggleAction( i18n("Max"), 0, ac, "menu_max"); TQT_BASE_OBJECT_NAME::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcMax->setExclusiveGroup( "Calc" ); actions->calcMax->setToolTip(i18n("Calculate using maximum.")); - actions->calcAverage = new KToggleAction( i18n("Average"), 0, ac, "menu_average"); + actions->calcAverage = new TDEToggleAction( i18n("Average"), 0, ac, "menu_average"); TQT_BASE_OBJECT_NAME::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcAverage->setExclusiveGroup( "Calc" ); actions->calcAverage->setToolTip(i18n("Calculate using average.")); - actions->calcCount = new KToggleAction( i18n("Count"), 0, ac, "menu_count"); + actions->calcCount = new TDEToggleAction( i18n("Count"), 0, ac, "menu_count"); TQT_BASE_OBJECT_NAME::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcCount->setExclusiveGroup( "Calc" ); actions->calcCount->setToolTip(i18n("Calculate using the count.")); - actions->calcCountA = new KToggleAction( i18n("CountA"), 0, ac, "menu_counta"); + actions->calcCountA = new TDEToggleAction( i18n("CountA"), 0, ac, "menu_counta"); TQT_BASE_OBJECT_NAME::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcCountA->setExclusiveGroup( "Calc" ); @@ -1142,9 +1142,9 @@ void View::Private::initActions() // -- special action, only for developers -- - actions->internalTests = new KAction( i18n("Run Internal Tests..."), "internalTests", + actions->internalTests = new TDEAction( i18n("Run Internal Tests..."), "internalTests", TQt::CTRL+ TQt::SHIFT + TQt::Key_T, TQT_TQOBJECT(view), TQT_SLOT( runInternalTests() ), ac, "internalTests" ); - actions->inspector = new KAction( i18n("Run Inspector..."), "inspector", + actions->inspector = new TDEAction( i18n("Run Inspector..."), "inspector", TQt::CTRL+ TQt::SHIFT + TQt::Key_I, TQT_TQOBJECT(view), TQT_SLOT( runInspector() ), ac, "inspector" ); m_propertyEditor = 0; @@ -1345,7 +1345,7 @@ void View::Private::updateButton( Cell *cell, int column, int row) // certain TQt and Fontconfig combination fail miserably if can not // find the font name (e.g. not installed in the system) TQStringList fontList; - KFontChooser::getFontList( fontList, 0 ); + TDEFontChooser::getFontList( fontList, 0 ); TQString fontFamily = cell->format()->textFontFamily( column,row ); for ( TQStringList::Iterator it = fontList.begin(); it != fontList.end(); ++it ) if ((*it).lower() == fontFamily.lower()) @@ -2818,9 +2818,9 @@ void View::updateReadWrite( bool readwrite ) // d->okButton->setEnabled( readwrite ); d->editWidget->setEnabled( readwrite ); - TQValueList actions = actionCollection()->actions(); - TQValueList::ConstIterator aIt = actions.begin(); - TQValueList::ConstIterator aEnd = actions.end(); + TQValueList actions = actionCollection()->actions(); + TQValueList::ConstIterator aIt = actions.begin(); + TQValueList::ConstIterator aEnd = actions.end(); for (; aIt != aEnd; ++aIt ) (*aIt)->setEnabled( readwrite ); @@ -3060,13 +3060,13 @@ void View::helpUsing() void View::enableUndo( bool _b ) { - KAction* action = actionCollection()->action( "office_undo" ); + TDEAction* action = actionCollection()->action( "office_undo" ); if( action ) action->setEnabled( _b ); } void View::enableRedo( bool _b ) { - KAction* action = actionCollection()->action( "office_redo" ); + TDEAction* action = actionCollection()->action( "office_redo" ); if( action ) action->setEnabled( _b ); } diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp index 5bab1541..31e8ea78 100644 --- a/kspread/plugins/calculator/main.cpp +++ b/kspread/plugins/calculator/main.cpp @@ -86,7 +86,7 @@ Calculator::Calculator( View* parent, const char* name ) TDEGlobal::locale()->insertCatalogue("kspreadcalc_calc"); parent->installEventFilter( this ); - (void)new KAction( i18n("Calculator"), SmallIcon("kcalc", CalcFactory::global()), + (void)new TDEAction( i18n("Calculator"), SmallIcon("kcalc", CalcFactory::global()), 0, this, TQT_SLOT( showCalculator() ), actionCollection(), "kspreadcalc"); } diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc index 9ad856f9..f2ea90a2 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc @@ -73,7 +73,7 @@ PluginInsertCalendar::PluginInsertCalendar( TQObject *parent, const char *name, this->m_dialog = NULL; - (void)new KAction( i18n("Insert Calendar..."), KShortcut::null(), + (void)new TDEAction( i18n("Insert Calendar..."), TDEShortcut::null(), this, TQT_SLOT( slotShowDialog() ), actionCollection(), "kspreadinsertcalendar"); } diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc index a919b31d..040bd98d 100644 --- a/kspread/plugins/scripting/scripting.cc +++ b/kspread/plugins/scripting/scripting.cc @@ -58,10 +58,10 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) setXMLFile(locate("data","kspread/kpartplugins/scripting.rc"), true); - new KAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); - new KAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); - KAction* scriptmenuaction = m_scriptguiclient->action("installedscripts"); + TDEAction* scriptmenuaction = m_scriptguiclient->action("installedscripts"); actionCollection()->insert(scriptmenuaction); connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index 991d8304..a4a35e38 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -182,45 +182,45 @@ void KudesignerView::initActions() copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection() ); pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection() ); selectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), actionCollection() ); - deleteAction = new KAction( i18n( "Delete" ), "editdelete", 0, TQT_TQOBJECT(this), + deleteAction = new TDEAction( i18n( "Delete" ), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteItems() ), actionCollection(), "edit_delete" ); cutAction->setEnabled( false ); copyAction->setEnabled( false ); pasteAction->setEnabled( false ); // deleteAction->setEnabled(false); - sectionsReportHeader = new KAction( i18n( "Report Header" ), "irh", 0, TQT_TQOBJECT(this), + sectionsReportHeader = new TDEAction( i18n( "Report Header" ), "irh", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddReportHeader() ), actionCollection(), "rheader" ); - sectionsReportFooter = new KAction( i18n( "Report Footer" ), "irf", 0, TQT_TQOBJECT(this), + sectionsReportFooter = new TDEAction( i18n( "Report Footer" ), "irf", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddReportFooter() ), actionCollection(), "rfooter" ); - sectionsPageHeader = new KAction( i18n( "Page Header" ), "iph", 0, TQT_TQOBJECT(this), + sectionsPageHeader = new TDEAction( i18n( "Page Header" ), "iph", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddPageHeader() ), actionCollection(), "pheader" ); - sectionsPageFooter = new KAction( i18n( "Page Footer" ), "ipf", 0, TQT_TQOBJECT(this), + sectionsPageFooter = new TDEAction( i18n( "Page Footer" ), "ipf", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddPageFooter() ), actionCollection(), "pfooter" ); - sectionsDetailHeader = new KAction( i18n( "Detail Header" ), "idh", 0, TQT_TQOBJECT(this), + sectionsDetailHeader = new TDEAction( i18n( "Detail Header" ), "idh", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddDetailHeader() ), actionCollection(), "dheader" ); - sectionsDetail = new KAction( i18n( "Detail" ), "id", 0, TQT_TQOBJECT(this), + sectionsDetail = new TDEAction( i18n( "Detail" ), "id", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddDetail() ), actionCollection(), "detail" ); - sectionsDetailFooter = new KAction( i18n( "Detail Footer" ), "idf", 0, TQT_TQOBJECT(this), + sectionsDetailFooter = new TDEAction( i18n( "Detail Footer" ), "idf", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddDetailFooter() ), actionCollection(), "dfooter" ); - itemsNothing = new KRadioAction( i18n( "Clear Selection" ), "frame_edit", 0, TQT_TQOBJECT(this), + itemsNothing = new TDERadioAction( i18n( "Clear Selection" ), "frame_edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddItemNothing() ), actionCollection(), "nothing" ); itemsNothing->setExclusiveGroup( "itemsToolBar" ); itemsNothing->setChecked( true ); - itemsLabel = new KRadioAction( i18n( "Label" ), "frame_text", 0, TQT_TQOBJECT(this), + itemsLabel = new TDERadioAction( i18n( "Label" ), "frame_text", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddItemLabel() ), actionCollection(), "label" ); itemsLabel->setExclusiveGroup( "itemsToolBar" ); - itemsField = new KRadioAction( i18n( "Field" ), "frame_field", 0, TQT_TQOBJECT(this), + itemsField = new TDERadioAction( i18n( "Field" ), "frame_field", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddItemField() ), actionCollection(), "field" ); itemsField->setExclusiveGroup( "itemsToolBar" ); - itemsSpecial = new KRadioAction( i18n( "Special Field" ), "frame_query", 0, TQT_TQOBJECT(this), + itemsSpecial = new TDERadioAction( i18n( "Special Field" ), "frame_query", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddItemSpecial() ), actionCollection(), "special" ); itemsSpecial->setExclusiveGroup( "itemsToolBar" ); - itemsCalculated = new KRadioAction( i18n( "Calculated Field" ), "frame_formula", 0, TQT_TQOBJECT(this), + itemsCalculated = new TDERadioAction( i18n( "Calculated Field" ), "frame_formula", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddItemCalculated() ), actionCollection(), "calcfield" ); itemsCalculated->setExclusiveGroup( "itemsToolBar" ); - itemsLine = new KRadioAction( i18n( "Line" ), "frame_chart", 0, TQT_TQOBJECT(this), + itemsLine = new TDERadioAction( i18n( "Line" ), "frame_chart", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddItemLine() ), actionCollection(), "line" ); itemsLine->setExclusiveGroup( "itemsToolBar" ); diff --git a/kugar/kudesigner/kudesigner_view.h b/kugar/kudesigner/kudesigner_view.h index 387996f5..8eafe0bb 100644 --- a/kugar/kudesigner/kudesigner_view.h +++ b/kugar/kudesigner/kudesigner_view.h @@ -33,8 +33,8 @@ class TQPaintEvent; class TQDockWindow; class TQToolBar; -class KAction; -class KRadioAction; +class TDEAction; +class TDERadioAction; class KWidgetAction; class KudesignerDoc; @@ -108,34 +108,34 @@ private: KudesignerDoc *m_doc; - KAction* sectionsReportHeader; - KAction* sectionsReportFooter; - KAction* sectionsPageFooter; - KAction* sectionsPageHeader; - KAction* sectionsDetailHeader; - KAction* sectionsDetail; - KAction* sectionsDetailFooter; - - KRadioAction* itemsNothing; - KRadioAction* itemsLabel; - KRadioAction* itemsField; - KRadioAction* itemsSpecial; - KRadioAction* itemsCalculated; - KRadioAction* itemsLine; - - KAction* cutAction; - KAction* copyAction; - KAction* pasteAction; - KAction* selectAllAction; - KAction* deleteAction; + TDEAction* sectionsReportHeader; + TDEAction* sectionsReportFooter; + TDEAction* sectionsPageFooter; + TDEAction* sectionsPageHeader; + TDEAction* sectionsDetailHeader; + TDEAction* sectionsDetail; + TDEAction* sectionsDetailFooter; + + TDERadioAction* itemsNothing; + TDERadioAction* itemsLabel; + TDERadioAction* itemsField; + TDERadioAction* itemsSpecial; + TDERadioAction* itemsCalculated; + TDERadioAction* itemsLine; + + TDEAction* cutAction; + TDEAction* copyAction; + TDEAction* pasteAction; + TDEAction* selectAllAction; + TDEAction* deleteAction; KWidgetAction *gridActionLabel; KWidgetAction *gridAction; TQLabel *gridLabel; TQSpinBox *gridBox; - KActionCollection *itemsCollection; - KActionCollection *sectionsCollection; + TDEActionCollection *itemsCollection; + TDEActionCollection *sectionsCollection; }; #endif diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index 01b4289e..a78db689 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -42,14 +42,14 @@ namespace Kudesigner using namespace KoProperty; -class StructureItem: public KListViewItem +class StructureItem: public TDEListViewItem { public: - StructureItem( KListView *parent, const TQString &name ) - : KListViewItem( parent, name ), m_bold( false ) + StructureItem( TDEListView *parent, const TQString &name ) + : TDEListViewItem( parent, name ), m_bold( false ) {} - StructureItem( KListViewItem *parent, const TQString &name ) - : KListViewItem( parent, name ), m_bold( false ) + StructureItem( TDEListViewItem *parent, const TQString &name ) + : TDEListViewItem( parent, name ), m_bold( false ) {} void setBold( bool b ) { @@ -68,7 +68,7 @@ public: f.setWeight( 75 ); p->setFont( f ); } - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); } private: @@ -76,7 +76,7 @@ private: }; StructureWidget::StructureWidget( TQWidget* parent, const char* name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { setFullWidth( true ); addColumn( tr( "Report Structure" ) ); diff --git a/kugar/kudesigner_lib/structurewidget.h b/kugar/kudesigner_lib/structurewidget.h index 177742eb..d81fc833 100644 --- a/kugar/kudesigner_lib/structurewidget.h +++ b/kugar/kudesigner_lib/structurewidget.h @@ -34,7 +34,7 @@ class Band; class Canvas; class StructureItem; -class StructureWidget: public KListView +class StructureWidget: public TDEListView { Q_OBJECT diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 701dc900..1e11eb07 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -917,8 +917,8 @@ void ConfigureDefaultDocPage::slotDefault() void ConfigureDefaultDocPage::selectNewDefaultFont() { TQStringList list; - KFontChooser::getFontList(list, KFontChooser::SmoothScalableFonts); - KFontDialog dlg( (TQWidget *)this->parent(), "Font Selector", false, true, list, true ); + TDEFontChooser::getFontList(list, TDEFontChooser::SmoothScalableFonts); + TDEFontDialog dlg( (TQWidget *)this->parent(), "Font Selector", false, true, list, true ); dlg.setFont(*font); int result = dlg.exec(); if (KDialog::Accepted == result) { @@ -949,7 +949,7 @@ ConfigurePathPage::ConfigurePathPage( KWView *view, TQVBox *box, char *name ) gbPathGroup->setMargin( KDialog::marginHint() ); gbPathGroup->setInsideSpacing( KDialog::spacingHint() ); - m_pPathView = new KListView( gbPathGroup ); + m_pPathView = new TDEListView( gbPathGroup ); m_pPathView->setResizeMode(TQListView::NoColumn); m_pPathView->addColumn( i18n( "Type" ) ); m_pPathView->addColumn( i18n( "Path" ), 400 ); // not too big by default diff --git a/kword/KWConfig.h b/kword/KWConfig.h index ab6d373f..bc864ff8 100644 --- a/kword/KWConfig.h +++ b/kword/KWConfig.h @@ -35,7 +35,7 @@ class TQComboBox; class KIntNumInput; class KCommand; class KWDocument; -class KListView; +class TDEListView; class TQVGroupBox; class TQLabel; @@ -154,7 +154,7 @@ private slots: private: KWView* m_pView; TDEConfig* config; - KListView* m_pPathView; + TDEListView* m_pPathView; TQPushButton *m_modifyPath; }; diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index cf850d14..4a888d39 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -75,17 +75,17 @@ bool KWOrderedFrameSet::operator<( KWOrderedFrameSet ofs ) /******************************************************************/ KWDocListViewItem::KWDocListViewItem(TQListViewItem* parent, const TQString& text) - : KListViewItem(parent, text) + : TDEListViewItem(parent, text) { } KWDocListViewItem::KWDocListViewItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text ) - :KListViewItem(parent, after, text) + :TDEListViewItem(parent, after, text) { } KWDocListViewItem::KWDocListViewItem(TQListView* parent, const TQString& text) - :KListViewItem(parent, text) + :TDEListViewItem(parent, text) { } @@ -382,7 +382,7 @@ void KWDocStructTextFrameSetItem::setupTextFrames() { KWFrame* frame = framePtrs.at(j); TQString name; - if ( KListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP ) + if ( TDEListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP ) { if ( dok->numColumns() == 1 ) name=i18n( "Page %1" ).arg(TQString::number(j + 1)); @@ -823,7 +823,7 @@ void KWDocStructRootItem::setupArrangement() } if ( childCount() == 0 ) - ( void )new KListViewItem( this, i18n( "Empty" ) ); + ( void )new TDEListViewItem( this, i18n( "Empty" ) ); } @@ -881,7 +881,7 @@ void KWDocStructRootItem::setupTextFrameSets() } if ( childCount() == 0 ) - ( void )new KListViewItem( this, i18n( "Empty" ) ); + ( void )new TDEListViewItem( this, i18n( "Empty" ) ); } void KWDocStructRootItem::setupFormulaFrames() @@ -905,7 +905,7 @@ void KWDocStructRootItem::setupFormulaFrames() } if ( childCount() == 0 ) - ( void )new KListViewItem( this, i18n( "Empty" ) ); + ( void )new TDEListViewItem( this, i18n( "Empty" ) ); } void KWDocStructRootItem::setupTables() @@ -959,7 +959,7 @@ void KWDocStructRootItem::setupTables() } if ( childCount() == 0 ) - ( void )new KListViewItem( this, i18n( "Empty" ) ); + ( void )new TDEListViewItem( this, i18n( "Empty" ) ); } void KWDocStructRootItem::setupPictures() @@ -983,7 +983,7 @@ void KWDocStructRootItem::setupPictures() } if ( childCount() == 0 ) - ( void )new KListViewItem( this, i18n( "Empty" ) ); + ( void )new TDEListViewItem( this, i18n( "Empty" ) ); } void KWDocStructRootItem::setupEmbedded() @@ -1007,7 +1007,7 @@ void KWDocStructRootItem::setupEmbedded() } if ( childCount() == 0 ) - ( void )new KListViewItem( this, i18n( "Empty" ) ); + ( void )new TDEListViewItem( this, i18n( "Empty" ) ); } KWDocStructTextFrameSetItem* KWDocStructRootItem::findTextFrameSetItem(const KWFrameSet* frameset) @@ -1047,7 +1047,7 @@ KWDocStructTableItem* KWDocStructRootItem::findTableItem(const KWFrameSet* frame /******************************************************************/ KWDocStructTree::KWDocStructTree(TQWidget* parent, KWDocument* doc, KWGUI* gui) - : KListView(parent), m_doc(doc), m_gui(gui) + : TDEListView(parent), m_doc(doc), m_gui(gui) { embedded = new KWDocStructRootItem( this, i18n( "Embedded Objects" ), Embedded); formulafrms = new KWDocStructRootItem( this, i18n( "Formula Frames" ), FormulaFrames); @@ -1065,8 +1065,8 @@ KWDocStructTree::KWDocStructTree(TQWidget* parent, KWDocument* doc, KWGUI* gui) this, TQT_SLOT( slotReturnPressed(TQListViewItem* )) ); connect( this, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&,int)), this, TQT_SLOT( slotRightButtonClicked(TQListViewItem *, const TQPoint&, int))); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } KWDocStructTree::~KWDocStructTree() @@ -1150,7 +1150,7 @@ void KWDocStructTree::speakItem() tmp->speakItem(); } -void KWDocStructTree::slotContextMenu(KListView* lv, TQListViewItem* i, const TQPoint& p) +void KWDocStructTree::slotContextMenu(TDEListView* lv, TQListViewItem* i, const TQPoint& p) { if (lv != this) return; @@ -1193,14 +1193,14 @@ KWDocStruct::KWDocStruct(TQWidget* parent, KWDocument* doc, KWGUI* gui) { m_layout = new TQVBoxLayout( this ); - KToolBar* searchBar = new KToolBar( this ); + TDEToolBar* searchBar = new TDEToolBar( this ); searchBar->setFlat( true ); searchBar->setMovingEnabled( false ); - KToolBarButton* eraseButton = new KToolBarButton( "locationbar_erase", 0, searchBar ); + TDEToolBarButton* eraseButton = new TDEToolBarButton( "locationbar_erase", 0, searchBar ); m_tree = new KWDocStructTree( this, doc, gui ); m_tree->setAlternateBackground( TDEGlobalSettings::alternateBackgroundColor() ); - KListViewSearchLine* searchLine = new KListViewSearchLine( searchBar, m_tree ); + TDEListViewSearchLine* searchLine = new TDEListViewSearchLine( searchBar, m_tree ); searchBar->setStretchableWidget( searchLine ); connect( eraseButton, TQT_SIGNAL( clicked() ), searchLine, TQT_SLOT( clear() ) ); diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h index 6a586f78..83acd9c1 100644 --- a/kword/KWDocStruct.h +++ b/kword/KWDocStruct.h @@ -51,7 +51,7 @@ private: KWFrameSet* m_frameset; }; -class KWDocListViewItem : public KListViewItem +class KWDocListViewItem : public TDEListViewItem { public: enum ItemType { @@ -279,7 +279,7 @@ protected: /* Class: KWDocStructTree */ /******************************************************************/ -class KWDocStructTree : public KListView +class KWDocStructTree : public TDEListView { Q_OBJECT @@ -303,7 +303,7 @@ public: KWGUI* gui() { return m_gui; }; public slots: - void slotContextMenu(KListView* l, TQListViewItem* i, const TQPoint& p); + void slotContextMenu(TDEListView* l, TQListViewItem* i, const TQPoint& p); void slotRightButtonClicked(TQListViewItem*, const TQPoint&, int); void slotDoubleClicked(TQListViewItem* item); void slotReturnPressed(TQListViewItem* item); diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp index 927b0f13..cdaa15b2 100644 --- a/kword/KWFrameView.cpp +++ b/kword/KWFrameView.cpp @@ -175,14 +175,14 @@ void KWFrameView::paintFrameAttributes(TQPainter *painter, const TQRect &crect, // *********** Policies ********* FramePolicy::FramePolicy(KWFrameView *view) { - m_separator = new KActionSeparator(); + m_separator = new TDEActionSeparator(); m_view = view; } -void FramePolicy::addFloatingAction(KWView *view, TQPtrList &actionList) { +void FramePolicy::addFloatingAction(KWView *view, TQPtrList &actionList) { if(m_view->frame()->frameSet()->isMainFrameset()) return; actionList.append(m_separator); - KToggleAction *action = dynamic_cast (view->actionCollection()-> + TDEToggleAction *action = dynamic_cast (view->actionCollection()-> action("inline_frame")); Q_ASSERT(action); KWFrameSet *parentFs = m_view->frame()->frameSet()->groupmanager() ? @@ -327,12 +327,12 @@ MouseMeaning PartFramePolicy::mouseMeaning( const KoPoint &point, int keyState ) TQPopupMenu* PartFramePolicy::createPopup( const KoPoint &point, KWView *view ) { Q_UNUSED(point); KWPartFrameSet *part = static_cast(m_view->frame()->frameSet()); - KActionSeparator *separator=new KActionSeparator(); - KActionCollection *actionCollection = view->actionCollection(); - TQPtrList actionList; + TDEActionSeparator *separator=new TDEActionSeparator(); + TDEActionCollection *actionCollection = view->actionCollection(); + TQPtrList actionList; actionList.append(separator); if( !part->protectContent() ) { - KToggleAction *action = dynamic_cast(actionCollection->action("embedded_store_internal")); + TDEToggleAction *action = dynamic_cast(actionCollection->action("embedded_store_internal")); Q_ASSERT(action); action->setChecked(part->getChild()->document()->storeInternal()); action->setEnabled(part->getChild()->document()->hasExternURL()); @@ -367,16 +367,16 @@ MouseMeaning TextFramePolicy::mouseMeaning( const KoPoint &point, int keyState ) TQPopupMenu* TextFramePolicy::createPopup( const KoPoint &point, KWView *view ) { if( m_view->isBorderHit(point) ) { KWFrameSet *fs = m_view->frame()->frameSet(); - KActionSeparator *separator=new KActionSeparator(); - KActionCollection *actionCollection = view->actionCollection(); - TQPtrList actionList; + TDEActionSeparator *separator=new TDEActionSeparator(); + TDEActionCollection *actionCollection = view->actionCollection(); + TQPtrList actionList; if(fs->isHeaderOrFooter()) { actionList.append(separator); actionList.append(actionCollection->action("configure_headerfooter")); } else if (fs->isFootEndNote()) { actionList.append(separator); - KAction *action = actionCollection->action("goto_footendnote"); + TDEAction *action = actionCollection->action("goto_footendnote"); action->setText( fs->isFootNote() ? i18n( "Go to Footnote" ) : i18n( "Go to Endnote" ) ); actionList.append(action); @@ -402,8 +402,8 @@ TQPopupMenu* TextFramePolicy::createPopup( const KoPoint &point, KWView *view ) view->unplugActionList( "datatools_link" ); // Those lists are stored in the KWView. Grab a ref to them. - TQPtrList &actionList = view->dataToolActionList(); - TQPtrList &variableList = view->variableActionList(); + TQPtrList &actionList = view->dataToolActionList(); + TQPtrList &variableList = view->variableActionList(); actionList.clear(); variableList.clear(); @@ -443,7 +443,7 @@ TQPopupMenu* TextFramePolicy::createPopup( const KoPoint &point, KWView *view ) return view->popupMenu("footnote_popup"); } if ( singleWord ) { - TQPtrList actionCheckSpellList = view->listOfResultOfCheckWord( word ); + TQPtrList actionCheckSpellList = view->listOfResultOfCheckWord( word ); if ( !actionCheckSpellList.isEmpty() ) { view->plugActionList( "spell_result_action", actionCheckSpellList ); return view->popupMenu("text_popup_spell_with_result"); @@ -464,11 +464,11 @@ MouseMeaning ImageFramePolicy::mouseMeaning( const KoPoint &point, int keyState } TQPopupMenu* ImageFramePolicy::createPopup( const KoPoint &point, KWView *view ) { Q_UNUSED(point); - KActionSeparator *separator=new KActionSeparator(); - KActionCollection *actionCollection = view->actionCollection(); - TQPtrList actionList; + TDEActionSeparator *separator=new TDEActionSeparator(); + TDEActionCollection *actionCollection = view->actionCollection(); + TQPtrList actionList; actionList.append(separator); - KAction *action = actionCollection->action("change_picture"); + TDEAction *action = actionCollection->action("change_picture"); Q_ASSERT(action); actionList.append(action); action = actionCollection->action("save_picture"); diff --git a/kword/KWFrameView.h b/kword/KWFrameView.h index c7017bf7..8fb0b31c 100644 --- a/kword/KWFrameView.h +++ b/kword/KWFrameView.h @@ -26,8 +26,8 @@ class KWView; class KWViewMode; class KoZoomHandler; class KoPoint; -class KActionSeparator; -class KAction; +class TDEActionSeparator; +class TDEAction; class TQPopupMenu; /** @@ -66,10 +66,10 @@ protected: * @param view the parent view widget * @param actionList the list of actions where the floating action should be added to */ - void addFloatingAction(KWView *view, TQPtrList &actionList); + void addFloatingAction(KWView *view, TQPtrList &actionList); KWFrameView *m_view; - KActionSeparator *m_separator; + TDEActionSeparator *m_separator; friend class KWFrameView; // so it can call mouseMeaningOnBorder which assumes some stuff }; diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index 08ec69d4..db95cf5e 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -482,15 +482,15 @@ void KWMailMergeConfigDialog::slotOpenClicked() void KWMailMergeConfigDialog::slotPreviewClicked() { db_->action=KWSLMergePreview; - KMainWindow *mw=dynamic_cast(((TQWidget *)parent())->topLevelWidget()); + TDEMainWindow *mw=dynamic_cast(((TQWidget *)parent())->topLevelWidget()); if (mw) { - KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview)); + TDEAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview)); if (ac) ac->activate(); else kdWarning()<<"Toplevel doesn't provide a print preview action"<no preview"<no preview"<inherits( "KToolBar" ) ) + if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *tb = (KToolBar *)widget; + TDEToolBar *tb = (TDEToolBar *)widget; - int id = KAction::getToolButtonID(); + int id = TDEAction::getToolButtonID(); m_label = new MailMergeDraggableLabel( static_cast(tb->mainWindow()), text(), widget ); tb->insertWidget( id, m_label->width(), m_label, index ); @@ -133,9 +133,9 @@ int KWMailMergeLabelAction::plug( TQWidget *widget, int index ) void KWMailMergeLabelAction::unplug( TQWidget *widget ) { - if ( widget->inherits( "KToolBar" ) ) + if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = (KToolBar *)widget; + TDEToolBar *bar = (TDEToolBar *)widget; int idx = findContainer( bar ); diff --git a/kword/KWMailMergeLabelAction.h b/kword/KWMailMergeLabelAction.h index 638533fe..558f69ad 100644 --- a/kword/KWMailMergeLabelAction.h +++ b/kword/KWMailMergeLabelAction.h @@ -27,7 +27,7 @@ #include #include -class KWMailMergeLabelAction : public KAction +class KWMailMergeLabelAction : public TDEAction { Q_OBJECT diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h index a868aa74..f8adad31 100644 --- a/kword/KWTextFrameSet.h +++ b/kword/KWTextFrameSet.h @@ -45,7 +45,7 @@ class KoTextObject; class KoDataToolInfo; class KoVariable; -class KAction; +class TDEAction; class KNamedCommand; class KMacroCommand; diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 68386e29..f32912e0 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -562,13 +562,13 @@ void KWView::setupActions() // accelerator clashes. // -------------- File menu - m_actionExtraCreateTemplate = new KAction( i18n( "&Create Template From Document..." ), 0, + m_actionExtraCreateTemplate = new TDEAction( i18n( "&Create Template From Document..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); m_actionExtraCreateTemplate->setToolTip( i18n( "Save this document and use it later as a template" ) ); m_actionExtraCreateTemplate->setWhatsThis( i18n( "You can save this document as a template.

    You can use this new template as a starting point for another document." ) ); - m_actionFileStatistics = new KAction( i18n( "Statistics" ), 0, TQT_TQOBJECT(this), TQT_SLOT( fileStatistics() ), actionCollection(), "file_statistics" ); + m_actionFileStatistics = new TDEAction( i18n( "Statistics" ), 0, TQT_TQOBJECT(this), TQT_SLOT( fileStatistics() ), actionCollection(), "file_statistics" ); m_actionFileStatistics->setToolTip( i18n( "Sentence, word and letter counts for this document" ) ); m_actionFileStatistics->setWhatsThis( i18n( "Information on the number of letters, words, syllables and sentences for this document.

    Evaluates readability using the Flesch reading score." ) ); // -------------- Edit actions @@ -580,17 +580,17 @@ void KWView::setupActions() m_actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); m_actionEditReplace = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); m_actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - new KAction( i18n( "Select All Frames" ), 0, TQT_TQOBJECT(this), TQT_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); - m_actionEditSelectCurrentFrame = new KAction( i18n( "Select Frame" ), 0, + new TDEAction( i18n( "Select All Frames" ), 0, TQT_TQOBJECT(this), TQT_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); + m_actionEditSelectCurrentFrame = new TDEAction( i18n( "Select Frame" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( editSelectCurrentFrame() ), actionCollection(), "edit_selectcurrentframe" ); m_actionSpellCheck = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); - m_actionDeletePage = new KAction( i18n( "Delete Page" ), "delslide", 0, + m_actionDeletePage = new TDEAction( i18n( "Delete Page" ), "delslide", 0, TQT_TQOBJECT(this), TQT_SLOT( deletePage() ), actionCollection(), "delete_page" ); kdDebug() << m_doc->pageCount() << " " << (m_doc->processingType() == KWDocument::DTP) << endl; - (void) new KAction( i18n( "Configure Mai&l Merge..." ), "configure",0, + (void) new TDEAction( i18n( "Configure Mai&l Merge..." ), "configure",0, TQT_TQOBJECT(this), TQT_SLOT( editMailMergeDataBase() ), actionCollection(), "edit_sldatabase" ); @@ -601,33 +601,33 @@ void KWView::setupActions() // (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,TQT_TQOBJECT(this), TQT_SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser"); // -------------- Frame menu - m_actionEditDelFrame = new KAction( i18n( "&Delete Frame" ), 0, + m_actionEditDelFrame = new TDEAction( i18n( "&Delete Frame" ), 0, TQT_TQOBJECT(this), TQT_SLOT( editDeleteFrame() ), actionCollection(), "edit_delframe" ); m_actionEditDelFrame->setToolTip( i18n( "Delete the currently selected frame(s)." ) ); m_actionEditDelFrame->setWhatsThis( i18n( "Delete the currently selected frame(s)." ) ); - m_actionCreateLinkedFrame = new KAction( i18n( "Create Linked Copy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( createLinkedFrame() ), actionCollection(), "create_linked_frame" ); + m_actionCreateLinkedFrame = new TDEAction( i18n( "Create Linked Copy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( createLinkedFrame() ), actionCollection(), "create_linked_frame" ); m_actionCreateLinkedFrame->setToolTip( i18n( "Create a copy of the current frame, always showing the same contents" ) ); m_actionCreateLinkedFrame->setWhatsThis( i18n("Create a copy of the current frame, that remains linked to it. This means they always show the same contents: modifying the contents in such a frame will update all its linked copies.") ); - m_actionRaiseFrame = new KAction( i18n( "Ra&ise Frame" ), "raise", + m_actionRaiseFrame = new TDEAction( i18n( "Ra&ise Frame" ), "raise", TQt::CTRL +TQt::SHIFT+ TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT( raiseFrame() ), actionCollection(), "raiseframe" ); m_actionRaiseFrame->setToolTip( i18n( "Raise the currently selected frame so that it appears above all the other frames" ) ); m_actionRaiseFrame->setWhatsThis( i18n( "Raise the currently selected frame so that it appears above all the other frames. This is only useful if frames overlap each other. If multiple frames are selected they are all raised in turn." ) ); - m_actionLowerFrame = new KAction( i18n( "&Lower Frame" ), "lower", + m_actionLowerFrame = new TDEAction( i18n( "&Lower Frame" ), "lower", TQt::CTRL +TQt::SHIFT+ TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT( lowerFrame() ), actionCollection(), "lowerframe" ); m_actionLowerFrame->setToolTip( i18n( "Lower the currently selected frame so that it disappears under any frame that overlaps it" ) ); m_actionLowerFrame->setWhatsThis( i18n( "Lower the currently selected frame so that it disappears under any frame that overlaps it. If multiple frames are selected they are all lowered in turn." ) ); - m_actionBringToFront= new KAction( i18n( "Bring to Front" ), "bring_forward", + m_actionBringToFront= new TDEAction( i18n( "Bring to Front" ), "bring_forward", 0, TQT_TQOBJECT(this), TQT_SLOT( bringToFront() ), actionCollection(), "bring_tofront_frame" ); - m_actionSendBackward= new KAction( i18n( "Send to Back" ), "send_backward", + m_actionSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", 0, TQT_TQOBJECT(this), TQT_SLOT( sendToBack() ), actionCollection(), "send_toback_frame" ); @@ -636,14 +636,14 @@ void KWView::setupActions() if ( !m_doc->isEmbedded() ) { - m_actionViewTextMode = new KToggleAction( i18n( "Text Mode" ), 0, + m_actionViewTextMode = new TDEToggleAction( i18n( "Text Mode" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewTextMode() ), actionCollection(), "view_textmode" ); m_actionViewTextMode->setToolTip( i18n( "Only show the text of the document." ) ); m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or layout. KWord will display only the text for editing." ) ); m_actionViewTextMode->setExclusiveGroup( "viewmodes" ); - m_actionViewPageMode = new KToggleAction( i18n( "&Page Mode" ), 0, + m_actionViewPageMode = new TDEToggleAction( i18n( "&Page Mode" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewPageMode() ), actionCollection(), "view_pagemode" ); m_actionViewPageMode->setWhatsThis( i18n( "Switch to page mode.

    Page mode is designed to make editing your text easy.

    This function is most frequently used to return to text editing after switching to preview mode." ) ); @@ -651,7 +651,7 @@ void KWView::setupActions() m_actionViewPageMode->setExclusiveGroup( "viewmodes" ); m_actionViewPageMode->setChecked( true ); - m_actionViewPreviewMode = new KToggleAction( i18n( "Pre&view Mode" ), 0, + m_actionViewPreviewMode = new TDEToggleAction( i18n( "Pre&view Mode" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewPreviewMode() ), actionCollection(), "view_previewmode" ); m_actionViewPreviewMode->setWhatsThis( i18n( "Zoom out from your document to get a look at several pages of your document.

    The number of pages per line can be customized." ) ); @@ -666,33 +666,33 @@ void KWView::setupActions() m_actionViewPreviewMode = 0; } - m_actionViewFormattingChars = new KToggleAction( i18n( "&Formatting Characters" ), 0, + m_actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); m_actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); m_actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.

    When this is enabled, KWord shows you tabs, spaces, carriage returns and other non-printing characters." ) ); - m_actionViewFrameBorders = new KToggleAction( i18n( "Frame &Borders" ), 0, + m_actionViewFrameBorders = new TDEToggleAction( i18n( "Frame &Borders" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewFrameBorders() ), actionCollection(), "view_frameborders" ); m_actionViewFrameBorders->setToolTip( i18n( "Turns the border display on and off." ) ); m_actionViewFrameBorders->setWhatsThis( i18n( "Turns the border display on and off.

    The borders are never printed. This option is useful to see how the document will appear on the printed page." ) ); - m_actionViewHeader = new KToggleAction( i18n( "Enable Document &Headers" ), 0, + m_actionViewHeader = new TDEToggleAction( i18n( "Enable Document &Headers" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewHeader() ), actionCollection(), "format_header" ); m_actionViewHeader->setCheckedState(i18n("Disable Document &Headers")); m_actionViewHeader->setToolTip( i18n( "Shows and hides header display." ) ); m_actionViewHeader->setWhatsThis( i18n( "Selecting this option toggles the display of headers in KWord.

    Headers are special frames at the top of each page which can contain page numbers or other information." ) ); - m_actionViewFooter = new KToggleAction( i18n( "Enable Document Foo&ters" ), 0, + m_actionViewFooter = new TDEToggleAction( i18n( "Enable Document Foo&ters" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewFooter() ), actionCollection(), "format_footer" ); m_actionViewFooter->setCheckedState(i18n("Disable Document Foo&ters")); m_actionViewFooter->setToolTip( i18n( "Shows and hides footer display." ) ); m_actionViewFooter->setWhatsThis( i18n( "Selecting this option toggles the display of footers in KWord.

    Footers are special frames at the bottom of each page which can contain page numbers or other information." ) ); - m_actionViewZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, + m_actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); connect( m_actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), @@ -701,14 +701,14 @@ void KWView::setupActions() changeZoomMenu( ); // -------------- Insert menu - m_actionInsertSpecialChar = new KAction( i18n( "Sp&ecial Character..." ), "char", + m_actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", TQt::ALT + TQt::SHIFT + TQt::Key_C, TQT_TQOBJECT(this), TQT_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); m_actionInsertSpecialChar->setToolTip( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); m_actionInsertSpecialChar->setWhatsThis( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); - m_actionInsertFrameBreak = new KAction( TQString(), TQt::CTRL + TQt::Key_Return, + m_actionInsertFrameBreak = new TDEAction( TQString(), TQt::CTRL + TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT( insertFrameBreak() ), actionCollection(), "insert_framebreak" ); if ( m_doc->processingType() == KWDocument::WP ) { @@ -721,52 +721,52 @@ void KWView::setupActions() m_actionInsertFrameBreak->setWhatsThis( i18n( "This inserts a non-printing character at the current cursor position. All text after this point will be moved into the next frame in the frameset." ) ); } - /*actionInsertPage =*/ new KAction( m_doc->processingType() == KWDocument::WP ? i18n( "Page" ) : i18n( "Page..." ), "page", 0, + /*actionInsertPage =*/ new TDEAction( m_doc->processingType() == KWDocument::WP ? i18n( "Page" ) : i18n( "Page..." ), "page", 0, TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), actionCollection(), "insert_page" ); - m_actionInsertLink = new KAction( i18n( "Link..." ), 0, + m_actionInsertLink = new TDEAction( i18n( "Link..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertLink() ), actionCollection(), "insert_link" ); m_actionInsertLink->setToolTip( i18n( "Insert a Web address, email address or hyperlink to a file." ) ); m_actionInsertLink->setWhatsThis( i18n( "Insert a Web address, email address or hyperlink to a file." ) ); - m_actionInsertComment = new KAction( i18n( "Comment..." ), 0, + m_actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertComment() ), actionCollection(), "insert_comment" ); m_actionInsertComment->setToolTip( i18n( "Insert a comment about the selected text." ) ); m_actionInsertComment->setWhatsThis( i18n( "Insert a comment about the selected text. These comments are not designed to appear on the final page." ) ); - m_actionEditComment = new KAction( i18n("Edit Comment..."), 0, + m_actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, TQT_TQOBJECT(this), TQT_SLOT(editComment()), actionCollection(), "edit_comment"); m_actionEditComment->setToolTip( i18n( "Change the content of a comment." ) ); m_actionEditComment->setWhatsThis( i18n( "Change the content of a comment." ) ); - m_actionRemoveComment = new KAction( i18n("Remove Comment"), 0, + m_actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, TQT_TQOBJECT(this), TQT_SLOT(removeComment()), actionCollection(), "remove_comment"); m_actionRemoveComment->setToolTip( i18n( "Remove the selected document comment." ) ); m_actionRemoveComment->setWhatsThis( i18n( "Remove the selected document comment." ) ); - m_actionCopyTextOfComment = new KAction( i18n("Copy Text of Comment..."), 0, + m_actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, TQT_TQOBJECT(this), TQT_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); - m_actionInsertFootEndNote = new KAction( i18n( "&Footnote/Endnote..." ), 0, + m_actionInsertFootEndNote = new TDEAction( i18n( "&Footnote/Endnote..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertFootNote() ), actionCollection(), "insert_footendnote" ); m_actionInsertFootEndNote->setToolTip( i18n( "Insert a footnote referencing the selected text." ) ); m_actionInsertFootEndNote->setWhatsThis( i18n( "Insert a footnote referencing the selected text." ) ); - m_actionInsertContents = new KAction( i18n( "Table of &Contents" ), 0, + m_actionInsertContents = new TDEAction( i18n( "Table of &Contents" ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertContents() ), actionCollection(), "insert_contents" ); m_actionInsertContents->setToolTip( i18n( "Insert table of contents at the current cursor position." ) ); m_actionInsertContents->setWhatsThis( i18n( "Insert table of contents at the current cursor position." ) ); m_variableDefMap.clear(); - actionInsertVariable = new KActionMenu( i18n( "&Variable" ), + actionInsertVariable = new TDEActionMenu( i18n( "&Variable" ), actionCollection(), "insert_variable" ); // The last argument is only needed if a submenu is to be created @@ -776,7 +776,7 @@ void KWView::setupActions() addVariableActions( VT_PGNUM, KoPageVariable::actionTexts(), actionInsertVariable, i18n("&Page") ); addVariableActions( VT_STATISTIC, KWStatisticVariable::actionTexts(), actionInsertVariable, i18n("&Statistic") ); - m_actionInsertCustom = new KActionMenu( i18n( "&Custom" ), + m_actionInsertCustom = new TDEActionMenu( i18n( "&Custom" ), actionCollection(), "insert_custom" ); actionInsertVariable->insert(m_actionInsertCustom); @@ -785,7 +785,7 @@ void KWView::setupActions() addVariableActions( VT_MAILMERGE, KoMailMergeVariable::actionTexts(), actionInsertVariable, TQString() ); actionInsertVariable->popupMenu()->insertSeparator(); - m_actionRefreshAllVariable = new KAction( i18n( "&Refresh All Variables" ), 0, + m_actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, TQT_TQOBJECT(this), TQT_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); m_actionRefreshAllVariable->setToolTip( i18n( "Update all variables to current values." ) ); @@ -793,31 +793,31 @@ void KWView::setupActions() actionInsertVariable->insert(m_actionRefreshAllVariable); - m_actionInsertExpression = new KActionMenu( i18n( "&Expression" ), + m_actionInsertExpression = new TDEActionMenu( i18n( "&Expression" ), actionCollection(), "insert_expression" ); loadexpressionActions( m_actionInsertExpression); - m_actionToolsCreateText = new KToggleAction( i18n( "Te&xt Frame" ), "frame_text", TQt::Key_F10 /*same as kpr*/, + m_actionToolsCreateText = new TDEToggleAction( i18n( "Te&xt Frame" ), "frame_text", TQt::Key_F10 /*same as kpr*/, TQT_TQOBJECT(this), TQT_SLOT( toolsCreateText() ), actionCollection(), "tools_createtext" ); m_actionToolsCreateText->setToolTip( i18n( "Create a new text frame." ) ); m_actionToolsCreateText->setWhatsThis( i18n( "Create a new text frame." ) ); m_actionToolsCreateText->setExclusiveGroup( "tools" ); - m_actionInsertFormula = new KAction( i18n( "For&mula" ), "frame_formula", TQt::Key_F4, + m_actionInsertFormula = new TDEAction( i18n( "For&mula" ), "frame_formula", TQt::Key_F4, TQT_TQOBJECT(this), TQT_SLOT( insertFormula() ), actionCollection(), "tools_formula" ); m_actionInsertFormula->setToolTip( i18n( "Insert a formula into a new frame." ) ); m_actionInsertFormula->setWhatsThis( i18n( "Insert a formula into a new frame." ) ); - m_actionInsertTable = new KAction( i18n( "&Table..." ), "inline_table", + m_actionInsertTable = new TDEAction( i18n( "&Table..." ), "inline_table", TQt::Key_F5, TQT_TQOBJECT(this), TQT_SLOT( insertTable() ), actionCollection(), "insert_table" ); m_actionInsertTable->setToolTip( i18n( "Create a table." ) ); m_actionInsertTable->setWhatsThis( i18n( "Create a table.

    The table can either exist in a frame of its own or inline." ) ); - m_actionToolsCreatePix = new KToggleAction( i18n( "P&icture..." ), "frame_image", // or inline_image ? + m_actionToolsCreatePix = new TDEToggleAction( i18n( "P&icture..." ), "frame_image", // or inline_image ? TQt::SHIFT + TQt::Key_F5 /*same as kpr*/, TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); @@ -831,72 +831,72 @@ void KWView::setupActions() m_actionToolsCreatePart->setToolTip( i18n( "Insert an object into a new frame." ) ); m_actionToolsCreatePart->setWhatsThis( i18n( "Insert an object into a new frame." ) ); - m_actionInsertFile = new KAction( i18n( "Fi&le..." ), 0, + m_actionInsertFile = new TDEAction( i18n( "Fi&le..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertFile() ), actionCollection(), "insert_file" ); // ------------------------- Format menu - m_actionFormatFont = new KAction( i18n( "&Font..." ), TQt::ALT + TQt::CTRL + TQt::Key_F, + m_actionFormatFont = new TDEAction( i18n( "&Font..." ), TQt::ALT + TQt::CTRL + TQt::Key_F, TQT_TQOBJECT(this), TQT_SLOT( formatFont() ), actionCollection(), "format_font" ); m_actionFormatFont->setToolTip( i18n( "Change character size, font, boldface, italics etc." ) ); m_actionFormatFont->setWhatsThis( i18n( "Change the attributes of the currently selected characters." ) ); - m_actionFormatParag = new KAction( i18n( "&Paragraph..." ), TQt::ALT + TQt::CTRL + TQt::Key_P, + m_actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), TQt::ALT + TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); m_actionFormatParag->setToolTip( i18n( "Change paragraph margins, text flow, borders, bullets, numbering etc." ) ); m_actionFormatParag->setWhatsThis( i18n( "Change paragraph margins, text flow, borders, bullets, numbering etc.

    Select text in multiple paragraphs to change the formatting of all selected paragraphs.

    If no text is selected, the paragraph where the cursor is located will be changed." ) ); - m_actionFormatFrameSet = new KAction( i18n( "F&rame/Frameset Properties" ), 0, + m_actionFormatFrameSet = new TDEAction( i18n( "F&rame/Frameset Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( formatFrameSet() ), actionCollection(), "format_frameset" ); m_actionFormatFrameSet->setToolTip( i18n( "Alter frameset properties." ) ); m_actionFormatFrameSet->setWhatsThis( i18n( "Alter frameset properties.

    Currently you can change the frame background." ) ); - m_actionFormatPage = new KAction( i18n( "Page &Layout..." ), 0, + m_actionFormatPage = new TDEAction( i18n( "Page &Layout..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( formatPage() ), actionCollection(), "format_page" ); m_actionFormatPage->setToolTip( i18n( "Change properties of entire page." ) ); m_actionFormatPage->setWhatsThis( i18n( "Change properties of the entire page.

    Currently you can change paper size, paper orientation, header and footer sizes, and column settings." ) ); - m_actionFormatFrameStylist = new KAction( i18n( "&Frame Style Manager" ), 0 /*shortcut?*/, + m_actionFormatFrameStylist = new TDEAction( i18n( "&Frame Style Manager" ), 0 /*shortcut?*/, TQT_TQOBJECT(this), TQT_SLOT( extraFrameStylist() ), actionCollection(), "frame_stylist" ); m_actionFormatFrameStylist->setToolTip( i18n( "Change attributes of framestyles." ) ); m_actionFormatFrameStylist->setWhatsThis( i18n( "Change background and borders of framestyles.

    Multiple framestyles can be changed using the dialog box." ) ); - m_actionFormatStylist = new KAction( i18n( "&Style Manager" ), TQt::ALT + TQt::CTRL + TQt::Key_S, + m_actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), TQt::ALT + TQt::CTRL + TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); m_actionFormatStylist->setToolTip( i18n( "Change attributes of styles." ) ); m_actionFormatStylist->setWhatsThis( i18n( "Change font and paragraph attributes of styles.

    Multiple styles can be changed using the dialog box." ) ); - m_actionFormatFontSize = new KFontSizeAction( i18n( "Font Size" ), 0, + m_actionFormatFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "format_fontsize" ); connect( m_actionFormatFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( textSizeSelected( int ) ) ); - m_actionFontSizeIncrease = new KAction( i18n("Increase Font Size"), "fontsizeup", TQt::CTRL + TQt::Key_Greater, TQT_TQOBJECT(this), TQT_SLOT( increaseFontSize() ), actionCollection(), "increase_fontsize" ); - m_actionFontSizeDecrease = new KAction( i18n("Decrease Font Size"), "fontsizedown", TQt::CTRL + TQt::Key_Less, TQT_TQOBJECT(this), TQT_SLOT( decreaseFontSize() ), actionCollection(), "decrease_fontsize" ); + m_actionFontSizeIncrease = new TDEAction( i18n("Increase Font Size"), "fontsizeup", TQt::CTRL + TQt::Key_Greater, TQT_TQOBJECT(this), TQT_SLOT( increaseFontSize() ), actionCollection(), "increase_fontsize" ); + m_actionFontSizeDecrease = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", TQt::CTRL + TQt::Key_Less, TQT_TQOBJECT(this), TQT_SLOT( decreaseFontSize() ), actionCollection(), "decrease_fontsize" ); #ifdef KFONTACTION_HAS_CRITERIA_ARG - m_actionFormatFontFamily = new KFontAction( KFontChooser::SmoothScalableFonts, + m_actionFormatFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, i18n( "Font Family" ), 0, actionCollection(), "format_fontfamily" ); #else - m_actionFormatFontFamily = new KFontAction( i18n( "Font Family" ), 0, + m_actionFormatFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "format_fontfamily" ); #endif connect( m_actionFormatFontFamily, TQT_SIGNAL( activated( const TQString & ) ), TQT_TQOBJECT(this), TQT_SLOT( textFontSelected( const TQString & ) ) ); - m_actionFormatStyleMenu = new KActionMenu( i18n( "St&yle" ), 0, + m_actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, actionCollection(), "format_stylemenu" ); - m_actionFormatStyle = new KSelectAction( i18n( "St&yle" ), 0, + m_actionFormatStyle = new TDESelectAction( i18n( "St&yle" ), 0, actionCollection(), "format_style" ); // In fact, binding a key to this action will simply re-apply the current style. Why not. //m_actionFormatStyle->setShortcutConfigurable( false ); @@ -904,7 +904,7 @@ void KWView::setupActions() TQT_TQOBJECT(this), TQT_SLOT( textStyleSelected( int ) ) ); updateStyleList(); - m_actionFormatDefault=new KAction( i18n( "Default Format" ), 0, + m_actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, TQT_TQOBJECT(this), TQT_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); m_actionFormatDefault->setToolTip( i18n( "Change font and paragraph attributes to their default values." ) ); @@ -912,84 +912,84 @@ void KWView::setupActions() // ----------------------- More format actions, for the toolbar only - m_actionFormatBold = new KToggleAction( i18n( "&Bold" ), "text_bold", TQt::CTRL + TQt::Key_B, + m_actionFormatBold = new TDEToggleAction( i18n( "&Bold" ), "text_bold", TQt::CTRL + TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT( textBold() ), actionCollection(), "format_bold" ); - m_actionFormatItalic = new KToggleAction( i18n( "&Italic" ), "text_italic", TQt::CTRL + TQt::Key_I, + m_actionFormatItalic = new TDEToggleAction( i18n( "&Italic" ), "text_italic", TQt::CTRL + TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT( textItalic() ), actionCollection(), "format_italic" ); - m_actionFormatUnderline = new KToggleAction( i18n( "&Underline" ), "text_under", TQt::CTRL + TQt::Key_U, + m_actionFormatUnderline = new TDEToggleAction( i18n( "&Underline" ), "text_under", TQt::CTRL + TQt::Key_U, TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ), actionCollection(), "format_underline" ); - m_actionFormatStrikeOut = new KToggleAction( i18n( "&Strike Out" ), "text_strike", 0 , + m_actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "text_strike", 0 , TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); - m_actionFormatAlignLeft = new KToggleAction( i18n( "Align &Left" ), "text_left", TQt::CTRL + TQt::Key_L, + m_actionFormatAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "text_left", TQt::CTRL + TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), actionCollection(), "format_alignleft" ); m_actionFormatAlignLeft->setExclusiveGroup( "align" ); m_actionFormatAlignLeft->setChecked( TRUE ); - m_actionFormatAlignCenter = new KToggleAction( i18n( "Align &Center" ), "text_center", TQt::CTRL + TQt::ALT + TQt::Key_C, + m_actionFormatAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", TQt::CTRL + TQt::ALT + TQt::Key_C, TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), actionCollection(), "format_aligncenter" ); m_actionFormatAlignCenter->setExclusiveGroup( "align" ); - m_actionFormatAlignRight = new KToggleAction( i18n( "Align &Right" ), "text_right", TQt::CTRL + TQt::ALT + TQt::Key_R, + m_actionFormatAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "text_right", TQt::CTRL + TQt::ALT + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), actionCollection(), "format_alignright" ); m_actionFormatAlignRight->setExclusiveGroup( "align" ); - m_actionFormatAlignBlock = new KToggleAction( i18n( "Align &Block" ), "text_block", TQt::CTRL + TQt::Key_J, + m_actionFormatAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", TQt::CTRL + TQt::Key_J, TQT_TQOBJECT(this), TQT_SLOT( textAlignBlock() ), actionCollection(), "format_alignblock" ); m_actionFormatAlignBlock->setExclusiveGroup( "align" ); - m_actionFormatSpacingSingle = new KToggleAction( i18n( "Line Spacing &1" ), "spacesimple", TQt::CTRL + TQt::Key_1, + m_actionFormatSpacingSingle = new TDEToggleAction( i18n( "Line Spacing &1" ), "spacesimple", TQt::CTRL + TQt::Key_1, TQT_TQOBJECT(this), TQT_SLOT( textSpacingSingle() ), actionCollection(), "format_spacingsingle" ); m_actionFormatSpacingSingle->setExclusiveGroup( "spacing" ); - m_actionFormatSpacingOneAndHalf = new KToggleAction( i18n( "Line Spacing 1.&5" ), "spacedouble", TQt::CTRL + TQt::Key_5, + m_actionFormatSpacingOneAndHalf = new TDEToggleAction( i18n( "Line Spacing 1.&5" ), "spacedouble", TQt::CTRL + TQt::Key_5, TQT_TQOBJECT(this), TQT_SLOT( textSpacingOneAndHalf() ), actionCollection(), "format_spacing15" ); m_actionFormatSpacingOneAndHalf->setExclusiveGroup( "spacing" ); - m_actionFormatSpacingDouble = new KToggleAction( i18n( "Line Spacing &2" ), "spacetriple", TQt::CTRL + TQt::Key_2, + m_actionFormatSpacingDouble = new TDEToggleAction( i18n( "Line Spacing &2" ), "spacetriple", TQt::CTRL + TQt::Key_2, TQT_TQOBJECT(this), TQT_SLOT( textSpacingDouble() ), actionCollection(), "format_spacingdouble" ); m_actionFormatSpacingDouble->setExclusiveGroup( "spacing" ); - m_actionFormatSuper = new KToggleAction( i18n( "Superscript" ), "super", 0, + m_actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), actionCollection(), "format_super" ); //m_actionFormatSuper->setExclusiveGroup( "valign" ); - m_actionFormatSub = new KToggleAction( i18n( "Subscript" ), "sub", 0, + m_actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), actionCollection(), "format_sub" ); //m_actionFormatSub->setExclusiveGroup( "valign" ); - m_actionFormatIncreaseIndent= new KAction( i18n( "Increase Indent" ), + m_actionFormatIncreaseIndent= new TDEAction( i18n( "Increase Indent" ), TQApplication::reverseLayout() ? "format_decreaseindent" : "format_increaseindent", 0, TQT_TQOBJECT(this), TQT_SLOT( textIncreaseIndent() ), actionCollection(), "format_increaseindent" ); - m_actionFormatDecreaseIndent= new KAction( i18n( "Decrease Indent" ), + m_actionFormatDecreaseIndent= new TDEAction( i18n( "Decrease Indent" ), TQApplication::reverseLayout() ? "format_increaseindent" :"format_decreaseindent", 0, TQT_TQOBJECT(this), TQT_SLOT( textDecreaseIndent() ), actionCollection(), "format_decreaseindent" ); - m_actionFormatColor = new TKSelectColorAction( i18n( "Text Color..." ), TKSelectColorAction::TextColor, + m_actionFormatColor = new TTDESelectColorAction( i18n( "Text Color..." ), TTDESelectColorAction::TextColor, TQT_TQOBJECT(this), TQT_SLOT( textColor() ), actionCollection(), "format_color", true ); m_actionFormatColor->setDefaultColor(TQColor()); - //actionFormatList = new KToggleAction( i18n( "List" ), "enumList", 0, + //actionFormatList = new TDEToggleAction( i18n( "List" ), "enumList", 0, // TQT_TQOBJECT(this), TQT_SLOT( textList() ), // actionCollection(), "format_list" ); //actionFormatList->setExclusiveGroup( "style" ); - m_actionFormatNumber = new KActionMenu( i18n( "Number" ), + m_actionFormatNumber = new TDEActionMenu( i18n( "Number" ), "enumList", actionCollection(), "format_number" ); m_actionFormatNumber->setDelayed( false ); - m_actionFormatBullet = new KActionMenu( i18n( "Bullet" ), + m_actionFormatBullet = new TDEActionMenu( i18n( "Bullet" ), "unsortedList", actionCollection(), "format_bullet" ); m_actionFormatBullet->setDelayed( false ); TQPtrList stylesList; @@ -998,7 +998,7 @@ void KWView::setupActions() for ( ; styleIt.current() ; ++styleIt ) { // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu - KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ + TDEToggleAction* act = new TDEToggleAction( styleIt.current()->name(), /*TODO icon,*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); @@ -1014,24 +1014,24 @@ void KWView::setupActions() // ---------------------------- frame toolbar actions - m_actionFrameStyleMenu = new KActionMenu( i18n( "Fra&mestyle" ), 0, + m_actionFrameStyleMenu = new TDEActionMenu( i18n( "Fra&mestyle" ), 0, actionCollection(), "frame_stylemenu" ); - m_actionFrameStyle = new KSelectAction( i18n( "Framest&yle" ), 0, + m_actionFrameStyle = new TDESelectAction( i18n( "Framest&yle" ), 0, actionCollection(), "frame_style" ); connect( m_actionFrameStyle, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( frameStyleSelected( int ) ) ); updateFrameStyleList(); - m_actionBorderOutline = new KToggleAction( i18n( "Border Outline" ), "borderoutline", + m_actionBorderOutline = new TDEToggleAction( i18n( "Border Outline" ), "borderoutline", 0, TQT_TQOBJECT(this), TQT_SLOT( borderOutline() ), actionCollection(), "border_outline" ); - m_actionBorderLeft = new KToggleAction( i18n( "Border Left" ), "borderleft", + m_actionBorderLeft = new TDEToggleAction( i18n( "Border Left" ), "borderleft", 0, TQT_TQOBJECT(this), TQT_SLOT( borderLeft() ), actionCollection(), "border_left" ); - m_actionBorderRight = new KToggleAction( i18n( "Border Right" ), "borderright", + m_actionBorderRight = new TDEToggleAction( i18n( "Border Right" ), "borderright", 0, TQT_TQOBJECT(this), TQT_SLOT( borderRight() ), actionCollection(), "border_right" ); - m_actionBorderTop = new KToggleAction( i18n( "Border Top" ), "bordertop", + m_actionBorderTop = new TDEToggleAction( i18n( "Border Top" ), "bordertop", 0, TQT_TQOBJECT(this), TQT_SLOT( borderTop() ), actionCollection(), "border_top" ); - m_actionBorderBottom = new KToggleAction( i18n( "Border Bottom" ), "borderbottom", + m_actionBorderBottom = new TDEToggleAction( i18n( "Border Bottom" ), "borderbottom", 0, TQT_TQOBJECT(this), TQT_SLOT( borderBottom() ), actionCollection(), "border_bottom" ); - m_actionBorderStyle = new KSelectAction( i18n( "Border Style" ), + m_actionBorderStyle = new TDESelectAction( i18n( "Border Style" ), 0, actionCollection(), "border_style" ); TQStringList lst; @@ -1042,7 +1042,7 @@ void KWView::setupActions() lst << KoBorder::getStyle( KoBorder::DASH_DOT_DOT ); lst << KoBorder::getStyle( KoBorder::DOUBLE_LINE ); m_actionBorderStyle->setItems( lst ); - m_actionBorderWidth = new KSelectAction( i18n( "Border Width" ), 0, + m_actionBorderWidth = new TDESelectAction( i18n( "Border Width" ), 0, actionCollection(), "border_width" ); lst.clear(); for ( unsigned int i = 1; i < 10; i++ ) @@ -1050,11 +1050,11 @@ void KWView::setupActions() m_actionBorderWidth->setItems( lst ); m_actionBorderWidth->setCurrentItem( 0 ); - m_actionBorderColor = new TKSelectColorAction( i18n("Border Color"), TKSelectColorAction::LineColor, actionCollection(), "border_color", true ); + m_actionBorderColor = new TTDESelectColorAction( i18n("Border Color"), TTDESelectColorAction::LineColor, actionCollection(), "border_color", true ); m_actionBorderColor->setDefaultColor(TQColor()); - m_actionBackgroundColor = new TKSelectColorAction( i18n( "Text Background Color..." ), TKSelectColorAction::FillColor, actionCollection(),"border_backgroundcolor", true); + m_actionBackgroundColor = new TTDESelectColorAction( i18n( "Text Background Color..." ), TTDESelectColorAction::FillColor, actionCollection(),"border_backgroundcolor", true); m_actionBackgroundColor->setToolTip( i18n( "Change background color for currently selected text." ) ); m_actionBackgroundColor->setWhatsThis( i18n( "Change background color for currently selected text." ) ); @@ -1062,56 +1062,56 @@ void KWView::setupActions() m_actionBackgroundColor->setDefaultColor(TQColor()); // ---------------------- Table menu - m_actionTablePropertiesMenu = new KAction( i18n( "&Properties" ), 0, + m_actionTablePropertiesMenu = new TDEAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( tableProperties() ), actionCollection(), "table_propertiesmenu" ); m_actionTablePropertiesMenu->setToolTip( i18n( "Adjust properties of the current table." ) ); m_actionTablePropertiesMenu->setWhatsThis( i18n( "Adjust properties of the current table." ) ); - m_actionTableInsertRow = new KAction( i18n( "&Insert Row..." ), "insert_table_row", 0, + m_actionTableInsertRow = new TDEAction( i18n( "&Insert Row..." ), "insert_table_row", 0, TQT_TQOBJECT(this), TQT_SLOT( tableInsertRow() ), actionCollection(), "table_insrow" ); m_actionTableInsertRow->setToolTip( i18n( "Insert one or more rows at cursor location." ) ); m_actionTableInsertRow->setWhatsThis( i18n( "Insert one or more rows at current cursor location." ) ); - m_actionTableInsertCol = new KAction( i18n( "I&nsert Column..." ), "insert_table_col", 0, + m_actionTableInsertCol = new TDEAction( i18n( "I&nsert Column..." ), "insert_table_col", 0, TQT_TQOBJECT(this), TQT_SLOT( tableInsertCol() ), actionCollection(), "table_inscol" ); m_actionTableInsertCol->setToolTip( i18n( "Insert one or more columns into the current table." ) ); m_actionTableInsertCol->setWhatsThis( i18n( "Insert one or more columns into the current table." ) ); - m_actionTableDelRow = new KAction( 0, "delete_table_row", 0, + m_actionTableDelRow = new TDEAction( 0, "delete_table_row", 0, TQT_TQOBJECT(this), TQT_SLOT( tableDeleteRow() ), actionCollection(), "table_delrow" ); m_actionTableDelRow->setToolTip( i18n( "Delete selected rows from the current table." ) ); m_actionTableDelRow->setWhatsThis( i18n( "Delete selected rows from the current table." ) ); - m_actionTableDelCol = new KAction( 0, "delete_table_col", 0, + m_actionTableDelCol = new TDEAction( 0, "delete_table_col", 0, TQT_TQOBJECT(this), TQT_SLOT( tableDeleteCol() ), actionCollection(), "table_delcol" ); m_actionTableDelCol->setToolTip( i18n( "Delete selected columns from the current table." ) ); m_actionTableDelCol->setWhatsThis( i18n( "Delete selected columns from the current table." ) ); - m_actionTableResizeCol = new KAction( i18n( "Resize Column..." ), 0, + m_actionTableResizeCol = new TDEAction( i18n( "Resize Column..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( tableResizeCol() ), actionCollection(), "table_resizecol" ); m_actionTableResizeCol->setToolTip( i18n( "Change the width of the currently selected column." ) ); m_actionTableResizeCol->setWhatsThis( i18n( "Change the width of the currently selected column." ) ); - m_actionTableJoinCells = new KAction( i18n( "&Join Cells" ), 0, + m_actionTableJoinCells = new TDEAction( i18n( "&Join Cells" ), 0, TQT_TQOBJECT(this), TQT_SLOT( tableJoinCells() ), actionCollection(), "table_joincells" ); m_actionTableJoinCells->setToolTip( i18n( "Join two or more cells into one large cell." ) ); m_actionTableJoinCells->setWhatsThis( i18n( "Join two or more cells into one large cell.

    This is a good way to create titles and labels within a table." ) ); - m_actionTableSplitCells= new KAction( i18n( "&Split Cell..." ), 0, + m_actionTableSplitCells= new TDEAction( i18n( "&Split Cell..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( tableSplitCells() ), actionCollection(), "table_splitcells" ); m_actionTableSplitCells->setToolTip( i18n( "Split one cell into two or more cells." ) ); m_actionTableSplitCells->setWhatsThis( i18n( "Split one cell into two or more cells.

    Cells can be split horizontally, vertically or both directions at once." ) ); - m_actionTableProtectCells= new KToggleAction( i18n( "Protect Cells" ), 0, 0, 0, + m_actionTableProtectCells= new TDEToggleAction( i18n( "Protect Cells" ), 0, 0, 0, actionCollection(), "table_protectcells" ); m_actionTableProtectCells->setToolTip( i18n( "Prevent changes to content of selected cells." ) ); connect (m_actionTableProtectCells, TQT_SIGNAL( toggled(bool) ), this, @@ -1119,41 +1119,41 @@ void KWView::setupActions() m_actionTableProtectCells->setWhatsThis( i18n( "Toggles cell protection on and off.

    When cell protection is on, the user can not alter the content or formatting of the text within the cell." ) ); - m_actionTableUngroup = new KAction( i18n( "&Ungroup Table" ), 0, + m_actionTableUngroup = new TDEAction( i18n( "&Ungroup Table" ), 0, TQT_TQOBJECT(this), TQT_SLOT( tableUngroupTable() ), actionCollection(), "table_ungroup" ); m_actionTableUngroup->setToolTip( i18n( "Break a table into individual frames." ) ); m_actionTableUngroup->setWhatsThis( i18n( "Break a table into individual frames

    Each frame can be moved independently around the page." ) ); - m_actionTableDelete = new KAction( i18n( "Delete &Table" ), 0, + m_actionTableDelete = new TDEAction( i18n( "Delete &Table" ), 0, TQT_TQOBJECT(this), TQT_SLOT( tableDelete() ), actionCollection(), "table_delete" ); m_actionTableDelete->setToolTip( i18n( "Delete the entire table." ) ); m_actionTableDelete->setWhatsThis( i18n( "Deletes all cells and the content within the cells of the currently selected table." ) ); - m_actionTableStylist = new KAction( i18n( "T&able Style Manager" ), 0, + m_actionTableStylist = new TDEAction( i18n( "T&able Style Manager" ), 0, TQT_TQOBJECT(this), TQT_SLOT( tableStylist() ), actionCollection(), "table_stylist" ); m_actionTableStylist->setToolTip( i18n( "Change attributes of tablestyles." ) ); m_actionTableStylist->setWhatsThis( i18n( "Change textstyle and framestyle of the tablestyles.

    Multiple tablestyles can be changed using the dialog box." ) ); - m_actionTableStyleMenu = new KActionMenu( i18n( "Table&style" ), 0, + m_actionTableStyleMenu = new TDEActionMenu( i18n( "Table&style" ), 0, actionCollection(), "table_stylemenu" ); - m_actionTableStyle = new KSelectAction( i18n( "Table&style" ), 0, + m_actionTableStyle = new TDESelectAction( i18n( "Table&style" ), 0, actionCollection(), "table_style" ); connect( m_actionTableStyle, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( tableStyleSelected( int ) ) ); updateTableStyleList(); - m_actionConvertTableToText = new KAction( i18n( "Convert Table to Text" ), 0, + m_actionConvertTableToText = new TDEAction( i18n( "Convert Table to Text" ), 0, TQT_TQOBJECT(this), TQT_SLOT( convertTableToText() ), actionCollection(), "convert_table_to_text" ); - m_actionSortText= new KAction( i18n( "Sort Text..." ), 0, + m_actionSortText= new TDEAction( i18n( "Sort Text..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( sortText() ), actionCollection(), "sort_text" ); - m_actionAddPersonalExpression= new KAction( i18n( "Add Expression" ), 0, + m_actionAddPersonalExpression= new TDEAction( i18n( "Add Expression" ), 0, TQT_TQOBJECT(this), TQT_SLOT( addPersonalExpression() ), actionCollection(), "add_personal_expression" ); @@ -1161,30 +1161,30 @@ void KWView::setupActions() // ---------------------- Tools menu - m_actionAllowAutoFormat = new KToggleAction( i18n( "Enable Autocorrection" ), 0, + m_actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); m_actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); m_actionAllowAutoFormat->setToolTip( i18n( "Toggle autocorrection on and off." ) ); m_actionAllowAutoFormat->setWhatsThis( i18n( "Toggle autocorrection on and off." ) ); - m_actionAutoFormat = new KAction( i18n( "Configure &Autocorrection..." ), 0, + m_actionAutoFormat = new TDEAction( i18n( "Configure &Autocorrection..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( extraAutoFormat() ), actionCollection(), "configure_autocorrection" ); m_actionAutoFormat->setToolTip( i18n( "Change autocorrection options." ) ); m_actionAutoFormat->setWhatsThis( i18n( "Change autocorrection options including:

    • exceptions to autocorrection

    • add/remove autocorrection replacement text

    • and basic autocorrection options

      ." ) ); - m_actionEditCustomVarsEdit = new KAction( i18n( "Custom &Variables..." ), 0, + m_actionEditCustomVarsEdit = new TDEAction( i18n( "Custom &Variables..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( editCustomVars() ), // TODO: new dialog w add etc. actionCollection(), "custom_vars" ); - m_actionEditPersonnalExpr=new KAction( i18n( "Edit &Personal Expressions..." ), 0, + m_actionEditPersonnalExpr=new TDEAction( i18n( "Edit &Personal Expressions..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( editPersonalExpr() ), actionCollection(), "personal_expr" ); m_actionEditPersonnalExpr->setToolTip( i18n( "Add or change one or more personal expressions." ) ); m_actionEditPersonnalExpr->setWhatsThis( i18n( "Add or change one or more personal expressions.

      Personal expressions are a way to quickly insert commonly used phrases or text into your document." ) ); - m_actionChangeCase=new KAction( i18n( "Change Case..." ), 0, + m_actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); m_actionChangeCase->setToolTip( i18n( "Alter the capitalization of selected text." ) ); @@ -1194,56 +1194,56 @@ void KWView::setupActions() m_actionConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection(), "configure" ); //------------------------ Menu frameSet - KAction *actionChangePicture=new KAction( i18n( "Change Picture..." ),"frame_image",0, + TDEAction *actionChangePicture=new TDEAction( i18n( "Change Picture..." ),"frame_image",0, TQT_TQOBJECT(this), TQT_SLOT( changePicture() ), actionCollection(), "change_picture" ); actionChangePicture->setToolTip( i18n( "Change the picture in the currently selected frame." ) ); actionChangePicture->setWhatsThis( i18n( "You can specify a different picture in the current frame.

      KWord automatically resizes the new picture to fit within the old frame." ) ); - m_actionConfigureHeaderFooter=new KAction( i18n( "Configure Header/Footer..." ), 0, + m_actionConfigureHeaderFooter=new TDEAction( i18n( "Configure Header/Footer..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( configureHeaderFooter() ), actionCollection(), "configure_headerfooter" ); m_actionConfigureHeaderFooter->setToolTip( i18n( "Configure the currently selected header or footer." ) ); m_actionConfigureHeaderFooter->setWhatsThis( i18n( "Configure the currently selected header or footer." ) ); - m_actionInlineFrame = new KToggleAction( i18n( "Inline Frame" ), 0, + m_actionInlineFrame = new TDEToggleAction( i18n( "Inline Frame" ), 0, TQT_TQOBJECT(this), TQT_SLOT( inlineFrame() ), actionCollection(), "inline_frame" ); m_actionInlineFrame->setToolTip( i18n( "Convert current frame to an inline frame." ) ); m_actionInlineFrame->setWhatsThis( i18n( "Convert the current frame to an inline frame.

      Place the inline frame within the text at the point nearest to the frames current position." ) ); - m_actionOpenLink = new KAction( i18n( "Open Link" ), 0, + m_actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, TQT_TQOBJECT(this), TQT_SLOT( openLink() ), actionCollection(), "open_link" ); m_actionOpenLink->setToolTip( i18n( "Open the link with the appropriate application." ) ); m_actionOpenLink->setWhatsThis( i18n( "Open the link with the appropriate application.

      Web addresses are opened in a browser.
      Email addresses begin a new message addressed to the link.
      File links are opened by the appropriate viewer or editor." ) ); - m_actionChangeLink=new KAction( i18n("Change Link..."), 0, + m_actionChangeLink=new TDEAction( i18n("Change Link..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changeLink()), actionCollection(), "change_link"); m_actionChangeLink->setToolTip( i18n( "Change the content of the currently selected link." ) ); m_actionChangeLink->setWhatsThis( i18n( "Change the details of the currently selected link." ) ); - m_actionCopyLink = new KAction( i18n( "Copy Link" ), 0, + m_actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, TQT_TQOBJECT(this), TQT_SLOT( copyLink() ), actionCollection(), "copy_link" ); - m_actionAddLinkToBookmak = new KAction( i18n( "Add to Bookmark" ), 0, + m_actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, TQT_TQOBJECT(this), TQT_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); - m_actionRemoveLink = new KAction( i18n( "Remove Link" ), 0, + m_actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeLink() ), actionCollection(), "remove_link" ); - m_actionShowDocStruct = new KToggleAction( i18n( "Show Doc Structure" ), 0, + m_actionShowDocStruct = new TDEToggleAction( i18n( "Show Doc Structure" ), 0, TQT_TQOBJECT(this), TQT_SLOT( showDocStructure() ), actionCollection(), "show_docstruct" ); m_actionShowDocStruct->setCheckedState(i18n("Hide Doc Structure")); m_actionShowDocStruct->setToolTip( i18n( "Open document structure sidebar." ) ); m_actionShowDocStruct->setWhatsThis( i18n( "Open document structure sidebar.

      This sidebar helps you organize your document and quickly find pictures, tables etc." ) ); - m_actionShowRuler = new KToggleAction( i18n( "Show Rulers" ), 0, + m_actionShowRuler = new TDEToggleAction( i18n( "Show Rulers" ), 0, TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "show_ruler" ); m_actionShowRuler->setCheckedState(i18n("Hide Rulers")); @@ -1253,16 +1253,16 @@ void KWView::setupActions() "be used to position tabulators among others.

      Uncheck this to disable " "the rulers from being displayed." ) ); - m_actionViewShowGrid = new KToggleAction( i18n( "Show Grid" ), 0, + m_actionViewShowGrid = new TDEToggleAction( i18n( "Show Grid" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGrid() ), actionCollection(), "view_grid" ); m_actionViewShowGrid->setCheckedState(i18n("Hide Grid")); - m_actionViewSnapToGrid= new KToggleAction( i18n( "Snap to Grid" ), 0, + m_actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, TQT_TQOBJECT(this), TQT_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); - m_actionConfigureCompletion = new KAction( i18n( "Configure C&ompletion..." ), 0, + m_actionConfigureCompletion = new TDEAction( i18n( "Configure C&ompletion..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); m_actionConfigureCompletion->setToolTip( i18n( "Change the words and options for autocompletion." ) ); @@ -1270,139 +1270,139 @@ void KWView::setupActions() // ------------------- Actions with a key binding and no GUI item - new KAction( i18n( "Insert Non-Breaking Space" ), TQt::CTRL+TQt::Key_Space, + new TDEAction( i18n( "Insert Non-Breaking Space" ), TQt::CTRL+TQt::Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); - new KAction( i18n( "Insert Non-Breaking Hyphen" ), TQt::CTRL+TQt::SHIFT+TQt::Key_Minus, + new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), TQt::CTRL+TQt::SHIFT+TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); - new KAction( i18n( "Insert Soft Hyphen" ), TQt::CTRL+TQt::Key_Minus, + new TDEAction( i18n( "Insert Soft Hyphen" ), TQt::CTRL+TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); - new KAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, + new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); - new KAction( i18n( "Completion" ), KStdAccel::shortcut(KStdAccel::TextCompletion), TQT_TQOBJECT(this), TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), TQT_TQOBJECT(this), TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); - new KAction( i18n( "Increase Numbering Level" ), TQt::ALT+TQt::Key_Right, + new TDEAction( i18n( "Increase Numbering Level" ), TQt::ALT+TQt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); - new KAction( i18n( "Decrease Numbering Level" ), TQt::ALT+TQt::Key_Left, + new TDEAction( i18n( "Decrease Numbering Level" ), TQt::ALT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); // -------- - m_actionEditCustomVars = new KAction( i18n( "Edit Variable..." ), 0, + m_actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); - m_actionApplyAutoFormat= new KAction( i18n( "Apply Autocorrection" ), 0, + m_actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, TQT_TQOBJECT(this), TQT_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); m_actionApplyAutoFormat->setToolTip( i18n( "Manually force KWord to scan the entire document and apply autocorrection." ) ); m_actionApplyAutoFormat->setWhatsThis( i18n( "Manually force KWord to scan the entire document and apply autocorrection." ) ); - m_actionCreateStyleFromSelection = new KAction( i18n( "Create Style From Selection..." ), 0, + m_actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); m_actionCreateStyleFromSelection->setToolTip( i18n( "Create a new style based on the currently selected text." ) ); m_actionCreateStyleFromSelection->setWhatsThis( i18n( "Create a new style based on the currently selected text." ) ); // ## "on the current paragraph, taking the formatting from where the cursor is. Selecting text isn't even needed." - m_actionConfigureFootEndNote = new KAction( i18n( "&Footnote..." ), 0, + m_actionConfigureFootEndNote = new TDEAction( i18n( "&Footnote..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( configureFootEndNote()), actionCollection(), "format_footendnote" ); m_actionConfigureFootEndNote->setToolTip( i18n( "Change the look of footnotes." ) ); m_actionConfigureFootEndNote->setWhatsThis( i18n( "Change the look of footnotes." ) ); - m_actionEditFootEndNote= new KAction( i18n("Edit Footnote"), 0, + m_actionEditFootEndNote= new TDEAction( i18n("Edit Footnote"), 0, TQT_TQOBJECT(this), TQT_SLOT( editFootEndNote()), actionCollection(), "edit_footendnote" ); m_actionEditFootEndNote->setToolTip( i18n( "Change the content of the currently selected footnote." ) ); m_actionEditFootEndNote->setWhatsThis( i18n( "Change the content of the currently selected footnote." ) ); - m_actionChangeFootNoteType = new KAction( i18n("Change Footnote/Endnote Parameter"), 0, + m_actionChangeFootNoteType = new TDEAction( i18n("Change Footnote/Endnote Parameter"), 0, TQT_TQOBJECT(this), TQT_SLOT( changeFootNoteType() ), actionCollection(), "change_footendtype"); - m_actionSavePicture= new KAction( i18n("Save Picture As..."), 0, + m_actionSavePicture= new TDEAction( i18n("Save Picture As..."), 0, TQT_TQOBJECT(this), TQT_SLOT( savePicture() ), actionCollection(), "save_picture"); m_actionSavePicture->setToolTip( i18n( "Save the picture in a separate file." ) ); m_actionSavePicture->setWhatsThis( i18n( "Save the picture in the currently selected frame in a separate file, outside the KWord document." ) ); - m_actionAllowBgSpellCheck = new KToggleAction( i18n( "Autospellcheck" ), 0, + m_actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, TQT_TQOBJECT(this), TQT_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); - m_actionGoToFootEndNote = new KAction( TQString() /*set dynamically*/, 0, + m_actionGoToFootEndNote = new TDEAction( TQString() /*set dynamically*/, 0, TQT_TQOBJECT(this), TQT_SLOT( goToFootEndNote() ), actionCollection(), "goto_footendnote" ); // Document Structure Area popup menu. - m_actionDocStructEdit = new KAction( i18n( "Edit Text" ), 0, + m_actionDocStructEdit = new TDEAction( i18n( "Edit Text" ), 0, TQT_TQOBJECT(this), TQT_SLOT( docStructEdit() ), actionCollection(), "docstruct_edit" ); - m_actionDocStructSpeak = new KAction( i18n("Speak Text" ), 0, + m_actionDocStructSpeak = new TDEAction( i18n("Speak Text" ), 0, TQT_TQOBJECT(this), TQT_SLOT( docStructSpeak() ), actionCollection(), "docstruct_speak" ); - m_actionDocStructSelect = new KAction( i18n( "Show" ), 0, + m_actionDocStructSelect = new TDEAction( i18n( "Show" ), 0, TQT_TQOBJECT(this), TQT_SLOT( docStructSelect() ), actionCollection(), "docstruct_select" ); - m_actionDocStructDelete = new KAction( i18n( "Delete Frame" ), 0, + m_actionDocStructDelete = new TDEAction( i18n( "Delete Frame" ), 0, TQT_TQOBJECT(this), TQT_SLOT( docStructDelete() ), actionCollection(), "docstruct_delete" ); - m_actionDocStructProperties = new KAction( i18n( "Properties" ), 0, + m_actionDocStructProperties = new TDEAction( i18n( "Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( docStructProperties() ), actionCollection(), "docstruct_properties" ); - m_actionAddBookmark= new KAction( i18n( "&Bookmark..." ), 0, + m_actionAddBookmark= new TDEAction( i18n( "&Bookmark..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( addBookmark() ), actionCollection(), "add_bookmark" ); - m_actionSelectBookmark= new KAction( i18n( "Select &Bookmark..." ), 0, + m_actionSelectBookmark= new TDEAction( i18n( "Select &Bookmark..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( selectBookmark() ), actionCollection(), "select_bookmark" ); - m_actionImportStyle= new KAction( i18n( "Import Styles..." ), 0, + m_actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( importStyle() ), actionCollection(), "import_style" ); - m_actionCreateFrameStyle = new KAction( i18n( "&Create Framestyle From Frame..." ), 0, + m_actionCreateFrameStyle = new TDEAction( i18n( "&Create Framestyle From Frame..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( createFrameStyle()), actionCollection(), "create_framestyle" ); m_actionCreateFrameStyle->setToolTip( i18n( "Create a new style based on the currently selected frame." ) ); m_actionCreateFrameStyle->setWhatsThis( i18n( "Create a new framestyle based on the currently selected frame." ) ); #if 0 // re-enable after fixing - m_actionInsertDirectCursor = new KToggleAction( i18n( "Type Anywhere Cursor" ), 0, + m_actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif - m_actionConvertToTextBox = new KAction( i18n( "Convert to Text Box" ), 0, + m_actionConvertToTextBox = new TDEAction( i18n( "Convert to Text Box" ), 0, TQT_TQOBJECT(this), TQT_SLOT( convertToTextBox() ), actionCollection(), "convert_to_text_box" ); - m_actionSpellIgnoreAll = new KAction( i18n( "Ignore All" ), 0, + m_actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); - m_actionAddWordToPersonalDictionary=new KAction( i18n( "Add Word to Dictionary" ),0, + m_actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, TQT_TQOBJECT(this), TQT_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); - m_actionEmbeddedStoreInternal=new KToggleAction( i18n( "Store Document Internally" ),0, + m_actionEmbeddedStoreInternal=new TDEToggleAction( i18n( "Store Document Internally" ),0, TQT_TQOBJECT(this), TQT_SLOT( embeddedStoreInternal() ), actionCollection(), "embedded_store_internal" ); - m_actionGoToDocumentStructure=new KAction( i18n( "Go to Document Structure" ), KShortcut("Alt+1"), + m_actionGoToDocumentStructure=new TDEAction( i18n( "Go to Document Structure" ), TDEShortcut("Alt+1"), TQT_TQOBJECT(this), TQT_SLOT( goToDocumentStructure() ), actionCollection(), "goto_document_structure" ); - m_actionGoToDocument=new KAction( i18n( "Go to Document" ), KShortcut("Alt+2"), + m_actionGoToDocument=new TDEAction( i18n( "Go to Document" ), TDEShortcut("Alt+2"), TQT_TQOBJECT(this), TQT_SLOT( goToDocument() ), actionCollection(), "goto_document" ); // For RMB inside a cell, see KWFrameView::showPopup // This isn't a dynamic list; it's only plugged/unplugged depending on the context. // If you change the contents of that list, check ~KWView. - m_tableActionList.append( new KActionSeparator(actionCollection()) ); + m_tableActionList.append( new TDEActionSeparator(actionCollection()) ); m_tableActionList.append( m_actionTableInsertRow ); m_tableActionList.append( m_actionTableDelRow ); m_tableActionList.append( m_actionTableInsertCol ); @@ -1420,14 +1420,14 @@ void KWView::updateGridButton() m_actionViewSnapToGrid->setChecked ( m_doc->snapToGrid() ); } -void KWView::loadexpressionActions( KActionMenu * parentMenu) +void KWView::loadexpressionActions( TDEActionMenu * parentMenu) { - KActionPtrList lst = actionCollection()->actions("expression-action"); - TQValueList actions = lst; - TQValueList::ConstIterator it = lst.begin(); - TQValueList::ConstIterator end = lst.end(); + TDEActionPtrList lst = actionCollection()->actions("expression-action"); + TQValueList actions = lst; + TQValueList::ConstIterator it = lst.begin(); + TQValueList::ConstIterator end = lst.end(); // Delete all actions but keep their shortcuts in mind - TQMap personalShortCuts; + TQMap personalShortCuts; for (; it != end; ++it ) { personalShortCuts.insert( (*it)->text(), (*it)->shortcut() ); @@ -1455,7 +1455,7 @@ void KWView::loadexpressionActions( KActionMenu * parentMenu) createExpressionActions( parentMenu,*it, i,(nbFile<(int)files.count()-1), personalShortCuts ); } -void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap& personalShortCut ) +void KWView::createExpressionActions( TDEActionMenu * parentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap& personalShortCut ) { TQFile file( filename ); if ( !file.exists() || !file.open( IO_ReadOnly ) ) @@ -1476,7 +1476,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f { expressionExist =true; TQString group = i18n( e.namedItem( "TypeName" ).toElement().text().utf8() ); - KActionMenu * subMenu = new KActionMenu( group, actionCollection() ); + TDEActionMenu * subMenu = new TDEActionMenu( group, actionCollection() ); parentMenu->insert( subMenu ); TQDomNode n2 = e.firstChild(); @@ -1489,7 +1489,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f if ( e2.tagName() == "Expression" ) { TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() ); - KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), + TDEAction * act = new TDEAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), actionCollection(), TQString("expression-action_%1").arg(i).latin1() ); if ( personalShortCut.contains(text) ) @@ -1512,20 +1512,20 @@ void KWView::insertExpression() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - KAction * act = (KAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); edit->insertExpression(act->text()); } } void KWView::addVariableActions( int type, const TQStringList & texts, - KActionMenu * parentMenu, const TQString & menuText ) + TDEActionMenu * parentMenu, const TQString & menuText ) { // Single items go directly into parentMenu. // For multiple items we create a submenu. if ( texts.count() > 1 && !menuText.isEmpty() ) { - KActionMenu * subMenu = new KActionMenu( menuText, actionCollection() ); + TDEActionMenu * subMenu = new TDEActionMenu( menuText, actionCollection() ); parentMenu->insert( subMenu ); parentMenu = subMenu; } @@ -1539,7 +1539,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts, v.subtype = i; TQCString actionName; actionName.sprintf( "var-action-%d-%d", type, i ); - KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), actionCollection(), actionName ); // Mainly for KEditToolbar act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) ); @@ -1551,11 +1551,11 @@ void KWView::addVariableActions( int type, const TQStringList & texts, void KWView::refreshCustomMenu() { - KActionPtrList lst2 = actionCollection()->actions("custom-variable-action"); - TQValueList actions = lst2; - TQValueList::ConstIterator it2 = lst2.begin(); - TQValueList::ConstIterator end = lst2.end(); - TQMap shortCuts; + TDEActionPtrList lst2 = actionCollection()->actions("custom-variable-action"); + TQValueList actions = lst2; + TQValueList::ConstIterator it2 = lst2.begin(); + TQValueList::ConstIterator end = lst2.end(); + TQMap shortCuts; for (; it2 != end; ++it2 ) { @@ -1564,13 +1564,13 @@ void KWView::refreshCustomMenu() } delete m_actionInsertCustom; - m_actionInsertCustom = new KActionMenu( i18n( "&Custom" ), + m_actionInsertCustom = new TDEActionMenu( i18n( "&Custom" ), actionCollection(), "insert_custom" ); actionInsertVariable->insert(m_actionInsertCustom, 0); m_actionInsertCustom->popupMenu()->clear(); TQPtrListIterator it( m_doc->variableCollection()->getVariables() ); - KAction * act=0; + TDEAction * act=0; TQStringList lst; TQString varName; int i = 0; @@ -1584,7 +1584,7 @@ void KWView::refreshCustomMenu() { lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); - act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ),actionCollection(), name ); + act = new TDEAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ),actionCollection(), name ); act->setGroup( "custom-variable-action" ); m_actionInsertCustom->insert( act ); i++; @@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu() if(state) m_actionInsertCustom->popupMenu()->insertSeparator(); - act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); + act = new TDEAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); act->setGroup( "custom-variable-action" ); @@ -1611,7 +1611,7 @@ void KWView::insertCustomVariable() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - KAction * act = (KAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); edit->insertCustomVariable(act->text()); } } @@ -2046,7 +2046,7 @@ void KWView::showCounter( KoParagCounter &c ) TQString styleStr("counterstyle_"); styleStr += TQString::number( c.style() ); //kdDebug() << "KWView::showCounter styleStr=" << styleStr << endl; - KToggleAction* act = static_cast( actionCollection()->action( styleStr.latin1() ) ); + TDEToggleAction* act = static_cast( actionCollection()->action( styleStr.latin1() ) ); Q_ASSERT( act ); if ( act ) act->setChecked( true ); @@ -2085,11 +2085,11 @@ void KWView::updateBorderButtons( const KoBorder& left, const KoBorder& right, void KWView::updateReadWrite( bool readwrite ) { // First disable or enable everything - TQValueList actions = actionCollection()->actions(); + TQValueList actions = actionCollection()->actions(); // Also grab actions from the document actions += m_doc->actionCollection()->actions(); - TQValueList::ConstIterator aIt = actions.begin(); - TQValueList::ConstIterator aEnd = actions.end(); + TQValueList::ConstIterator aIt = actions.begin(); + TQValueList::ConstIterator aEnd = actions.end(); for (; aIt != aEnd; ++aIt ) (*aIt)->setEnabled( readwrite ); @@ -2117,7 +2117,7 @@ void KWView::updateReadWrite( bool readwrite ) m_actionFormatBullet->setEnabled(true); m_actionFormatNumber->setEnabled( true); m_actionSelectBookmark->setEnabled( true ); - KAction* act = actionCollection()->action("edit_sldatabase"); + TDEAction* act = actionCollection()->action("edit_sldatabase"); if (act) act->setEnabled( true ); @@ -2182,7 +2182,7 @@ void KWView::showStyle( const TQString & styleName ) // Select style in combo m_actionFormatStyle->setCurrentItem( pos ); // Check the appropriate action among the m_actionFormatStyleMenu actions - KToggleAction* act = dynamic_cast(actionCollection()->action(style->name().utf8().data())); + TDEToggleAction* act = dynamic_cast(actionCollection()->action(style->name().utf8().data())); if ( act ) act->setChecked( true ); } @@ -2199,22 +2199,22 @@ void KWView::updateStyleList() // Generate list of styles const TQStringList lst = m_doc->styleCollection()->displayNameList(); const int pos = lst.findIndex( currentStyle ); - // Fill the combo - using a KSelectAction + // Fill the combo - using a TDESelectAction m_actionFormatStyle->setItems( lst ); if ( pos > -1 ) m_actionFormatStyle->setCurrentItem( pos ); - // Fill the menu - using a KActionMenu, so that it's possible to bind keys + // Fill the menu - using a TDEActionMenu, so that it's possible to bind keys // to individual actions TQStringList lstWithAccels; // Generate unique accelerators for the menu items - KAccelGen::generate( lst, lstWithAccels ); - TQMap shortCuts; + TDEAccelGen::generate( lst, lstWithAccels ); + TQMap shortCuts; - KActionPtrList lst2 = actionCollection()->actions("styleList"); - TQValueList actions = lst2; - TQValueList::ConstIterator it = lst2.begin(); - const TQValueList::ConstIterator end = lst2.end(); + TDEActionPtrList lst2 = actionCollection()->actions("styleList"); + TQValueList actions = lst2; + TQValueList::ConstIterator it = lst2.begin(); + const TQValueList::ConstIterator end = lst2.end(); for (; it != end; ++it ) { shortCuts.insert( TQString::fromUtf8( (*it)->name() ), (*it)->shortcut() ); @@ -2229,7 +2229,7 @@ void KWView::updateStyleList() if ( style ) { TQString name = PARAGSTYLE_ACTION_PREFIX + style->name(); - KToggleAction* act = new KToggleAction( (*it), + TDEToggleAction* act = new TDEToggleAction( (*it), shortCuts[name], TQT_TQOBJECT(this), TQT_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); @@ -2267,18 +2267,18 @@ void KWView::updateFrameStyleList() if ( pos > -1 ) m_actionFrameStyle->setCurrentItem( pos ); - // Fill the menu - using a KActionMenu, so that it's possible to bind keys + // Fill the menu - using a TDEActionMenu, so that it's possible to bind keys // to individual actions TQStringList lstWithAccels; // Generate unique accelerators for the menu items - KAccelGen::generate( lst, lstWithAccels ); - TQMap shortCuts; // style (internal) name -> shortcut + TDEAccelGen::generate( lst, lstWithAccels ); + TQMap shortCuts; // style (internal) name -> shortcut - KActionPtrList lst2 = actionCollection()->actions("frameStyleList"); - TQValueList actions = lst2; - TQValueList::ConstIterator it = lst2.begin(); - TQValueList::ConstIterator end = lst2.end(); + TDEActionPtrList lst2 = actionCollection()->actions("frameStyleList"); + TQValueList actions = lst2; + TQValueList::ConstIterator it = lst2.begin(); + TQValueList::ConstIterator end = lst2.end(); for (; it != end; ++it ) { shortCuts.insert( TQString::fromUtf8( (*it)->name() ), (*it)->shortcut() ); @@ -2294,7 +2294,7 @@ void KWView::updateFrameStyleList() if ( style ) { TQString name = FRAMESTYLE_ACTION_PREFIX + style->name(); - KToggleAction* act = new KToggleAction( (*it), + TDEToggleAction* act = new TDEToggleAction( (*it), shortCuts[name], // KDE4: use value() TQT_TQOBJECT(this), TQT_SLOT( slotFrameStyleSelected() ), actionCollection(), name.utf8() /*KDE4: remove conversion*/ ); @@ -2320,16 +2320,16 @@ void KWView::updateTableStyleList() if ( pos > -1 ) m_actionTableStyle->setCurrentItem( pos ); - // Fill the menu - using a KActionMenu, so that it's possible to bind keys + // Fill the menu - using a TDEActionMenu, so that it's possible to bind keys // to individual actions TQStringList lstWithAccels; // Generate unique accelerators for the menu items - KAccelGen::generate( lst, lstWithAccels ); - TQMap shortCuts; + TDEAccelGen::generate( lst, lstWithAccels ); + TQMap shortCuts; - TQValueList actions = actionCollection()->actions("tableStyleList"); - TQValueList::ConstIterator it = actions.begin(); - const TQValueList::ConstIterator end = actions.end(); + TQValueList actions = actionCollection()->actions("tableStyleList"); + TQValueList::ConstIterator it = actions.begin(); + const TQValueList::ConstIterator end = actions.end(); for (; it != end; ++it ) { shortCuts.insert( TQString::fromUtf8( (*it)->name() ), (*it)->shortcut() ); @@ -2345,7 +2345,7 @@ void KWView::updateTableStyleList() if ( style ) { TQString name = TABLESTYLE_ACTION_PREFIX + style->name(); - KToggleAction* act = new KToggleAction( (*it), + TDEToggleAction* act = new TDEToggleAction( (*it), shortCuts[name], TQT_TQOBJECT(this), TQT_SLOT( slotTableStyleSelected() ), actionCollection(), name.utf8() ); act->setExclusiveGroup( "tableStyleList" ); @@ -3580,7 +3580,7 @@ void KWView::insertVariable() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - KAction * act = (KAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); VariableDefMap::Iterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning() << "Action not found in m_variableDefMap." << endl; @@ -3627,7 +3627,7 @@ void KWView::insertFootNote() void KWView::updateTocActionText(bool hasToc) { - KActionCollection * coll = actionCollection(); + TDEActionCollection * coll = actionCollection(); TQString name= hasToc ? i18n("Update Table of &Contents"):i18n("Table of &Contents"); coll->action("insert_contents")->setText(name); } @@ -4592,7 +4592,7 @@ void KWView::frameStyleSelected( KWFrameStyle *sty ) const int pos = m_doc->frameStyleCollection()->indexOf( sty ); Q_ASSERT( pos >= 0 ); m_actionFrameStyle->setCurrentItem( pos ); - KToggleAction* act = dynamic_cast(actionCollection()->action( sty->name().utf8().data() )); + TDEToggleAction* act = dynamic_cast(actionCollection()->action( sty->name().utf8().data() )); if ( act ) act->setChecked( true ); } @@ -4661,7 +4661,7 @@ void KWView::tableStyleSelected( KWTableStyle *sty ) // Adjust GUI int pos = m_doc->tableStyleCollection()->indexOf( sty ); m_actionTableStyle->setCurrentItem( pos ); - KToggleAction* act = dynamic_cast(actionCollection()->action( sty->name().utf8().data() )); + TDEToggleAction* act = dynamic_cast(actionCollection()->action( sty->name().utf8().data() )); if ( act ) act->setChecked( true ); } @@ -7436,9 +7436,9 @@ void KWView::deleteFrameSet( KWFrameSet * frameset) } } -TQPtrList KWView::listOfResultOfCheckWord( const TQString &word ) +TQPtrList KWView::listOfResultOfCheckWord( const TQString &word ) { - TQPtrList listAction; + TQPtrList listAction; DefaultDictionary *dict = m_broker->defaultDictionary(); const TQStringList lst = dict->suggest( word ); if ( !lst.contains( word ) ) @@ -7449,7 +7449,7 @@ TQPtrList KWView::listOfResultOfCheckWord( const TQString &word ) { if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { - KAction * act = new KAction( *it ); + TDEAction * act = new TDEAction( *it ); connect( act, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotCorrectWord()) ); listAction.append( act ); } @@ -7460,7 +7460,7 @@ TQPtrList KWView::listOfResultOfCheckWord( const TQString &word ) void KWView::slotCorrectWord() { - KAction * act = (KAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); KWTextFrameSetEdit* edit = currentTextEdit(); if ( edit ) { diff --git a/kword/KWView.h b/kword/KWView.h index 70d921aa..957ee5d4 100644 --- a/kword/KWView.h +++ b/kword/KWView.h @@ -61,7 +61,7 @@ class KoPicture; class KoSearchContext; class KoTextFormatInterface; class KoRuler; -class TKSelectColorAction; +class TTDESelectColorAction; class KoPartSelectAction; class KoCharSelectDia; class KoTextFormat; @@ -73,12 +73,12 @@ class DCOPObject; class KStatusBarLabel; class KoSpell; class KURL; -class KAction; -class KActionMenu; -class KSelectAction; -class KToggleAction; -class KFontSizeAction; -class KFontAction; +class TDEAction; +class TDEActionMenu; +class TDESelectAction; +class TDEToggleAction; +class TDEFontSizeAction; +class TDEFontAction; class TQResizeEvent; class TQSplitter; @@ -187,9 +187,9 @@ public: TQPopupMenu * popupMenu( const TQString& name ); - TQPtrList &dataToolActionList() { return m_actionList; } - TQPtrList &variableActionList() { return m_variableActionList; } - TQPtrList &tableActions() { return m_tableActionList; } + TQPtrList &dataToolActionList() { return m_actionList; } + TQPtrList &variableActionList() { return m_variableActionList; } + TQPtrList &tableActions() { return m_tableActionList; } enum { // bitfield ProvidesImage = 1, @@ -221,7 +221,7 @@ public: void deleteFrameSet( KWFrameSet *); - TQPtrList listOfResultOfCheckWord( const TQString &word ); + TQPtrList listOfResultOfCheckWord( const TQString &word ); int tableSelectCell(const TQString &tableName, uint row, uint col); void tableInsertRow(uint row, KWTableFrameSet *table = 0); @@ -497,11 +497,11 @@ protected slots: protected: void addVariableActions( int type, const TQStringList & texts, - KActionMenu * parentMenu, const TQString & menuText ); + TDEActionMenu * parentMenu, const TQString & menuText ); - void loadexpressionActions( KActionMenu * parentMenu); + void loadexpressionActions( TDEActionMenu * parentMenu); - void createExpressionActions( KActionMenu * parentMenu,const TQString& filename,int &i , bool insertSepar, const TQMap& personalShortCut ); + void createExpressionActions( TDEActionMenu * parentMenu,const TQString& filename,int &i , bool insertSepar, const TQMap& personalShortCut ); void showParagraphDialog( int initialPage = -1, double initialTabPos = 0.0 ); @@ -556,207 +556,207 @@ private: // methods private: // variables KWDocument *m_doc; - KAction *m_actionFileStatistics; - KAction *m_actionEditCut; - KAction *m_actionEditCopy; - KAction *m_actionEditPaste; - KAction *m_actionEditSelectAll; - KAction *m_actionEditSelectCurrentFrame; - KAction *m_actionEditDelFrame; - KAction *m_actionCreateLinkedFrame; - KAction *m_actionRaiseFrame; - KAction *m_actionLowerFrame; - KAction *m_actionSendBackward; - KAction *m_actionBringToFront; - - KAction *m_actionEditCustomVars; - KAction *m_actionEditCustomVarsEdit; - KAction *m_actionEditFind; - KAction *m_actionEditFindNext; - KAction *m_actionEditFindPrevious; - KAction *m_actionEditReplace; - KAction *m_actionApplyAutoFormat; - - KToggleAction *m_actionViewTextMode; - KToggleAction *m_actionViewPageMode; - KToggleAction *m_actionViewPreviewMode; - - KToggleAction *m_actionViewFormattingChars; - KToggleAction *m_actionViewFrameBorders; - KToggleAction *m_actionViewHeader; - KToggleAction *m_actionViewFooter; - KToggleAction *m_actionViewFootNotes; - KToggleAction *m_actionViewEndNotes; - KToggleAction *m_actionShowDocStruct; - KToggleAction *m_actionShowRuler; - KToggleAction *m_actionViewShowGrid; - KToggleAction *m_actionViewSnapToGrid; - KToggleAction *m_actionAllowAutoFormat; - - KToggleAction *m_actionAllowBgSpellCheck; - - KSelectAction *m_actionViewZoom; - - KAction *m_actionInsertFrameBreak; - KAction *m_actionInsertFootEndNote; - KAction *m_actionInsertContents; - KAction *m_actionInsertLink; - KAction *m_actionInsertComment; - KAction *m_actionEditComment; - KAction *m_actionRemoveComment; - KAction *m_actionCopyTextOfComment; - //KAction *actionInsertPage; - KAction *m_actionDeletePage; - - KActionMenu *actionInsertVariable; + TDEAction *m_actionFileStatistics; + TDEAction *m_actionEditCut; + TDEAction *m_actionEditCopy; + TDEAction *m_actionEditPaste; + TDEAction *m_actionEditSelectAll; + TDEAction *m_actionEditSelectCurrentFrame; + TDEAction *m_actionEditDelFrame; + TDEAction *m_actionCreateLinkedFrame; + TDEAction *m_actionRaiseFrame; + TDEAction *m_actionLowerFrame; + TDEAction *m_actionSendBackward; + TDEAction *m_actionBringToFront; + + TDEAction *m_actionEditCustomVars; + TDEAction *m_actionEditCustomVarsEdit; + TDEAction *m_actionEditFind; + TDEAction *m_actionEditFindNext; + TDEAction *m_actionEditFindPrevious; + TDEAction *m_actionEditReplace; + TDEAction *m_actionApplyAutoFormat; + + TDEToggleAction *m_actionViewTextMode; + TDEToggleAction *m_actionViewPageMode; + TDEToggleAction *m_actionViewPreviewMode; + + TDEToggleAction *m_actionViewFormattingChars; + TDEToggleAction *m_actionViewFrameBorders; + TDEToggleAction *m_actionViewHeader; + TDEToggleAction *m_actionViewFooter; + TDEToggleAction *m_actionViewFootNotes; + TDEToggleAction *m_actionViewEndNotes; + TDEToggleAction *m_actionShowDocStruct; + TDEToggleAction *m_actionShowRuler; + TDEToggleAction *m_actionViewShowGrid; + TDEToggleAction *m_actionViewSnapToGrid; + TDEToggleAction *m_actionAllowAutoFormat; + + TDEToggleAction *m_actionAllowBgSpellCheck; + + TDESelectAction *m_actionViewZoom; + + TDEAction *m_actionInsertFrameBreak; + TDEAction *m_actionInsertFootEndNote; + TDEAction *m_actionInsertContents; + TDEAction *m_actionInsertLink; + TDEAction *m_actionInsertComment; + TDEAction *m_actionEditComment; + TDEAction *m_actionRemoveComment; + TDEAction *m_actionCopyTextOfComment; + //TDEAction *actionInsertPage; + TDEAction *m_actionDeletePage; + + TDEActionMenu *actionInsertVariable; struct VariableDef { int type; int subtype; }; - typedef TQMap VariableDefMap; - KActionMenu *m_actionInsertExpression; + typedef TQMap VariableDefMap; + TDEActionMenu *m_actionInsertExpression; - KActionMenu *m_actionInsertCustom; + TDEActionMenu *m_actionInsertCustom; VariableDefMap m_variableDefMap; - KAction *m_actionInsertFormula; - KAction *m_actionInsertTable; - KAction *m_actionAutoFormat; + TDEAction *m_actionInsertFormula; + TDEAction *m_actionInsertTable; + TDEAction *m_actionAutoFormat; - KToggleAction *m_actionToolsCreateText; - KToggleAction *m_actionToolsCreatePix; + TDEToggleAction *m_actionToolsCreateText; + TDEToggleAction *m_actionToolsCreatePix; KoPartSelectAction *m_actionToolsCreatePart; - KAction *m_actionFormatFont; - KAction *m_actionFormatDefault; - KAction *m_actionFormatFrameStylist; - KAction *m_actionFormatStylist; - KAction *m_actionFormatPage; - - KAction *m_actionFontSizeIncrease; - KAction *m_actionFontSizeDecrease; - - KFontSizeAction *m_actionFormatFontSize; - KFontAction *m_actionFormatFontFamily; - KSelectAction *m_actionFormatStyle; - KActionMenu *m_actionFormatStyleMenu; - KToggleAction *m_actionFormatBold; - KToggleAction *m_actionFormatItalic; - KToggleAction *m_actionFormatUnderline; - KToggleAction *m_actionFormatStrikeOut; - TKSelectColorAction *m_actionFormatColor; - KToggleAction *m_actionFormatAlignLeft; - KToggleAction *m_actionFormatAlignCenter; - KToggleAction *m_actionFormatAlignRight; - KToggleAction *m_actionFormatAlignBlock; - KToggleAction *m_actionFormatSpacingSingle; - KToggleAction *m_actionFormatSpacingOneAndHalf; - KToggleAction *m_actionFormatSpacingDouble; - KAction *m_actionFormatParag; - KAction *m_actionFormatFrameSet; - KAction *m_actionFormatIncreaseIndent; - KAction *m_actionFormatDecreaseIndent; - KActionMenu *m_actionFormatBullet; - KActionMenu *m_actionFormatNumber; - KToggleAction *m_actionFormatSuper; - KToggleAction *m_actionFormatSub; - KAction* m_actionInsertSpecialChar; + TDEAction *m_actionFormatFont; + TDEAction *m_actionFormatDefault; + TDEAction *m_actionFormatFrameStylist; + TDEAction *m_actionFormatStylist; + TDEAction *m_actionFormatPage; + + TDEAction *m_actionFontSizeIncrease; + TDEAction *m_actionFontSizeDecrease; + + TDEFontSizeAction *m_actionFormatFontSize; + TDEFontAction *m_actionFormatFontFamily; + TDESelectAction *m_actionFormatStyle; + TDEActionMenu *m_actionFormatStyleMenu; + TDEToggleAction *m_actionFormatBold; + TDEToggleAction *m_actionFormatItalic; + TDEToggleAction *m_actionFormatUnderline; + TDEToggleAction *m_actionFormatStrikeOut; + TTDESelectColorAction *m_actionFormatColor; + TDEToggleAction *m_actionFormatAlignLeft; + TDEToggleAction *m_actionFormatAlignCenter; + TDEToggleAction *m_actionFormatAlignRight; + TDEToggleAction *m_actionFormatAlignBlock; + TDEToggleAction *m_actionFormatSpacingSingle; + TDEToggleAction *m_actionFormatSpacingOneAndHalf; + TDEToggleAction *m_actionFormatSpacingDouble; + TDEAction *m_actionFormatParag; + TDEAction *m_actionFormatFrameSet; + TDEAction *m_actionFormatIncreaseIndent; + TDEAction *m_actionFormatDecreaseIndent; + TDEActionMenu *m_actionFormatBullet; + TDEActionMenu *m_actionFormatNumber; + TDEToggleAction *m_actionFormatSuper; + TDEToggleAction *m_actionFormatSub; + TDEAction* m_actionInsertSpecialChar; // Text and Frame borders. - KSelectAction *m_actionFrameStyle; - KActionMenu *m_actionFrameStyleMenu; - KSelectAction *m_actionTableStyle; - KActionMenu *m_actionTableStyleMenu; - KToggleAction *m_actionBorderLeft; - KToggleAction *m_actionBorderRight; - KToggleAction *m_actionBorderTop; - KToggleAction *m_actionBorderBottom; - KToggleAction *m_actionBorderOutline; - TKSelectColorAction *m_actionBorderColor; - KSelectAction *m_actionBorderWidth; - KSelectAction *m_actionBorderStyle; - TKSelectColorAction *m_actionBackgroundColor; + TDESelectAction *m_actionFrameStyle; + TDEActionMenu *m_actionFrameStyleMenu; + TDESelectAction *m_actionTableStyle; + TDEActionMenu *m_actionTableStyleMenu; + TDEToggleAction *m_actionBorderLeft; + TDEToggleAction *m_actionBorderRight; + TDEToggleAction *m_actionBorderTop; + TDEToggleAction *m_actionBorderBottom; + TDEToggleAction *m_actionBorderOutline; + TTDESelectColorAction *m_actionBorderColor; + TDESelectAction *m_actionBorderWidth; + TDESelectAction *m_actionBorderStyle; + TTDESelectColorAction *m_actionBackgroundColor; - KAction *m_actionTableDelRow; - KAction *m_actionTableDelCol; - KAction *m_actionTableInsertRow; - KAction *m_actionTableInsertCol; - KAction *m_actionTableResizeCol; - KAction *m_actionTableJoinCells; - KAction *m_actionTableSplitCells; - KAction *m_actionConvertTableToText; - KAction *m_actionSortText; - KAction *m_actionAddPersonalExpression; - KToggleAction *m_actionTableProtectCells; + TDEAction *m_actionTableDelRow; + TDEAction *m_actionTableDelCol; + TDEAction *m_actionTableInsertRow; + TDEAction *m_actionTableInsertCol; + TDEAction *m_actionTableResizeCol; + TDEAction *m_actionTableJoinCells; + TDEAction *m_actionTableSplitCells; + TDEAction *m_actionConvertTableToText; + TDEAction *m_actionSortText; + TDEAction *m_actionAddPersonalExpression; + TDEToggleAction *m_actionTableProtectCells; - KAction *m_actionTableUngroup; - KAction *m_actionTableDelete; + TDEAction *m_actionTableUngroup; + TDEAction *m_actionTableDelete; - KAction *m_actionTableStylist; - KAction *m_actionTablePropertiesMenu; - KAction *m_actionTableProperties; + TDEAction *m_actionTableStylist; + TDEAction *m_actionTablePropertiesMenu; + TDEAction *m_actionTableProperties; - KAction *m_actionExtraCreateTemplate; + TDEAction *m_actionExtraCreateTemplate; - KAction *m_actionChangeCase; + TDEAction *m_actionChangeCase; - KAction *m_actionEditPersonnalExpr; + TDEAction *m_actionEditPersonnalExpr; - KAction *m_actionConfigure; + TDEAction *m_actionConfigure; - KAction *m_actionConfigureCompletion; + TDEAction *m_actionConfigureCompletion; - KAction *m_actionSavePicture; + TDEAction *m_actionSavePicture; - KAction *m_actionConfigureHeaderFooter; - KToggleAction *m_actionInlineFrame; + TDEAction *m_actionConfigureHeaderFooter; + TDEToggleAction *m_actionInlineFrame; - KAction *m_actionOpenLink; - KAction *m_actionChangeLink; - KAction *m_actionCopyLink; - KAction *m_actionAddLinkToBookmak; - KAction *m_actionRemoveLink; + TDEAction *m_actionOpenLink; + TDEAction *m_actionChangeLink; + TDEAction *m_actionCopyLink; + TDEAction *m_actionAddLinkToBookmak; + TDEAction *m_actionRemoveLink; - KAction *m_actionRefreshAllVariable; - KAction *m_actionCreateStyleFromSelection; + TDEAction *m_actionRefreshAllVariable; + TDEAction *m_actionCreateStyleFromSelection; - KAction *m_actionConfigureFootEndNote; + TDEAction *m_actionConfigureFootEndNote; - KAction *m_actionEditFootEndNote; + TDEAction *m_actionEditFootEndNote; - KAction *m_actionChangeFootNoteType; + TDEAction *m_actionChangeFootNoteType; - KAction *m_actionGoToFootEndNote; + TDEAction *m_actionGoToFootEndNote; // Document Structure Area popup menu. - KAction *m_actionDocStructEdit; - KAction *m_actionDocStructSpeak; - KAction *m_actionDocStructSelect; - KAction *m_actionDocStructDelete; - KAction *m_actionDocStructProperties; + TDEAction *m_actionDocStructEdit; + TDEAction *m_actionDocStructSpeak; + TDEAction *m_actionDocStructSelect; + TDEAction *m_actionDocStructDelete; + TDEAction *m_actionDocStructProperties; - KAction *m_actionInsertFile; + TDEAction *m_actionInsertFile; - KAction *m_actionAddBookmark; - KAction *m_actionSelectBookmark; + TDEAction *m_actionAddBookmark; + TDEAction *m_actionSelectBookmark; - KAction *m_actionImportStyle; + TDEAction *m_actionImportStyle; - KAction *m_actionCreateFrameStyle; + TDEAction *m_actionCreateFrameStyle; - KAction *m_actionConvertToTextBox; + TDEAction *m_actionConvertToTextBox; - KAction *m_actionSpellIgnoreAll; - KAction *m_actionSpellCheck; + TDEAction *m_actionSpellIgnoreAll; + TDEAction *m_actionSpellCheck; - KToggleAction *m_actionEmbeddedStoreInternal; + TDEToggleAction *m_actionEmbeddedStoreInternal; - KAction *m_actionAddWordToPersonalDictionary; + TDEAction *m_actionAddWordToPersonalDictionary; - KToggleAction *m_actionInsertDirectCursor; + TDEToggleAction *m_actionInsertDirectCursor; - KAction *m_actionGoToDocumentStructure; - KAction *m_actionGoToDocument; + TDEAction *m_actionGoToDocumentStructure; + TDEAction *m_actionGoToDocument; KoCharSelectDia *m_specialCharDlg; @@ -770,9 +770,9 @@ private: // variables KoSearchContext *m_searchEntry, *m_replaceEntry; KWFindReplace *m_findReplace; - TQPtrList m_actionList; // for the kodatatools - TQPtrList m_variableActionList; - TQPtrList m_tableActionList; + TQPtrList m_actionList; // for the kodatatools + TQPtrList m_variableActionList; + TQPtrList m_tableActionList; KWPage *m_currentPage; ///< current page number diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index af8f5723..38430e4b 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -136,7 +136,7 @@ - + Name @@ -243,7 +243,7 @@ mSelectedView - + Name diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui index afff8c7f..198e8f2f 100644 --- a/kword/mailmerge/sql/kwqtsqlpower.ui +++ b/kword/mailmerge/sql/kwqtsqlpower.ui @@ -42,7 +42,7 @@ 6 - + fields @@ -61,7 +61,7 @@ - + tables diff --git a/kword/tests/FrameTester.cpp b/kword/tests/FrameTester.cpp index 80848716..a5ccd80a 100644 --- a/kword/tests/FrameTester.cpp +++ b/kword/tests/FrameTester.cpp @@ -31,7 +31,7 @@ KUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester); void KWFrameTester::allTests() { int argc = 0; char** argv = 0; - TQApplication app( argc, argv ); // needed for KWDocument, due to KWCommandHistory -> KToolBarPopupAction -> TQPopupMenu -> TQWidget + TQApplication app( argc, argv ); // needed for KWDocument, due to KWCommandHistory -> TDEToolBarPopupAction -> TQPopupMenu -> TQWidget testSimpleFrame(); testFrameList(); diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN index a6a7eccb..90a85d72 100644 --- a/lib/kformula/DESIGN +++ b/lib/kformula/DESIGN @@ -324,7 +324,7 @@ blame. Interface templates ################### -Decide what KAction have to be toolbars, +Decide what TDEAction have to be toolbars, what element templates must be loaded, what toolbar display.... There will be predefined (sorry for the spelling error) templates for -General... diff --git a/lib/kformula/README b/lib/kformula/README index 5cd97995..e4632dc6 100644 --- a/lib/kformula/README +++ b/lib/kformula/README @@ -40,6 +40,6 @@ Ctrl-G make current letter a greek one Text, numbers and operators are supported as well. Please note that the key bindings are for testing only. The library -is meant to be used with KActions. Look at KFormulaDocument::createActions. +is meant to be used with TDEActions. Look at KFormulaDocument::createActions. See DESIGN to know the structure of the formulas diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 3152c26b..687345e2 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -287,9 +287,9 @@ bool ConfigurePage::selectFont( TQFont & font ) { TQStringList list; - KFontChooser::getFontList( list, KFontChooser::SmoothScalableFonts ); + TDEFontChooser::getFontList( list, TDEFontChooser::SmoothScalableFonts ); - KFontDialog dlg( m_view, 0, false, true, list ); + TDEFontDialog dlg( m_view, 0, false, true, list ); dlg.setFont( font ); int result = dlg.exec(); @@ -317,10 +317,10 @@ void ConfigurePage::slotChanged() m_changed = true; } -// class UsedFontItem : public KListViewItem { +// class UsedFontItem : public TDEListViewItem { // public: // UsedFontItem( MathFontsConfigurePage* page, TQListView* parent, TQString font ) -// : KListViewItem( parent, font ), m_page( page ) {} +// : TDEListViewItem( parent, font ), m_page( page ) {} // int compare( TQListViewItem* i, int col, bool ascending ) const; @@ -350,7 +350,7 @@ void ConfigurePage::slotChanged() // TQHBoxLayout* hLayout = new TQHBoxLayout( 0, 0, 6 ); -// availableFonts = new KListView( fontWidget ); +// availableFonts = new TDEListView( fontWidget ); // availableFonts->addColumn( i18n( "Available Fonts" ) ); // hLayout->addWidget( availableFonts ); @@ -377,7 +377,7 @@ void ConfigurePage::slotChanged() // moveUp->setText( i18n( "Up" ) ); // vLayout->addWidget( moveUp ); -// requestedFonts = new KListView( fontWidget ); +// requestedFonts = new TDEListView( fontWidget ); // requestedFonts->addColumn( i18n( "Used Fonts" ) ); // vLayout->addWidget( requestedFonts ); @@ -471,7 +471,7 @@ void ConfigurePage::slotChanged() // } // } // for ( TQMap::iterator it = fontMap.begin(); it != fontMap.end(); ++it ) { -// new KListViewItem( availableFonts, it.key() ); +// new TDEListViewItem( availableFonts, it.key() ); // } // } @@ -499,7 +499,7 @@ void ConfigurePage::slotChanged() // } // //requestedFonts->takeItem( fontItem ); // delete fontItem; -// new KListViewItem( availableFonts, fontName ); +// new TDEListViewItem( availableFonts, fontName ); // } // } diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h index 37776f0f..b87cf844 100644 --- a/lib/kformula/kformulaconfigpage.h +++ b/lib/kformula/kformulaconfigpage.h @@ -40,7 +40,7 @@ class TQWidget; class KColorButton; class TDEConfig; -class KListView; +class TDEListView; class KPushButton; class KIntNumInput; @@ -135,8 +135,8 @@ private: // TQWidget* m_view; // TDEConfig* m_config; -// KListView* availableFonts; -// KListView* requestedFonts; +// TDEListView* availableFonts; +// TDEListView* requestedFonts; // KPushButton* addFont; // KPushButton* removeFont; diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 1b440b99..251893d1 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -369,7 +369,7 @@ void Document::introduceWrapper( DocumentWrapper* wrapper, bool init ) ////////////////////////////////////////////////////////////////////////////// DocumentWrapper::DocumentWrapper( TDEConfig* config, - KActionCollection* collection, + TDEActionCollection* collection, KoCommandHistory* history ) : m_document( 0 ), m_leftBracketChar( LeftRoundBracket ), @@ -434,193 +434,193 @@ void DocumentWrapper::setCommandStack( KoCommandHistory* history ) } -void DocumentWrapper::createActions( KActionCollection* collection ) +void DocumentWrapper::createActions( TDEActionCollection* collection ) { TDEGlobal::dirs()->addResourceType( "toolbar", TDEStandardDirs::kde_default("data") + "kformula/pics/" ); - m_addNegThinSpaceAction = new KAction( i18n( "Add Negative Thin Space" ), + m_addNegThinSpaceAction = new TDEAction( i18n( "Add Negative Thin Space" ), 0, this, TQT_SLOT( addNegThinSpace() ), collection, "formula_addnegthinspace") ; - m_addThinSpaceAction = new KAction( i18n( "Add Thin Space" ), + m_addThinSpaceAction = new TDEAction( i18n( "Add Thin Space" ), 0, this, TQT_SLOT( addThinSpace() ), collection, "formula_addthinspace") ; - m_addMediumSpaceAction = new KAction( i18n( "Add Medium Space" ), + m_addMediumSpaceAction = new TDEAction( i18n( "Add Medium Space" ), 0, this, TQT_SLOT( addMediumSpace() ), collection, "formula_addmediumspace" ); - m_addThickSpaceAction = new KAction( i18n( "Add Thick Space" ), + m_addThickSpaceAction = new TDEAction( i18n( "Add Thick Space" ), 0, this, TQT_SLOT( addThickSpace() ), collection, "formula_addthickspace" ); - m_addQuadSpaceAction = new KAction( i18n( "Add Quad Space" ), + m_addQuadSpaceAction = new TDEAction( i18n( "Add Quad Space" ), 0, this, TQT_SLOT( addQuadSpace() ), collection, "formula_addquadspace" ); - m_addIntegralAction = new KAction(i18n("Add Integral"), + m_addIntegralAction = new TDEAction(i18n("Add Integral"), "int", 0, this, TQT_SLOT(addIntegral()), collection, "formula_addintegral"); - m_addSumAction = new KAction(i18n("Add Sum"), + m_addSumAction = new TDEAction(i18n("Add Sum"), "sum", 0, this, TQT_SLOT(addSum()), collection, "formula_addsum"); - m_addProductAction = new KAction(i18n("Add Product"), + m_addProductAction = new TDEAction(i18n("Add Product"), "prod", 0, this, TQT_SLOT(addProduct()), collection, "formula_addproduct"); - m_addRootAction = new KAction(i18n("Add Root"), + m_addRootAction = new TDEAction(i18n("Add Root"), "sqrt", 0, this, TQT_SLOT(addRoot()), collection, "formula_addroot"); - m_addFractionAction = new KAction(i18n("Add Fraction"), + m_addFractionAction = new TDEAction(i18n("Add Fraction"), "frac", 0, this, TQT_SLOT(addFraction()), collection, "formula_addfrac"); - m_addBracketAction = new KAction(i18n("Add Bracket"), + m_addBracketAction = new TDEAction(i18n("Add Bracket"), "paren", 0, this, TQT_SLOT(addDefaultBracket()), collection,"formula_addbra"); - m_addSBracketAction = new KAction(i18n("Add Square Bracket"), + m_addSBracketAction = new TDEAction(i18n("Add Square Bracket"), "brackets", 0, this, TQT_SLOT(addSquareBracket()), collection,"formula_addsqrbra"); - m_addCBracketAction = new KAction(i18n("Add Curly Bracket"), + m_addCBracketAction = new TDEAction(i18n("Add Curly Bracket"), "math_brace", 0, this, TQT_SLOT(addCurlyBracket()), collection,"formula_addcurbra"); - m_addAbsAction = new KAction(i18n("Add Abs"), + m_addAbsAction = new TDEAction(i18n("Add Abs"), "abs", 0, this, TQT_SLOT(addLineBracket()), collection,"formula_addabsbra"); - m_addMatrixAction = new KAction(i18n("Add Matrix..."), + m_addMatrixAction = new TDEAction(i18n("Add Matrix..."), "matrix", 0, this, TQT_SLOT(addMatrix()), collection, "formula_addmatrix"); - m_addOneByTwoMatrixAction = new KAction(i18n("Add 1x2 Matrix"), + m_addOneByTwoMatrixAction = new TDEAction(i18n("Add 1x2 Matrix"), "onetwomatrix", 0, this, TQT_SLOT(addOneByTwoMatrix()), collection, "formula_add_one_by_two_matrix"); - m_addUpperLeftAction = new KAction(i18n("Add Upper Left Index"), + m_addUpperLeftAction = new TDEAction(i18n("Add Upper Left Index"), "lsup", 0, this, TQT_SLOT(addUpperLeftIndex()), collection, "formula_addupperleft"); - m_addLowerLeftAction = new KAction(i18n("Add Lower Left Index"), + m_addLowerLeftAction = new TDEAction(i18n("Add Lower Left Index"), "lsub", 0, this, TQT_SLOT(addLowerLeftIndex()), collection, "formula_addlowerleft"); - m_addUpperRightAction = new KAction(i18n("Add Upper Right Index"), + m_addUpperRightAction = new TDEAction(i18n("Add Upper Right Index"), "rsup", 0, this, TQT_SLOT(addUpperRightIndex()), collection, "formula_addupperright"); - m_addLowerRightAction = new KAction(i18n("Add Lower Right Index"), + m_addLowerRightAction = new TDEAction(i18n("Add Lower Right Index"), "rsub", 0, this, TQT_SLOT(addLowerRightIndex()), collection, "formula_addlowerright"); - m_addGenericUpperAction = new KAction(i18n("Add Upper Index"), + m_addGenericUpperAction = new TDEAction(i18n("Add Upper Index"), "gsup", /*CTRL + Key_U*/0, this, TQT_SLOT(addGenericUpperIndex()), collection, "formula_addupperindex"); - m_addGenericLowerAction = new KAction(i18n("Add Lower Index"), + m_addGenericLowerAction = new TDEAction(i18n("Add Lower Index"), "gsub", 0, this, TQT_SLOT(addGenericLowerIndex()), collection, "formula_addlowerindex"); - m_addOverlineAction = new KAction(i18n("Add Overline"), + m_addOverlineAction = new TDEAction(i18n("Add Overline"), "over", 0, this, TQT_SLOT(addOverline()), collection, "formula_addoverline"); - m_addUnderlineAction = new KAction(i18n("Add Underline"), + m_addUnderlineAction = new TDEAction(i18n("Add Underline"), "under", 0, this, TQT_SLOT(addUnderline()), collection, "formula_addunderline"); - m_addMultilineAction = new KAction(i18n("Add Multiline"), + m_addMultilineAction = new TDEAction(i18n("Add Multiline"), "multiline", 0, this, TQT_SLOT(addMultiline()), collection, "formula_addmultiline"); - m_removeEnclosingAction = new KAction(i18n("Remove Enclosing Element"), + m_removeEnclosingAction = new TDEAction(i18n("Remove Enclosing Element"), 0, this, TQT_SLOT(removeEnclosing()), collection, "formula_removeenclosing"); - m_makeGreekAction = new KAction(i18n("Convert to Greek"), + m_makeGreekAction = new TDEAction(i18n("Convert to Greek"), 0, this, TQT_SLOT(makeGreek()), collection, "formula_makegreek"); - m_appendColumnAction = new KAction( i18n( "Append Column" ), + m_appendColumnAction = new TDEAction( i18n( "Append Column" ), "inscol", 0, this, TQT_SLOT( appendColumn() ), collection, "formula_appendcolumn" ); - m_insertColumnAction = new KAction( i18n( "Insert Column" ), + m_insertColumnAction = new TDEAction( i18n( "Insert Column" ), "inscol", 0, this, TQT_SLOT( insertColumn() ), collection, "formula_insertcolumn" ); - m_removeColumnAction = new KAction( i18n( "Remove Column" ), + m_removeColumnAction = new TDEAction( i18n( "Remove Column" ), "remcol", 0, this, TQT_SLOT( removeColumn() ), collection, "formula_removecolumn" ); - m_appendRowAction = new KAction( i18n( "Append Row" ), + m_appendRowAction = new TDEAction( i18n( "Append Row" ), "insrow", 0, this, TQT_SLOT( appendRow() ), collection, "formula_appendrow" ); - m_insertRowAction = new KAction( i18n( "Insert Row" ), + m_insertRowAction = new TDEAction( i18n( "Insert Row" ), "insrow", 0, this, TQT_SLOT( insertRow() ), collection, "formula_insertrow" ); - m_removeRowAction = new KAction( i18n( "Remove Row" ), + m_removeRowAction = new TDEAction( i18n( "Remove Row" ), "remrow", 0, this, TQT_SLOT( removeRow() ), collection, "formula_removerow" ); - m_syntaxHighlightingAction = new KToggleAction(i18n("Syntax Highlighting"), + m_syntaxHighlightingAction = new TDEToggleAction(i18n("Syntax Highlighting"), 0, this, TQT_SLOT(toggleSyntaxHighlighting()), collection, "formula_syntaxhighlighting"); //m_syntaxHighlightingAction->setChecked( m_contextStyle->syntaxHighlighting() ); - m_formatBoldAction = new KToggleAction( i18n( "&Bold" ), "text_bold", + m_formatBoldAction = new TDEToggleAction( i18n( "&Bold" ), "text_bold", 0, //CTRL + Key_B, this, TQT_SLOT( textBold() ), collection, "formula_format_bold" ); - m_formatItalicAction = new KToggleAction( i18n( "&Italic" ), "text_italic", + m_formatItalicAction = new TDEToggleAction( i18n( "&Italic" ), "text_italic", 0, //CTRL + Key_I, this, TQT_SLOT( textItalic() ), collection, "formula_format_italic" ); @@ -640,7 +640,7 @@ void DocumentWrapper::createActions( KActionCollection* collection ) delimiter.append(TQString("]")); delimiter.append(TQString("}")); delimiter.append(TQString(">")); - m_leftBracket = new KSelectAction(i18n("Left Delimiter"), + m_leftBracket = new TDESelectAction(i18n("Left Delimiter"), 0, this, TQT_SLOT(delimiterLeft()), collection, "formula_typeleft"); m_leftBracket->setItems(delimiter); @@ -659,13 +659,13 @@ void DocumentWrapper::createActions( KActionCollection* collection ) delimiter.append(TQString("[")); delimiter.append(TQString("{")); delimiter.append(TQString("<")); - m_rightBracket = new KSelectAction(i18n("Right Delimiter"), + m_rightBracket = new TDESelectAction(i18n("Right Delimiter"), 0, this, TQT_SLOT(delimiterRight()), collection, "formula_typeright"); m_rightBracket->setItems(delimiter); //rightBracket->setCurrentItem(0); - m_insertSymbolAction = new KAction(i18n("Insert Symbol"), + m_insertSymbolAction = new TDEAction(i18n("Insert Symbol"), "key_enter", /*CTRL + Key_I*/0, this, TQT_SLOT(insertSymbol()), @@ -679,7 +679,7 @@ void DocumentWrapper::createActions( KActionCollection* collection ) ff.append( i18n( "Script" ) ); ff.append( i18n( "Fraktur" ) ); ff.append( i18n( "Double Struck" ) ); - m_fontFamily = new KSelectAction(i18n("Font Family"), + m_fontFamily = new TDESelectAction(i18n("Font Family"), 0, this, TQT_SLOT(fontFamily()), collection, "formula_fontfamily"); m_fontFamily->setItems( ff ); @@ -690,7 +690,7 @@ void DocumentWrapper::createActions( KActionCollection* collection ) et.append( i18n( "Operator" ) ); et.append( i18n( "Number" ) ); et.append( i18n( "Text" ) ); - m_tokenElement = new KSelectAction( i18n( "Token Type" ), + m_tokenElement = new TDESelectAction( i18n( "Token Type" ), 0, this, TQT_SLOT( tokenElement() ), collection, "formula_tokenelement" ); m_tokenElement->setItems( et ); @@ -1219,59 +1219,59 @@ void DocumentWrapper::setEnabled( bool enabled ) if ( enabled ) { getAddGenericUpperAction()-> - setShortcut( KShortcut( CTRL + Key_U ) ); + setShortcut( TDEShortcut( CTRL + Key_U ) ); getAddGenericLowerAction()-> - setShortcut( KShortcut( CTRL + Key_L ) ); + setShortcut( TDEShortcut( CTRL + Key_L ) ); getRemoveEnclosingAction()-> - setShortcut( KShortcut( CTRL + Key_R ) ); + setShortcut( TDEShortcut( CTRL + Key_R ) ); getMakeGreekAction()-> - setShortcut( KShortcut( CTRL + Key_G ) ); + setShortcut( TDEShortcut( CTRL + Key_G ) ); getInsertSymbolAction()-> - setShortcut( KShortcut( CTRL + Key_I ) ); + setShortcut( TDEShortcut( CTRL + Key_I ) ); getAddOverlineAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_O ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_O ) ); getAddUnderlineAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_U ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_U ) ); getAddBracketAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_B ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_B ) ); getAddSBracketAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_D ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_D ) ); getAddCBracketAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_C ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_C ) ); getAddAbsAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_A ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_A ) ); getAddFractionAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_F ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_F ) ); getAddRootAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_R ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_R ) ); getAddSumAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_S ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_S ) ); getAddProductAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_P ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_P ) ); getAddIntegralAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_I ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_I ) ); getAddMatrixAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_M ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_M ) ); } else { - getAddGenericUpperAction()->setShortcut( KShortcut() ); - getAddGenericLowerAction()->setShortcut( KShortcut() ); - getRemoveEnclosingAction()->setShortcut( KShortcut() ); - getMakeGreekAction()->setShortcut( KShortcut() ); - getInsertSymbolAction()->setShortcut( KShortcut() ); - getAddOverlineAction()->setShortcut( KShortcut() ); - getAddUnderlineAction()->setShortcut( KShortcut() ); - getAddBracketAction()->setShortcut( KShortcut() ); - getAddSBracketAction()->setShortcut( KShortcut() ); - getAddCBracketAction()->setShortcut( KShortcut() ); - getAddAbsAction()->setShortcut( KShortcut() ); - getAddFractionAction()->setShortcut( KShortcut() ); - getAddRootAction()->setShortcut( KShortcut() ); - getAddSumAction()->setShortcut( KShortcut() ); - getAddProductAction()->setShortcut( KShortcut() ); - getAddIntegralAction()->setShortcut( KShortcut() ); - getAddMatrixAction()->setShortcut( KShortcut() ); + getAddGenericUpperAction()->setShortcut( TDEShortcut() ); + getAddGenericLowerAction()->setShortcut( TDEShortcut() ); + getRemoveEnclosingAction()->setShortcut( TDEShortcut() ); + getMakeGreekAction()->setShortcut( TDEShortcut() ); + getInsertSymbolAction()->setShortcut( TDEShortcut() ); + getAddOverlineAction()->setShortcut( TDEShortcut() ); + getAddUnderlineAction()->setShortcut( TDEShortcut() ); + getAddBracketAction()->setShortcut( TDEShortcut() ); + getAddSBracketAction()->setShortcut( TDEShortcut() ); + getAddCBracketAction()->setShortcut( TDEShortcut() ); + getAddAbsAction()->setShortcut( TDEShortcut() ); + getAddFractionAction()->setShortcut( TDEShortcut() ); + getAddRootAction()->setShortcut( TDEShortcut() ); + getAddSumAction()->setShortcut( TDEShortcut() ); + getAddProductAction()->setShortcut( TDEShortcut() ); + getAddIntegralAction()->setShortcut( TDEShortcut() ); + getAddMatrixAction()->setShortcut( TDEShortcut() ); } } diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index d541a4c5..8a3dd77d 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -296,7 +296,7 @@ class KOFORMULA_EXPORT DocumentWrapper : public TQObject { public: DocumentWrapper( TDEConfig* config, - KActionCollection* collection, + TDEActionCollection* collection, KoCommandHistory* history = 0 ); ~DocumentWrapper(); @@ -319,53 +319,53 @@ public: */ void document( Document* document, bool init = true ); - KAction* getAddNegThinSpaceAction() { return m_addNegThinSpaceAction; } - KAction* getAddThinSpaceAction() { return m_addThinSpaceAction; } - KAction* getAddMediumSpaceAction() { return m_addMediumSpaceAction; } - KAction* getAddThickSpaceAction() { return m_addThickSpaceAction; } - KAction* getAddQuadSpaceAction() { return m_addQuadSpaceAction; } - KAction* getAddBracketAction() { return m_addBracketAction; } - KAction* getAddSBracketAction() { return m_addSBracketAction;} - KAction* getAddCBracketAction() { return m_addCBracketAction;} - KAction* getAddAbsAction() { return m_addAbsAction;} - KAction* getAddFractionAction() { return m_addFractionAction; } - KAction* getAddRootAction() { return m_addRootAction; } - KAction* getAddSumAction() { return m_addSumAction; } - KAction* getAddProductAction() { return m_addProductAction; } - KAction* getAddIntegralAction() { return m_addIntegralAction; } - KAction* getAddMatrixAction() { return m_addMatrixAction; } - KAction* getAddOneByTwoMatrixAction(){ return m_addOneByTwoMatrixAction; } - KAction* getAddUpperLeftAction() { return m_addUpperLeftAction; } - KAction* getAddLowerLeftAction() { return m_addLowerLeftAction; } - KAction* getAddUpperRightAction() { return m_addUpperRightAction; } - KAction* getAddLowerRightAction() { return m_addLowerRightAction; } - KAction* getAddGenericUpperAction() { return m_addGenericUpperAction; } - KAction* getAddGenericLowerAction() { return m_addGenericLowerAction; } - KAction* getAddOverlineAction() { return m_addOverlineAction; } - KAction* getAddUnderlineAction() { return m_addUnderlineAction; } - KAction* getAddMultilineAction() { return m_addMultilineAction; } - KAction* getRemoveEnclosingAction() { return m_removeEnclosingAction; } - KAction* getMakeGreekAction() { return m_makeGreekAction; } - KAction* getInsertSymbolAction() { return m_insertSymbolAction; } - - KAction* getAppendColumnAction() { return m_appendColumnAction; } - KAction* getInsertColumnAction() { return m_insertColumnAction; } - KAction* getRemoveColumnAction() { return m_removeColumnAction; } - KAction* getAppendRowAction() { return m_appendRowAction; } - KAction* getInsertRowAction() { return m_insertRowAction; } - KAction* getRemoveRowAction() { return m_removeRowAction; } + TDEAction* getAddNegThinSpaceAction() { return m_addNegThinSpaceAction; } + TDEAction* getAddThinSpaceAction() { return m_addThinSpaceAction; } + TDEAction* getAddMediumSpaceAction() { return m_addMediumSpaceAction; } + TDEAction* getAddThickSpaceAction() { return m_addThickSpaceAction; } + TDEAction* getAddQuadSpaceAction() { return m_addQuadSpaceAction; } + TDEAction* getAddBracketAction() { return m_addBracketAction; } + TDEAction* getAddSBracketAction() { return m_addSBracketAction;} + TDEAction* getAddCBracketAction() { return m_addCBracketAction;} + TDEAction* getAddAbsAction() { return m_addAbsAction;} + TDEAction* getAddFractionAction() { return m_addFractionAction; } + TDEAction* getAddRootAction() { return m_addRootAction; } + TDEAction* getAddSumAction() { return m_addSumAction; } + TDEAction* getAddProductAction() { return m_addProductAction; } + TDEAction* getAddIntegralAction() { return m_addIntegralAction; } + TDEAction* getAddMatrixAction() { return m_addMatrixAction; } + TDEAction* getAddOneByTwoMatrixAction(){ return m_addOneByTwoMatrixAction; } + TDEAction* getAddUpperLeftAction() { return m_addUpperLeftAction; } + TDEAction* getAddLowerLeftAction() { return m_addLowerLeftAction; } + TDEAction* getAddUpperRightAction() { return m_addUpperRightAction; } + TDEAction* getAddLowerRightAction() { return m_addLowerRightAction; } + TDEAction* getAddGenericUpperAction() { return m_addGenericUpperAction; } + TDEAction* getAddGenericLowerAction() { return m_addGenericLowerAction; } + TDEAction* getAddOverlineAction() { return m_addOverlineAction; } + TDEAction* getAddUnderlineAction() { return m_addUnderlineAction; } + TDEAction* getAddMultilineAction() { return m_addMultilineAction; } + TDEAction* getRemoveEnclosingAction() { return m_removeEnclosingAction; } + TDEAction* getMakeGreekAction() { return m_makeGreekAction; } + TDEAction* getInsertSymbolAction() { return m_insertSymbolAction; } + + TDEAction* getAppendColumnAction() { return m_appendColumnAction; } + TDEAction* getInsertColumnAction() { return m_insertColumnAction; } + TDEAction* getRemoveColumnAction() { return m_removeColumnAction; } + TDEAction* getAppendRowAction() { return m_appendRowAction; } + TDEAction* getInsertRowAction() { return m_insertRowAction; } + TDEAction* getRemoveRowAction() { return m_removeRowAction; } void enableMatrixActions(bool); - KSelectAction* getLeftBracketAction() { return m_leftBracket; } - KSelectAction* getRightBracketAction() { return m_rightBracket; } + TDESelectAction* getLeftBracketAction() { return m_leftBracket; } + TDESelectAction* getRightBracketAction() { return m_rightBracket; } SymbolAction* getSymbolNamesAction() { return m_symbolNamesAction; } - KToggleAction* getSyntaxHighlightingAction() + TDEToggleAction* getSyntaxHighlightingAction() { return m_syntaxHighlightingAction; } - KToggleAction* getFormatBoldAction() { return m_formatBoldAction; } - KToggleAction* getFormatItalicAction() { return m_formatItalicAction; } + TDEToggleAction* getFormatBoldAction() { return m_formatBoldAction; } + TDEToggleAction* getFormatItalicAction() { return m_formatItalicAction; } - KSelectAction* getFontFamilyAction() { return m_fontFamily; } - KSelectAction* getTokenElementAction() { return m_tokenElement; } + TDESelectAction* getFontFamilyAction() { return m_fontFamily; } + TDESelectAction* getTokenElementAction() { return m_tokenElement; } SymbolType leftBracketChar() const { return m_leftBracketChar; } SymbolType rightBracketChar() const { return m_rightBracketChar; } @@ -435,7 +435,7 @@ public slots: private: - void createActions( KActionCollection* collection ); + void createActions( TDEActionCollection* collection ); void initSymbolNamesAction(); void setCommandStack( KoCommandHistory* history ); @@ -444,52 +444,52 @@ private: Document* m_document; - KAction* m_addNegThinSpaceAction; - KAction* m_addThinSpaceAction; - KAction* m_addMediumSpaceAction; - KAction* m_addThickSpaceAction; - KAction* m_addQuadSpaceAction; - KAction* m_addBracketAction; - KAction* m_addSBracketAction; - KAction* m_addCBracketAction; - KAction* m_addAbsAction; - KAction* m_addFractionAction; - KAction* m_addRootAction; - KAction* m_addSumAction; - KAction* m_addProductAction; - KAction* m_addIntegralAction; - KAction* m_addMatrixAction; - KAction* m_addOneByTwoMatrixAction; - KAction* m_addUpperLeftAction; - KAction* m_addLowerLeftAction; - KAction* m_addUpperRightAction; - KAction* m_addLowerRightAction; - KAction* m_addGenericUpperAction; - KAction* m_addGenericLowerAction; - KAction* m_addOverlineAction; - KAction* m_addUnderlineAction; - KAction* m_addMultilineAction; - KAction* m_removeEnclosingAction; - KAction* m_makeGreekAction; - KAction* m_insertSymbolAction; - - KAction* m_appendColumnAction; - KAction* m_insertColumnAction; - KAction* m_removeColumnAction; - KAction* m_appendRowAction; - KAction* m_insertRowAction; - KAction* m_removeRowAction; - - KToggleAction* m_syntaxHighlightingAction; - KToggleAction* m_formatBoldAction; - KToggleAction* m_formatItalicAction; - - KSelectAction* m_leftBracket; - KSelectAction* m_rightBracket; + TDEAction* m_addNegThinSpaceAction; + TDEAction* m_addThinSpaceAction; + TDEAction* m_addMediumSpaceAction; + TDEAction* m_addThickSpaceAction; + TDEAction* m_addQuadSpaceAction; + TDEAction* m_addBracketAction; + TDEAction* m_addSBracketAction; + TDEAction* m_addCBracketAction; + TDEAction* m_addAbsAction; + TDEAction* m_addFractionAction; + TDEAction* m_addRootAction; + TDEAction* m_addSumAction; + TDEAction* m_addProductAction; + TDEAction* m_addIntegralAction; + TDEAction* m_addMatrixAction; + TDEAction* m_addOneByTwoMatrixAction; + TDEAction* m_addUpperLeftAction; + TDEAction* m_addLowerLeftAction; + TDEAction* m_addUpperRightAction; + TDEAction* m_addLowerRightAction; + TDEAction* m_addGenericUpperAction; + TDEAction* m_addGenericLowerAction; + TDEAction* m_addOverlineAction; + TDEAction* m_addUnderlineAction; + TDEAction* m_addMultilineAction; + TDEAction* m_removeEnclosingAction; + TDEAction* m_makeGreekAction; + TDEAction* m_insertSymbolAction; + + TDEAction* m_appendColumnAction; + TDEAction* m_insertColumnAction; + TDEAction* m_removeColumnAction; + TDEAction* m_appendRowAction; + TDEAction* m_insertRowAction; + TDEAction* m_removeRowAction; + + TDEToggleAction* m_syntaxHighlightingAction; + TDEToggleAction* m_formatBoldAction; + TDEToggleAction* m_formatItalicAction; + + TDESelectAction* m_leftBracket; + TDESelectAction* m_rightBracket; SymbolAction* m_symbolNamesAction; - KSelectAction* m_fontFamily; - KSelectAction* m_tokenElement; + TDESelectAction* m_fontFamily; + TDESelectAction* m_tokenElement; SymbolType m_leftBracketChar; SymbolType m_rightBracketChar; diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index edc3d62e..58074a2b 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -102,27 +102,27 @@ void SymbolComboItem::paint( TQPainter *p ) * The symbol action * */ SymbolAction::SymbolAction( TQObject* parent, const char* name ) - : KSelectAction( parent, name ) + : TDESelectAction( parent, name ) { setEditable( FALSE ); } -SymbolAction::SymbolAction( const TQString& text, const KShortcut& cut, +SymbolAction::SymbolAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KSelectAction( text, cut, receiver, slot, parent, name ) + : TDESelectAction( text, cut, receiver, slot, parent, name ) { setEditable( FALSE ); } int SymbolAction::plug( TQWidget* w, int index ) { - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KToolBar* bar = static_cast( w ); - int id_ = KAction::getToolButtonID(); + TDEToolBar* bar = static_cast( w ); + int id_ = TDEAction::getToolButtonID(); KComboBox *cb = new KComboBox( bar ); connect( cb, TQT_SIGNAL( activated( const TQString & ) ), TQT_SLOT( slotActivated( const TQString & ) ) ); @@ -138,7 +138,7 @@ int SymbolAction::plug( TQWidget* w, int index ) return containerCount() - 1; } - else return KSelectAction::plug( w, index ); + else return TDESelectAction::plug( w, index ); } void SymbolAction::setSymbols( const TQStringList &names, @@ -157,8 +157,8 @@ void SymbolAction::setSymbols( const TQStringList &names, void SymbolAction::updateItems( int id ) { TQWidget *w = container( id ); - if ( w->inherits( "KToolBar" ) ) { - TQWidget *r = static_cast( w )->getWidget( itemId( id ) ); + if ( w->inherits( "TDEToolBar" ) ) { + TQWidget *r = static_cast( w )->getWidget( itemId( id ) ); if ( r->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *cb = static_cast( r ); cb->clear(); diff --git a/lib/kformula/symbolaction.h b/lib/kformula/symbolaction.h index b3158014..a7c91292 100644 --- a/lib/kformula/symbolaction.h +++ b/lib/kformula/symbolaction.h @@ -29,11 +29,11 @@ KFORMULA_NAMESPACE_BEGIN -class SymbolAction : public KSelectAction +class SymbolAction : public TDESelectAction { public: SymbolAction( TQObject* parent = 0, const char* name = 0 ); - SymbolAction( const TQString& text, const KShortcut& cut, + SymbolAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc index 3348e873..188a76d1 100644 --- a/lib/kofficecore/KoApplicationIface.cc +++ b/lib/kofficecore/KoApplicationIface.cc @@ -85,10 +85,10 @@ TQValueList KoApplicationIface::getViews() TQValueList KoApplicationIface::getWindows() { TQValueList lst; - TQPtrList *mainWindows = KMainWindow::memberList; + TQPtrList *mainWindows = TDEMainWindow::memberList; if ( mainWindows ) { - TQPtrListIterator it( *mainWindows ); + TQPtrListIterator it( *mainWindows ); for (; it.current(); ++it ) lst.append( DCOPRef( kapp->dcopClient()->appId(), static_cast(it.current())->dcopObject()->objId() ) ); diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 91cdb4ad..31cfde38 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -44,12 +44,12 @@ #include "KoTemplates.h" -class KoFileListItem : public KListViewItem +class KoFileListItem : public TDEListViewItem { public: - KoFileListItem(KListView* listView, TQListViewItem* after, const TQString& filename, + KoFileListItem(TDEListView* listView, TQListViewItem* after, const TQString& filename, const TQString& fullPath, KFileItem* fileItem) - : KListViewItem(listView, after, filename, fullPath), m_fileItem(fileItem) + : TDEListViewItem(listView, after, filename, fullPath), m_fileItem(fileItem) { } @@ -107,10 +107,10 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(changePalette())); } - KListViewItem* selectItem = 0; + TDEListViewItem* selectItem = 0; for (KoTemplate* t = group->first(); t != 0L; t = group->next()) { - KListViewItem* item = new KListViewItem(m_documentList, t->name(), t->description(), t->file()); + TDEListViewItem* item = new TDEListViewItem(m_documentList, t->name(), t->description(), t->file()); TQImage icon = t->loadPicture(instance).convertToImage(); icon = icon.smoothScale(64, 64, TQ_ScaleMin); icon.setAlphaBuffer(true); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 15e7b892..184dcefd 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -557,10 +557,10 @@ void KoDocument::slotAutoSave() } } -KAction *KoDocument::action( const TQDomElement &element ) const +TDEAction *KoDocument::action( const TQDomElement &element ) const { // First look in the document itself - KAction* act = KParts::ReadWritePart::action( element ); + TDEAction* act = KParts::ReadWritePart::action( element ); if ( act ) return act; diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 4947506d..cb4f9f25 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -114,7 +114,7 @@ public: /** * Returns the action described action object. In fact only the "name" attribute * of @p element is of interest here. The method searches first in the - * KActionCollection of the first view and then in the KActionCollection of this + * TDEActionCollection of the first view and then in the TDEActionCollection of this * document. * This allows %KOffice applications to define actions in both the view and the document. * They should only define view-actions (like zooming and stuff) in the view. @@ -126,7 +126,7 @@ public: * @see KXMLGUIClient::actionCollection * @see KoView::action */ - virtual KAction *action( const TQDomElement &element ) const; + virtual TDEAction *action( const TQDomElement &element ) const; /** * Returns the DOM document which describes the GUI of the diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cc index 2c9dbe70..cfa21a93 100644 --- a/lib/kofficecore/KoDocumentIface.cc +++ b/lib/kofficecore/KoDocumentIface.cc @@ -97,9 +97,9 @@ DCOPRef KoDocumentIface::action( const TQCString &name ) QCStringList KoDocumentIface::actions() { QCStringList res; - TQValueList lst = m_actionProxy->actions(); - TQValueList::ConstIterator it = lst.begin(); - TQValueList::ConstIterator end = lst.end(); + TQValueList lst = m_actionProxy->actions(); + TQValueList::ConstIterator it = lst.begin(); + TQValueList::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 7e67c148..361cc5cd 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -301,7 +301,7 @@ void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMet { TQString name = it.key(); TQString value = it.data(); - KListViewItem* it = new KListViewItem( d->m_metaWidget->metaListView, name, value ); + TDEListViewItem* it = new TDEListViewItem( d->m_metaWidget->metaListView, name, value ); it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ) ); } } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index b1e845b7..c2ecb369 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -64,7 +64,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel"); layout->addWidget (filterLabel); - m_filterList = new KListBox (page, "filterlist"); + m_filterList = new TDEListBox (page, "filterlist"); layout->addWidget (m_filterList); Q_ASSERT (!m_mimeTypes.isEmpty ()); diff --git a/lib/kofficecore/KoFilterManager_p.h b/lib/kofficecore/KoFilterManager_p.h index bdee8777..e446f6f7 100644 --- a/lib/kofficecore/KoFilterManager_p.h +++ b/lib/kofficecore/KoFilterManager_p.h @@ -24,7 +24,7 @@ #include -class KListBox; +class TDEListBox; class KoFilterChooser : public KDialogBase @@ -41,7 +41,7 @@ public: private: TQStringList m_mimeTypes; - KListBox *m_filterList; + TDEListBox *m_filterList; }; #endif diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 12e0013d..f013ca36 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -144,16 +144,16 @@ public: TQLabel * statusBarLabel; KProgress *m_progress; - TQPtrList m_splitViewActionList; + TQPtrList m_splitViewActionList; // This additional list is needed, because we don't plug // the first list, when an embedded view gets activated (Werner) - TQPtrList m_veryHackyActionList; + TQPtrList m_veryHackyActionList; TQSplitter *m_splitter; - KSelectAction *m_orientation; - KAction *m_removeView; + TDESelectAction *m_orientation; + TDEAction *m_removeView; KoMainWindowIface *m_dcopObject; - TQPtrList m_toolbarList; + TQPtrList m_toolbarList; bool bMainWindowGUIBuilt; bool m_splitted; @@ -161,17 +161,17 @@ public: bool m_firstTime; bool m_windowSizeDirty; - KAction *m_paDocInfo; - KAction *m_paSave; - KAction *m_paSaveAs; - KAction *m_paPrint; - KAction *m_paPrintPreview; - KAction *m_sendfile; - KAction *m_paCloseFile; - KAction *m_reloadfile; - KAction *m_versionsfile; - KAction *m_importFile; - KAction *m_exportFile; + TDEAction *m_paDocInfo; + TDEAction *m_paSave; + TDEAction *m_paSaveAs; + TDEAction *m_paPrint; + TDEAction *m_paPrintPreview; + TDEAction *m_sendfile; + TDEAction *m_paCloseFile; + TDEAction *m_reloadfile; + TDEAction *m_versionsfile; + TDEAction *m_importFile; + TDEAction *m_exportFile; bool m_isImporting; bool m_isExporting; @@ -217,24 +217,24 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_paCloseFile = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); - d->m_reloadfile = new KAction( i18n( "Reload"), 0, + d->m_reloadfile = new TDEAction( i18n( "Reload"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadFile() ), actionCollection(), "file_reload_file"); - d->m_versionsfile = new KAction( i18n( "Versions..."), 0, + d->m_versionsfile = new TDEAction( i18n( "Versions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotVersionsFile() ), actionCollection(), "file_versions_file"); - d->m_importFile = new KAction( i18n( "I&mport..." ), 0, // clashing accel key :( + d->m_importFile = new TDEAction( i18n( "I&mport..." ), 0, // clashing accel key :( TQT_TQOBJECT(this), TQT_SLOT( slotImportFile() ), actionCollection(), "file_import_file"); - d->m_exportFile = new KAction( i18n( "E&xport..." ), 0, + d->m_exportFile = new TDEAction( i18n( "E&xport..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotExportFile() ), actionCollection(), "file_export_file"); /* The following entry opens the document information dialog. Since the action is named so it intends to show data this entry should not have a trailing ellipses (...). */ - d->m_paDocInfo = new KAction( i18n( "&Document Information" ), "documentinfo", 0, + d->m_paDocInfo = new TDEAction( i18n( "&Document Information" ), "documentinfo", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentInfo() ), actionCollection(), "file_documentinfo" ); @@ -259,20 +259,20 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) new KKbdAccessExtensions(this, "mw-panelSizer"); // set up the action "list" for "Close all Views" (hacky :) (Werner) d->m_veryHackyActionList.append( - new KAction(i18n("&Close All Views"), "fileclose", + new TDEAction(i18n("&Close All Views"), "fileclose", "ctrl+shift+w", TQT_TQOBJECT(this), TQT_SLOT(slotCloseAllViews()), actionCollection(), "view_closeallviews") ); // set up the action list for the splitter stuff - d->m_splitViewActionList.append(new KAction(i18n("&Split View"), "view_split", 0, + d->m_splitViewActionList.append(new TDEAction(i18n("&Split View"), "view_split", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitView()), actionCollection(), "view_split")); - d->m_removeView=new KAction(i18n("&Remove View"), "view_remove", 0, + d->m_removeView=new TDEAction(i18n("&Remove View"), "view_remove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveView()), actionCollection(), "view_rm_splitter"); d->m_splitViewActionList.append(d->m_removeView); d->m_removeView->setEnabled(false); - d->m_orientation=new KSelectAction(i18n("Splitter &Orientation"), "view_orientation", 0, + d->m_orientation=new TDESelectAction(i18n("Splitter &Orientation"), "view_orientation", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetOrientation()), actionCollection(), "view_splitter_orientation"); TQStringList items; @@ -281,7 +281,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_orientation->setItems(items); d->m_orientation->setCurrentItem(static_cast(d->m_splitter->orientation())); d->m_splitViewActionList.append(d->m_orientation); - d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this))); + d->m_splitViewActionList.append(new TDEActionSeparator(TQT_TQOBJECT(this))); // Load list of recent files TDEConfig * config = instance ? instance->config() : TDEGlobal::config(); @@ -448,10 +448,10 @@ void KoMainWindow::addRecentURL( const KURL& url ) if ( path.contains( *it ) ) ok = false; // it's in the tmp resource if ( ok ) - KRecentDocument::add(path); + TDERecentDocument::add(path); } else - KRecentDocument::add(url.url(-1), true); + TDERecentDocument::add(url.url(-1), true); if ( ok ) m_recent->addURL( url ); @@ -466,12 +466,12 @@ void KoMainWindow::saveRecentFiles() kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl; m_recent->saveEntries( config ); config->sync(); - if (KMainWindow::memberList) + if (TDEMainWindow::memberList) { // Tell all windows to reload their list, after saving // Doesn't work multi-process, but it's a start - KMainWindow *window = KMainWindow::memberList->first(); - for (; window; window = KMainWindow::memberList->next()) + TDEMainWindow *window = TDEMainWindow::memberList->first(); + for (; window; window = TDEMainWindow::memberList->next()) static_cast(window)->reloadRecentFileList(); } } @@ -1000,7 +1000,7 @@ void KoMainWindow::saveWindowSettings() //kdDebug(30003) << "KoMainWindow::closeEvent -> saveMainWindowSettings rootdoc's instance=" << rootDocument()->instance()->instanceName() << endl; saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() ); TDEGlobal::config()->sync(); - resetAutoSaveSettings(); // Don't let KMainWindow override the good stuff we wrote down + resetAutoSaveSettings(); // Don't let TDEMainWindow override the good stuff we wrote down } } @@ -1306,7 +1306,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle ) { //kdDebug(30003) << "KoMainWindow::slotToolbarToggled " << sender()->name() << " toggle=" << true << endl; // The action (sender) and the toolbar have the same name - KToolBar * bar = toolBar( TQT_TQOBJECT(const_cast(sender()))->name() ); + TDEToolBar * bar = toolBar( TQT_TQOBJECT(const_cast(sender()))->name() ); if (bar) { if (toggle) @@ -1341,12 +1341,12 @@ void KoMainWindow::showToolbar( const char * tbName, bool shown ) tb->hide(); // Update the action appropriately - TQPtrListIterator it( d->m_toolbarList ); + TQPtrListIterator it( d->m_toolbarList ); for ( ; it.current() ; ++it ) if ( !strcmp( it.current()->name(), tbName ) ) { //kdDebug(30003) << "KoMainWindow::showToolbar setChecked " << shown << endl; - static_cast(it.current())->setChecked( shown ); + static_cast(it.current())->setChecked( shown ); break; } } @@ -1521,15 +1521,15 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) setAutoSaveSettings( newPart->instance()->instanceName(), false ); // Create and plug toolbar list for Settings menu - //TQPtrListIterator it = toolBarIterator(); + //TQPtrListIterator it = toolBarIterator(); TQPtrList toolBarList = factory->containers( "ToolBar" ); TQPtrListIterator it( toolBarList ); for ( ; it.current() ; ++it ) { - if ( it.current()->inherits("KToolBar") ) + if ( it.current()->inherits("TDEToolBar") ) { - KToolBar * tb = static_cast(it.current()); - KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, + TDEToolBar * tb = static_cast(it.current()); + TDEToggleAction * act = new TDEToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, actionCollection(), tb->name() ); act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() )); connect( act, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) ); diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index 6310deda..81dcd587 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -30,7 +30,7 @@ class TQLabel; class KoView; class KoMainWindowPrivate; class KURL; -class KRecentFilesAction; +class TDERecentFilesAction; class KoFilterManager; class DCOPObject; @@ -354,7 +354,7 @@ protected: // protected methods are mostly for koshell, it's the only one derivi */ void saveRecentFiles(); - KRecentFilesAction *recentAction() const { return m_recent; } + TDERecentFilesAction *recentAction() const { return m_recent; } private: @@ -368,7 +368,7 @@ private: void saveWindowSettings(); - KRecentFilesAction *m_recent; + TDERecentFilesAction *m_recent; protected slots: virtual void slotActivePartChanged( KParts::Part *newPart ); diff --git a/lib/kofficecore/KoMainWindowIface.cc b/lib/kofficecore/KoMainWindowIface.cc index 6d38fae0..08b3fdaa 100644 --- a/lib/kofficecore/KoMainWindowIface.cc +++ b/lib/kofficecore/KoMainWindowIface.cc @@ -46,9 +46,9 @@ DCOPRef KoMainWindowIface::action( const TQCString &name ) QCStringList KoMainWindowIface::actions() { QCStringList res; - TQValueList lst = m_actionProxy->actions(); - TQValueList::ConstIterator it = lst.begin(); - TQValueList::ConstIterator end = lst.end(); + TQValueList lst = m_actionProxy->actions(); + TQValueList::ConstIterator it = lst.begin(); + TQValueList::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 5d23b113..4a2872c6 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -48,7 +48,7 @@ class KoSectionListItem : public TQListViewItem { public: - KoSectionListItem(KListView* listView, const TQString& name, int sortWeight, int widgetIndex = -1) + KoSectionListItem(TDEListView* listView, const TQString& name, int sortWeight, int widgetIndex = -1) : TQListViewItem(listView, name), m_sortWeight(sortWeight), m_widgetIndex(widgetIndex) { } diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h index 0efad845..d9d3b43d 100644 --- a/lib/kofficecore/KoOpenPane.h +++ b/lib/kofficecore/KoOpenPane.h @@ -29,7 +29,7 @@ class KoTemplateGroup; class KoOpenPanePrivate; class TDEInstance; class TQPixmap; -class KListViewItem; +class TDEListViewItem; class KoTemplatesPane; class KoDetailsPaneBase; diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 7e4045a8..b78b937c 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -132,11 +132,11 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) actionCollection()->setWidget( this ); setupGlobalActions(); - KActionCollection *coll = actionCollection(); + TDEActionCollection *coll = actionCollection(); /**** not needed anymore, according to David (Werner) - TQValueList docActions = document->actionCollection()->actions(); - TQValueList::ConstIterator it = docActions.begin(); - TQValueList::ConstIterator end = docActions.end(); + TQValueList docActions = document->actionCollection()->actions(); + TQValueList::ConstIterator it = docActions.begin(); + TQValueList::ConstIterator end = docActions.end(); for (; it != end; ++it ) coll->insert( *it ); */ @@ -217,12 +217,12 @@ KParts::PartManager *KoView::partManager() const return d->m_manager; } -KAction *KoView::action( const TQDomElement &element ) const +TDEAction *KoView::action( const TQDomElement &element ) const { static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString name = element.attribute( attrName ); - KAction *act = KXMLGUIClient::action( name.utf8() ); + TDEAction *act = KXMLGUIClient::action( name.utf8() ); if ( !act ) act = d->m_doc->KXMLGUIClient::action( name.utf8() ); @@ -626,7 +626,7 @@ void KoView::slotAutoScroll( ) void KoView::setupGlobalActions() { - actionNewView = new KAction( i18n( "&New View" ), "window_new", 0, + actionNewView = new TDEAction( i18n( "&New View" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( newView() ), actionCollection(), "view_newview" ); } @@ -674,9 +674,9 @@ KoMainWindow * KoView::shell() const return dynamic_cast( topLevelWidget() ); } -KMainWindow * KoView::mainWindow() const +TDEMainWindow * KoView::mainWindow() const { - return dynamic_cast( topLevelWidget() ); + return dynamic_cast( topLevelWidget() ); } KStatusBar * KoView::statusBar() const diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index a0113e07..b53c339a 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -27,12 +27,12 @@ #include #include -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class TQCustomEvent; class KoDocument; class KoMainWindow; -class KMainWindow; +class TDEMainWindow; class KoViewPrivate; class KoViewChild; class KoFrame; @@ -101,7 +101,7 @@ public: /** * Returns the action described action object. In fact only the "name" attribute * of @p element is of interest here. The method searches in the - * KActionCollection of this view. + * TDEActionCollection of this view. * * Please notice that KoView indirectly inherits KXMLGUIClient. * @@ -109,7 +109,7 @@ public: * @see KXMLGUIClient::actionCollection * @see KoDocument::action */ - virtual KAction *action( const TQDomElement &element ) const; + virtual TDEAction *action( const TQDomElement &element ) const; /** * Retrieves the document that is hit. This can be an embedded document. @@ -321,10 +321,10 @@ public: KoMainWindow * shell() const; /** - * @return the KMainWindow in which this view is currently. + * @return the TDEMainWindow in which this view is currently. * This one should never return 0L, in a KDE app. */ - KMainWindow* mainWindow() const; + TDEMainWindow* mainWindow() const; /** * @return the statusbar of the KoMainWindow in which this view is currently. @@ -461,7 +461,7 @@ protected slots: virtual void slotAutoScroll( ); private: - KAction *actionNewView; + TDEAction *actionNewView; virtual void setupGlobalActions( void ); KoViewPrivate *d; int autoScrollAcceleration( int offset ) const; diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cc index 468a677e..df6eaa31 100644 --- a/lib/kofficecore/KoViewIface.cc +++ b/lib/kofficecore/KoViewIface.cc @@ -61,9 +61,9 @@ DCOPRef KoViewIface::action( const TQCString &name ) QCStringList KoViewIface::actions() { QCStringList res; - TQValueList lst = m_actionProxy->actions(); - TQValueList::ConstIterator it = lst.begin(); - TQValueList::ConstIterator end = lst.end(); + TQValueList lst = m_actionProxy->actions(); + TQValueList::ConstIterator it = lst.begin(); + TQValueList::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 188d5888..eec3c41e 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -46,7 +46,7 @@ KoVersionDialog::KoVersionDialog( TQWidget* parent, const char* name ) TQGridLayout *grid1 = new TQGridLayout( page,10,3,KDialog::marginHint(), KDialog::spacingHint()); - list=new KListView(page, "versionlist"); + list=new TDEListView(page, "versionlist"); list->addColumn(i18n("Date & Time")); list->addColumn(i18n("Saved By")); list->addColumn(i18n("Comment")); diff --git a/lib/kofficecore/Koversiondialog.h b/lib/kofficecore/Koversiondialog.h index 0827b929..9bf930a2 100644 --- a/lib/kofficecore/Koversiondialog.h +++ b/lib/kofficecore/Koversiondialog.h @@ -24,7 +24,7 @@ class TQPushButton; class TQToolButton; -class KListView; +class TDEListView; class TQMultiLineEdit; class KoVersionDialog : public KDialogBase @@ -47,7 +47,7 @@ protected: void init(); void updateButton(); - KListView * list; + TDEListView * list; TQPushButton* m_pRemove; TQPushButton* m_pAdd; TQPushButton* m_pOpen; diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 0652b742..407ebe4a 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -122,7 +122,7 @@ class KKbdAccessExtensionsPrivate ~KKbdAccessExtensionsPrivate() { delete icon; - // TODO: This crashes, but should delete in the event that KMainWindow is not deleted. + // TODO: This crashes, but should delete in the event that TDEMainWindow is not deleted. if (accessKeyLabels) { accessKeyLabels->setAutoDelete(false); delete accessKeyLabels; @@ -130,11 +130,11 @@ class KKbdAccessExtensionsPrivate } // Action that starts panel sizing (defaults to F8), forward and reverse; - KAction* fwdAction; - KAction* revAction; + TDEAction* fwdAction; + TDEAction* revAction; // Action that starts access keys. - KAction* accessKeysAction; + TDEAction* accessKeysAction; // The splitter or dockwindow currently being sized. If 0, sizing is not in progress. TQWidget* panel; @@ -153,21 +153,21 @@ class KKbdAccessExtensionsPrivate // List of the access key TQLabels. If not 0, access keys are onscreen. TQPtrList* accessKeyLabels; - // Pointer to the KMainWindow. - KMainWindow* mainWindow; + // Pointer to the TDEMainWindow. + TDEMainWindow* mainWindow; }; -KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* parent, const char* name) : +KKbdAccessExtensions::KKbdAccessExtensions(TDEMainWindow* parent, const char* name) : TQObject(parent, name) { // kdDebug() << "KKbdAccessExtensions::KKbdAccessExtensions: running." << endl; d = new KKbdAccessExtensionsPrivate; d->mainWindow = parent; - d->fwdAction = new KAction(i18n("Resize Panel Forward"), KShortcut("F8"), + d->fwdAction = new TDEAction(i18n("Resize Panel Forward"), TDEShortcut("F8"), 0, 0, parent->actionCollection(), "resize_panel_forward"); - d->revAction = new KAction(i18n("Resize Panel Reverse"), KShortcut("Shift+F8"), + d->revAction = new TDEAction(i18n("Resize Panel Reverse"), TDEShortcut("Shift+F8"), 0, 0, parent->actionCollection(), "resize_panel_reverse"); - d->accessKeysAction = new KAction(i18n("Access Keys"), KShortcut("Alt+F8"), + d->accessKeysAction = new TDEAction(i18n("Access Keys"), TDEShortcut("Alt+F8"), 0, 0, parent->actionCollection(), "access_keys"); // "Disable" the shortcuts so we can see them in eventFilter. d->fwdAction->setEnabled(false); @@ -193,15 +193,15 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::KeyPress ) { // TODO: This permits only a single-key shortcut. For example, Alt+S,R would not work. // If user configures a multi-key shortcut, it is undefined what will happen here. - // It would be better to handle these as KShortcut activate() signals, but the problem - // is that once a TQDockWindow is undocked and has focus, the KShortcut activate() signals + // It would be better to handle these as TDEShortcut activate() signals, but the problem + // is that once a TQDockWindow is undocked and has focus, the TDEShortcut activate() signals // don't fire anymore. - KShortcut fwdSc = d->fwdAction->shortcut(); - KShortcut revSc = d->revAction->shortcut(); - KShortcut accessKeysSc = d->accessKeysAction->shortcut(); + TDEShortcut fwdSc = d->fwdAction->shortcut(); + TDEShortcut revSc = d->revAction->shortcut(); + TDEShortcut accessKeysSc = d->accessKeysAction->shortcut(); TQKeyEvent* kev = dynamic_cast(e); KKey k = KKey(kev); - KShortcut sc = KShortcut(k); + TDEShortcut sc = TDEShortcut(k); // kdDebug() << "KKbdAccessExtensions::eventFilter: Key press " << sc << endl; if (!d->accessKeyLabels) { if (sc == fwdSc) { @@ -555,10 +555,10 @@ void KKbdAccessExtensions::displayAccessKeys() while( (client=it.current()) !=0 ) { ++it; - KActionPtrList actions = client->actionCollection()->actions(); + TDEActionPtrList actions = client->actionCollection()->actions(); for (int j = 0; j < (int)actions.count(); j++) { - KAction* action = actions[j]; - KShortcut sc = action->shortcut(); + TDEAction* action = actions[j]; + TDEShortcut sc = action->shortcut(); for (int i = 0; i < (int)sc.count(); i++) { KKeySequence seq = sc.seq(i); if (seq.count() == 1) { diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h index 46b99b2f..2aa64c74 100644 --- a/lib/kofficecore/kkbdaccessextensions.h +++ b/lib/kofficecore/kkbdaccessextensions.h @@ -32,7 +32,7 @@ class KKbdAccessExtensionsPrivate; class TQWidgetList; -class KMainWindow; +class TDEMainWindow; /** KKbdAccessExtensions is an object that improves accessibility for motor impaired users * who may not be able to easily use a mouse. It adds two new capabilities using the keyboard: @@ -98,7 +98,7 @@ class KMainWindow; * * @section notes Notes * -* The F8, Shift+F8, and Alt+F8 keys are KShortcuts and therefore user may choose different keys in +* The F8, Shift+F8, and Alt+F8 keys are TDEShortcuts and therefore user may choose different keys in * the application's Configure Shortcuts dialog. * * @note At present, these shortcuts may not be multi-key. If user sets multi-key @@ -114,10 +114,10 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject public: /** Constructor. - * @param parent KMainWindow of the application. Required. + * @param parent TDEMainWindow of the application. Required. * @param name (optional) Name of this object. */ - KKbdAccessExtensions(KMainWindow* parent, const char* name = 0); + KKbdAccessExtensions(TDEMainWindow* parent, const char* name = 0); /** Destructor. */ virtual ~KKbdAccessExtensions(); diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index 0b64d5eb..a34d3116 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -29,7 +29,7 @@ Horizontal - + diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index bc650f10..35cd7b2a 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -19,7 +19,7 @@ 0 - + metaListView diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui index c0076afa..dcc563b1 100644 --- a/lib/kofficecore/koOpenPaneBase.ui +++ b/lib/kofficecore/koOpenPaneBase.ui @@ -34,7 +34,7 @@ 0 - + diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 2b5824ed..c0c81596 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -84,14 +84,14 @@ KoCommandHistory::KoCommandHistory() : clear(); } -KoCommandHistory::KoCommandHistory(KActionCollection * actionCollection, bool withMenus) : +KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool withMenus) : m_undoLimit(50), m_redoLimit(30), m_first(false) { d=new KoCommandHistoryPrivate(); if (withMenus) { - KToolBarPopupAction * undo = new KToolBarPopupAction( i18n("&Undo"), "undo", - KStdAccel::undo(), this, TQT_SLOT( undo() ), + TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "undo", + TDEStdAccel::undo(), this, TQT_SLOT( undo() ), actionCollection, /*KStdAction::stdName( KStdAction::Undo )*/"koffice_undo" ); connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); @@ -109,8 +109,8 @@ KoCommandHistory::KoCommandHistory(KActionCollection * actionCollection, bool wi connect( d->m_undoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeUndoNumberOfSelectedItem( int ))); - KToolBarPopupAction * redo = new KToolBarPopupAction( i18n("&Redo"), "redo", - KStdAccel::redo(), this, TQT_SLOT( redo() ), + TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "redo", + TDEStdAccel::redo(), this, TQT_SLOT( redo() ), actionCollection, /*KStdAction::stdName( KStdAction::Redo )*/ "koffice_redo"); connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h index 554b4b19..02af7c80 100644 --- a/lib/kofficeui/KoCommandHistory.h +++ b/lib/kofficeui/KoCommandHistory.h @@ -26,8 +26,8 @@ #include #include -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class TQPopupMenu; class KCommand; #include @@ -76,7 +76,7 @@ public: * @param withMenus if true, the actions will display a menu when plugged * into a toolbar. */ - KoCommandHistory(KActionCollection *actionCollection, bool withMenus = true); + KoCommandHistory(TDEActionCollection *actionCollection, bool withMenus = true); /** * Destructs the command history object. @@ -133,12 +133,12 @@ public: public slots: /** * Undoes the last action. - * Call this if you don't use the builtin KActions. + * Call this if you don't use the builtin TDEActions. */ virtual void undo(); /** * Redoes the last undone action. - * Call this if you don't use the builtin KActions. + * Call this if you don't use the builtin TDEActions. */ virtual void redo(); /** @@ -186,7 +186,7 @@ private: void clipCommands(); // ensures that the limits are kept TQPtrList m_commands; - KAction *m_undo, *m_redo; + TDEAction *m_undo, *m_redo; TQPopupMenu *m_undoPopup, *m_redoPopup; int m_undoLimit, m_redoLimit; bool m_first; // attention: it's the first command in the list! diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 8e129f98..e6ae509d 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -507,8 +507,8 @@ void KoContextHelpPopup::keyReleaseEvent( TQKeyEvent* e ) } } // KoContextHelpPopup::keyPressEvent -KoContextHelpAction::KoContextHelpAction( KActionCollection* parent, TQWidget* /*popupParent*/ ) - : KToggleAction( i18n( "Context Help" ), BarIcon( "help" ), KShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" ) +KoContextHelpAction::KoContextHelpAction( TDEActionCollection* parent, TQWidget* /*popupParent*/ ) + : TDEToggleAction( i18n( "Context Help" ), BarIcon( "help" ), TDEShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" ) { m_popup = new KoContextHelpPopup( 0L ); connect( m_popup, TQT_SIGNAL( wantsToBeClosed() ), this, TQT_SLOT( closePopup() ) ); diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h index 9e466677..2776d409 100644 --- a/lib/kofficeui/KoContextCelp.h +++ b/lib/kofficeui/KoContextCelp.h @@ -214,13 +214,13 @@ class KoContextHelpPopup : public TQWidget * This action displays on demand a context help in a popup. * The context help is set by the updateHelp slot. */ -class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction +class KOFFICEUI_EXPORT KoContextHelpAction : public TDEToggleAction { Q_OBJECT public: - KoContextHelpAction( KActionCollection* parentCollection, TQWidget* parent = 0 ); + KoContextHelpAction( TDEActionCollection* parentCollection, TQWidget* parent = 0 ); virtual ~KoContextHelpAction(); public slots: diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 870fddc6..61200fbe 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -36,7 +36,7 @@ #include "KoGuideLineDia.h" -class KoGuides::Popup : public KPopupMenu +class KoGuides::Popup : public TDEPopupMenu { public: Popup( KoGuides * guides ) diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index 098a4880..e3fd77cc 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -466,7 +466,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) recentFile->setMaximumWidth( kapp->desktop()->width()*3/4 ); lay2->addWidget(recentFile); - TQStringList fileList = KRecentDocument::recentDocuments(); + TQStringList fileList = TDERecentDocument::recentDocuments(); TQStringList lst; lst <<""; for (TQStringList::ConstIterator it = fileList.begin();it != fileList.end(); ++it) diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index 17bda1e3..2077b31d 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -22,14 +22,14 @@ #include KoPartSelectAction::KoPartSelectAction( const TQString& text, TQObject* parent, const char* name ) - : KActionMenu( text, parent, name ) + : TDEActionMenu( text, parent, name ) { init(); } KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon, TQObject* parent, const char* name ) - : KActionMenu( text, icon, parent, name ) + : TDEActionMenu( text, icon, parent, name ) { init(); } @@ -37,7 +37,7 @@ KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& ic KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KActionMenu( text, icon, parent, name ) + : TDEActionMenu( text, icon, parent, name ) { if (receiver) connect( this, TQT_SIGNAL( activated() ), receiver, slot ); @@ -52,7 +52,7 @@ void KoPartSelectAction::init() for( ; it != m_lstEntries.end(); ++it ) { KService::Ptr serv = (*it).service(); if (!serv->genericName().isEmpty()) { - KAction *action = new KAction( serv->genericName().replace('&',"&&"), serv->icon(), 0, + TDEAction *action = new TDEAction( serv->genericName().replace('&',"&&"), serv->icon(), 0, this, TQT_SLOT( slotActionActivated() ), parentCollection(), serv->name().latin1() ); insert( action ); diff --git a/lib/kofficeui/KoPartSelectAction.h b/lib/kofficeui/KoPartSelectAction.h index 2bfc119e..7f38617d 100644 --- a/lib/kofficeui/KoPartSelectAction.h +++ b/lib/kofficeui/KoPartSelectAction.h @@ -27,7 +27,7 @@ * In a toolbar it presents itself as a button that opens the part-select dialog, * but in a popupmenu it presents itself as a submenu with all available parts. */ -class KOFFICEUI_EXPORT KoPartSelectAction : public KActionMenu +class KOFFICEUI_EXPORT KoPartSelectAction : public TDEActionMenu { Q_OBJECT diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 171c455b..eb308452 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -37,7 +37,7 @@ class KoSelectAction::KoSelectActionPrivate public: KoSelectActionPrivate() { - m_popup = new KPopupMenu(0L,"KoLineStyleAction::popup"); + m_popup = new TDEPopupMenu(0L,"KoLineStyleAction::popup"); m_currentSelection = 0; } @@ -47,12 +47,12 @@ class KoSelectAction::KoSelectActionPrivate m_popup = 0; } - KPopupMenu* m_popup; + TDEPopupMenu* m_popup; int m_currentSelection; }; KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, - TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name) + TQObject* parent, const char* name) : TDEAction(text, icon, 0, parent, name) { d = new KoSelectActionPrivate; setShowCurrentSelection(true); @@ -61,7 +61,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, } KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name) + const char* slot, TQObject* parent, const char* name) : TDEAction(text, icon, 0, parent, name) { d = new KoSelectActionPrivate; @@ -74,7 +74,7 @@ KoSelectAction::~KoSelectAction() delete d; } -KPopupMenu* KoSelectAction::popupMenu() const +TDEPopupMenu* KoSelectAction::popupMenu() const { return d->m_popup; } @@ -86,10 +86,10 @@ void KoSelectAction::popup(const TQPoint& global) int KoSelectAction::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( widget ); @@ -109,11 +109,11 @@ int KoSelectAction::plug(TQWidget* widget, int index) return containerCount() - 1; } - else if ( widget->inherits( "KToolBar" ) ) + else if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = static_cast( widget ); + TDEToolBar *bar = static_cast( widget ); - int id_ = KAction::getToolButtonID(); + int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) { bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h index 4c0f65d3..7c0f5a25 100644 --- a/lib/kofficeui/KoSelectAction.h +++ b/lib/kofficeui/KoSelectAction.h @@ -21,14 +21,14 @@ #include #include -class KPopupMenu; +class TDEPopupMenu; class TQPoint; /** An action that provides a menu with items that can be selected. - * The main difference between this action and a KSelectAction is that + * The main difference between this action and a TDESelectAction is that * it is plugged into a toolbar as a dropdown menu and not as a combobox. */ -class KOFFICEUI_EXPORT KoSelectAction : public KAction +class KOFFICEUI_EXPORT KoSelectAction : public TDEAction { Q_OBJECT @@ -53,7 +53,7 @@ class KOFFICEUI_EXPORT KoSelectAction : public KAction ~KoSelectAction(); /** Returns a pointer to the popup menu. */ - KPopupMenu* popupMenu() const; + TDEPopupMenu* popupMenu() const; /** Shows the popup menu. * @param global Position at which the popup menu is shown. */ diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 7fa49228..1bd11b36 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -223,7 +223,7 @@ KoTemplateChooseDia::~KoTemplateChooseDia() // Keep in sync with KoMainWindow::chooseNewDocument static bool cancelQuits() { bool onlyDoc = !KoDocument::documentList() || KoDocument::documentList()->count() <= 1; - bool onlyMainWindow = !KMainWindow::memberList || KMainWindow::memberList->count() <= 1; + bool onlyMainWindow = !TDEMainWindow::memberList || TDEMainWindow::memberList->count() <= 1; return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell } diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index a42b580f..1d0fec2a 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -81,7 +81,7 @@ public: TQLabel *m_preview; TQString m_customFile; TQPixmap m_customPixmap; - KListView *m_groups; + TDEListView *m_groups; TQPushButton *m_add, *m_remove; TQCheckBox *m_defaultTemplate; TDEInstance *m_instance; @@ -120,7 +120,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst label=new TQLabel(i18n("Group:"), mainwidget); leftbox->addWidget(label); - d->m_groups=new KListView(mainwidget); + d->m_groups=new TDEListView(mainwidget); leftbox->addWidget(d->m_groups); d->m_groups->addColumn(""); d->m_groups->header()->hide(); diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index d266aaaa..12c8b06e 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -44,8 +44,8 @@ #include #endif -KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes ) - : KToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance) +KoToolBox::KoToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes ) + : TDEToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance) { setFullSize( false ); setMargin(2); @@ -83,7 +83,7 @@ void KoToolBox::slotButtonPressed( int id ) } -void KoToolBox::registerTool( KAction *tool, int toolType, TQ_UINT32 priority ) +void KoToolBox::registerTool( TDEAction *tool, int toolType, TQ_UINT32 priority ) { uint prio = priority; ToolList * tl = m_tools.at(toolType); @@ -122,7 +122,7 @@ void KoToolBox::setupTools() ToolList::Iterator it; for ( it = tl->begin(); it != tl->end(); ++it ) { - KAction *tool = it.data(); + TDEAction *tool = it.data(); if(! tool) continue; TQToolButton *bn = createButton(tools->getNextParent(), tool->icon().latin1(), tool->toolTip()); @@ -179,7 +179,7 @@ void KoToolBox::enableTools(bool enable) void KoToolBox::slotSetTool(const TQString & toolname) { for (uint i = 0; i < m_idToActionMap.count(); ++i) { - KAction * a = m_idToActionMap.at(i); + TDEAction * a = m_idToActionMap.at(i); if (!a || a->name() != toolname) continue; m_buttonGroup->setButton(i); diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 25c9f1c4..93a82b34 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -26,15 +26,15 @@ #include class TQWidget; -class KAction; -class KMainWindow; +class TDEAction; +class TDEMainWindow; class KDualColorButton; class TQGridLayout; class ToolArea; /** - * KActionBox is a kind of super-specialized toolbox that can order + * TDEActionBox is a kind of super-specialized toolbox that can order * tools according to type and priority. * * This is to a large extent a port of the Karbon vtoolbox -- with @@ -42,21 +42,21 @@ class ToolArea; * tool-like class, it aggregates actions. */ -class KOFFICEUI_EXPORT KoToolBox : public KToolBar { +class KOFFICEUI_EXPORT KoToolBox : public TDEToolBar { Q_OBJECT public: - KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes); + KoToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes); virtual ~KoToolBox(); // Called by the toolcontroller for each tool. For every category, // there is a separate list, and the tool is categorized correctly. // The tool is not yet added to the widgets; call setupTools() // to do that. We don't store the tool. - void registerTool(KAction * tool, int toolType, TQ_UINT32 priority); + void registerTool(TDEAction * tool, int toolType, TQ_UINT32 priority); // Called when all tools have been added by the tool controller void setupTools(); @@ -84,10 +84,10 @@ private: TQPtrList m_toolBoxes; // For every ToolArea - typedef TQMap< int, KAction*> ToolList; // The priority ordered list of tools for a certain tooltype + typedef TQMap< int, TDEAction*> ToolList; // The priority ordered list of tools for a certain tooltype TQPtrList m_tools; - TQPtrList m_idToActionMap; // Map the buttongroup id's to actions for easy activating. + TQPtrList m_idToActionMap; // Map the buttongroup id's to actions for easy activating. TDEInstance* m_instance; }; diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index cc04c714..ba08e1a1 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -647,14 +647,14 @@ void KoColorPopupProxy::slotMoreColors() KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent, const char* name, const TQString& txt, TDEInstance* _instance ) : - KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false ) + TDEToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false ) { init(); } KoToolButton::KoToolButton( const TQPixmap& pixmap, int id, TQWidget* parent, const char* name, const TQString& txt ) : - KToolBarButton( pixmap, id, parent, name, txt ), m_arrowPressed( false ) + TDEToolBarButton( pixmap, id, parent, name, txt ), m_arrowPressed( false ) { init(); } @@ -670,7 +670,7 @@ TQSize KoToolButton::sizeHint() const TQSize KoToolButton::minimumSizeHint() const { - TQSize size = KToolBarButton::minimumSizeHint(); + TQSize size = TDEToolBarButton::minimumSizeHint(); size.setWidth( size.width() + ARROW_WIDTH ); return size; } @@ -695,7 +695,7 @@ void KoToolButton::drawButton(TQPainter *_painter) if ( isEnabled() ) { flags |= TQStyle::Style_Enabled; - if ( KToolBarButton::isRaised() || m_arrowPressed ) + if ( TDEToolBarButton::isRaised() || m_arrowPressed ) flags |= TQStyle::Style_Raised; } if ( isOn() ) @@ -723,7 +723,7 @@ void KoToolButton::drawButton(TQPainter *_painter) style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), cg, flags, opt ); - if ( KToolBarButton::isRaised() || m_arrowPressed ) + if ( TDEToolBarButton::isRaised() || m_arrowPressed ) qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true ); int dx, dy; @@ -732,9 +732,9 @@ void KoToolButton::drawButton(TQPainter *_painter) TQRect textRect; int textFlags = 0; - if ( static_cast( iconTextMode() ) == KToolBar::IconOnly ) { // icon only + if ( static_cast( iconTextMode() ) == TDEToolBar::IconOnly ) { // icon only TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic, - isEnabled() ? ( KToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : + isEnabled() ? ( TDEToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : TQIconSet::Disabled, isOn() ? TQIconSet::On : TQIconSet::Off ); if ( !pixmap.isNull() ) { dx = ( width() - ARROW_WIDTH - pixmap.width() ) / 2; @@ -743,9 +743,9 @@ void KoToolButton::drawButton(TQPainter *_painter) _painter->drawPixmap( dx, dy, pixmap ); } } - else if ( static_cast( iconTextMode() ) == KToolBar::IconTextRight ) { // icon and text (if any) + else if ( static_cast( iconTextMode() ) == TDEToolBar::IconTextRight ) { // icon and text (if any) TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic, - isEnabled() ? ( KToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : + isEnabled() ? ( TDEToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : TQIconSet::Disabled, isOn() ? TQIconSet::On : TQIconSet::Off ); if( !pixmap.isNull()) { dx = 4; @@ -765,7 +765,7 @@ void KoToolButton::drawButton(TQPainter *_painter) textRect = TQRect( dx, dy, width() - dx, height() ); } } - else if ( static_cast( iconTextMode() ) == KToolBar::TextOnly ) { + else if ( static_cast( iconTextMode() ) == TDEToolBar::TextOnly ) { if ( !textLabel().isNull() ) { textFlags = AlignTop | AlignLeft; dx = ( width() - ARROW_WIDTH - fm.width( textLabel() ) ) / 2; @@ -774,9 +774,9 @@ void KoToolButton::drawButton(TQPainter *_painter) textRect = TQRect( dx, dy, fm.width(textLabel()), fm.lineSpacing() ); } } - else if ( static_cast( iconTextMode() ) == KToolBar::IconTextBottom ) { + else if ( static_cast( iconTextMode() ) == TDEToolBar::IconTextBottom ) { TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic, - isEnabled() ? ( KToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : + isEnabled() ? ( TDEToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : TQIconSet::Disabled, isOn() ? TQIconSet::On : TQIconSet::Off ); if( !pixmap.isNull()) { dx = ( width() - ARROW_WIDTH - pixmap.width() ) / 2; @@ -799,7 +799,7 @@ void KoToolButton::drawButton(TQPainter *_painter) _painter->setFont( TDEGlobalSettings::toolBarFont() ); if ( !isEnabled() ) _painter->setPen( palette().disabled().dark() ); - else if( KToolBarButton::isRaised() ) + else if( TDEToolBarButton::isRaised() ) _painter->setPen( TDEGlobalSettings::toolBarHighlightColor() ); else _painter->setPen( colorGroup().buttonText() ); @@ -827,7 +827,7 @@ bool KoToolButton::eventFilter( TQObject* o, TQEvent* e ) } else if ( e->type() == TQEvent::MouseButtonRelease ) m_arrowPressed = false; - return KToolBarButton::eventFilter( o, e ); + return TDEToolBarButton::eventFilter( o, e ); } void KoToolButton::init() diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index 1f2ff03c..31a3d332 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -126,8 +126,8 @@ private: }; -// Parts of the code are from KToolBarButton -class KoToolButton : public KToolBarButton +// Parts of the code are from TDEToolBarButton +class KoToolButton : public TDEToolBarButton { Q_OBJECT diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index df1bac4d..09f7d3e4 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -26,15 +26,15 @@ #include KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, TQObject* parent, const char* name ): - KSelectAction( text, pix, cut, parent, name ) + const TDEShortcut& cut, TQObject* parent, const char* name ): + TDESelectAction( text, pix, cut, parent, name ) { init(); } KoZoomAction::KoZoomAction( const TQString& text, const TQString& pix, - const KShortcut& cut, TQObject* parent, const char* name ): - KSelectAction( text, pix, cut, parent, name ) + const TDEShortcut& cut, TQObject* parent, const char* name ): + TDESelectAction( text, pix, cut, parent, name ) { init(); diff --git a/lib/kofficeui/KoZoomAction.h b/lib/kofficeui/KoZoomAction.h index 118c7a13..12e38103 100644 --- a/lib/kofficeui/KoZoomAction.h +++ b/lib/kofficeui/KoZoomAction.h @@ -28,7 +28,7 @@ * (must be an integer). The values shown on the list are alwalys * sorted. */ -class KOFFICEUI_EXPORT KoZoomAction : public KSelectAction +class KOFFICEUI_EXPORT KoZoomAction : public TDESelectAction { Q_OBJECT @@ -39,13 +39,13 @@ public: * Creates a new zoom action. */ KoZoomAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); /** * Creates a new zoom action. */ KoZoomAction( const TQString& text, const TQString& pix, - const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); public slots: diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index 5fa296f0..c2405045 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -65,7 +65,7 @@ KoLineStyleAction::~KoLineStyleAction() void KoLineStyleAction::createMenu() { - KPopupMenu* popup = popupMenu(); + TDEPopupMenu* popup = popupMenu(); TQBitmap mask; TQPixmap pix(70, 21); TQPainter p(&pix, popup); diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index c812c1c6..84e770cc 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -80,7 +80,7 @@ KoLineWidthAction::~KoLineWidthAction() void KoLineWidthAction::createMenu() { - KPopupMenu* popup = popupMenu(); + TDEPopupMenu* popup = popupMenu(); TQBitmap mask; TQPixmap pix(70, 21); TQPainter p(&pix, popup); diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index b6dc0408..96e48001 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -30,7 +30,7 @@ KColorAction::KColorAction( const TQString& text, int accel, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { typ = TextColor; init(); @@ -39,7 +39,7 @@ KColorAction::KColorAction( const TQString& text, int accel, KColorAction::KColorAction( const TQString& text, int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, parent, name ) + : TDEAction( text, accel, receiver, slot, parent, name ) { typ = TextColor; init(); @@ -47,7 +47,7 @@ KColorAction::KColorAction( const TQString& text, int accel, KColorAction::KColorAction( const TQString& text, Type type, int accel, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { typ = type; init(); @@ -56,14 +56,14 @@ KColorAction::KColorAction( const TQString& text, Type type, int accel, KColorAction::KColorAction( const TQString& text, Type type, int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, parent, name ) + : TDEAction( text, accel, receiver, slot, parent, name ) { typ = type; init(); } KColorAction::KColorAction( TQObject* parent, const char* name ) - : KAction( parent, name ) + : TDEAction( parent, name ) { typ = TextColor; init(); @@ -216,25 +216,25 @@ void KColorAction::createPixmap() } -KSelectColorAction::KSelectColorAction( const TQString& text, Type type, +TDESelectColorAction::TDESelectColorAction( const TQString& text, Type type, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) : - KAction( text, KShortcut(), receiver, slot, parent, name ), m_type( type ), + TDEActionCollection* parent, const char* name ) : + TDEAction( text, TDEShortcut(), receiver, slot, parent, name ), m_type( type ), m_color( TQt::black ) { } -KSelectColorAction::~KSelectColorAction() +TDESelectColorAction::~TDESelectColorAction() { } -int KSelectColorAction::plug( TQWidget* w, int index ) +int TDESelectColorAction::plug( TQWidget* w, int index ) { if (w == 0) { - kdWarning() << "KSelectColorAction::plug called with 0 argument\n"; + kdWarning() << "TDESelectColorAction::plug called with 0 argument\n"; return -1; } - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; if ( w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) @@ -276,9 +276,9 @@ int KSelectColorAction::plug( TQWidget* w, int index ) return containerCount() - 1; } - else if ( w->inherits( "KToolBar" ) ) + else if ( w->inherits( "TDEToolBar" ) ) { - KToolBar *bar = static_cast( w ); + TDEToolBar *bar = static_cast( w ); int id_ = getToolButtonID(); TDEInstance *instance; @@ -319,25 +319,25 @@ int KSelectColorAction::plug( TQWidget* w, int index ) return -1; } -TQColor KSelectColorAction::color() const +TQColor TDESelectColorAction::color() const { return m_color; } -KSelectColorAction::Type KSelectColorAction::type() const +TDESelectColorAction::Type TDESelectColorAction::type() const { return m_type; } -void KSelectColorAction::setColor( const TQColor &/*c*/ ) +void TDESelectColorAction::setColor( const TQColor &/*c*/ ) { } -void KSelectColorAction::setType( Type /*t*/ ) +void TDESelectColorAction::setType( Type /*t*/ ) { } -TQString KSelectColorAction::whatsThisWithIcon() const +TQString TDESelectColorAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!icon().isEmpty()) diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h index 3ca03c62..db832d8b 100644 --- a/lib/kofficeui/kcoloractions.h +++ b/lib/kofficeui/kcoloractions.h @@ -26,7 +26,7 @@ * An action whose pixmap is automatically generated from a color. * It knows three types of pixmaps: text color, frame color and background color */ -class KColorAction : public KAction +class KColorAction : public TDEAction { Q_OBJECT @@ -65,7 +65,7 @@ private: }; -class KSelectColorAction : public KAction +class TDESelectColorAction : public TDEAction { Q_OBJECT @@ -76,10 +76,10 @@ public: FillColor }; - KSelectColorAction( const TQString& text, Type type, + TDESelectColorAction( const TQString& text, Type type, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); - virtual ~KSelectColorAction(); + TDEActionCollection* parent, const char* name ); + virtual ~TDESelectColorAction(); virtual int plug( TQWidget* w, int index = -1 ); diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index 3e9c146a..d04a31c4 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -72,7 +72,7 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, file->insertSeparator(); file->insertItem( "&Quit", tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); - KToolBar* toolBar = new KToolBar( this ); + TDEToolBar* toolBar = new TDEToolBar( this ); addDockWindow( toolBar ); ( void ) new KoToolButton( "color_fill", 1, toolBar, "funky button", "Fill Color" ); } diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 7ab01d3f..56c626f8 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -30,8 +30,8 @@ #define SET_FOR_ALL_CONTAINER(WIDGET_TYPE,METHOD_NAME,VALUE) \ for( int id = 0; id < containerCount(); ++id ) { \ TQWidget* w = container(id); \ - if ( w->inherits("KToolBar") ) { \ - TQWidget* r = static_cast(w)->getWidget(itemId(id)); \ + if ( w->inherits("TDEToolBar") ) { \ + TQWidget* r = static_cast(w)->getWidget(itemId(id)); \ if (qstrcmp(r->name(),"KTToolBarLayout")==0) \ r = (TQWidget*)r->child("widget"); \ if ( r && r->inherits(#WIDGET_TYPE) ) { \ @@ -41,21 +41,21 @@ } \ } -TKAction::TKAction(TQObject* parent, const char* name) -: KAction( "", 0, parent, name ) +TTDEAction::TTDEAction(TQObject* parent, const char* name) +: TDEAction( "", 0, parent, name ) { m_imode = TK::IconOnly; } -TKAction::~TKAction() +TTDEAction::~TTDEAction() { } -int TKAction::plug(TQWidget* widget, int index) +int TTDEAction::plug(TQWidget* widget, int index) { - if ( widget->inherits("KToolBar") ) { - KToolBar* bar = static_cast(widget); - int id_ = KAction::getToolButtonID(); + if ( widget->inherits("TDEToolBar") ) { + TDEToolBar* bar = static_cast(widget); + int id_ = TDEAction::getToolButtonID(); TDEInstance *instance; if ( parentCollection() ) @@ -63,7 +63,7 @@ int TKAction::plug(TQWidget* widget, int index) else instance = TDEGlobal::instance(); - TKToolBarButton* b = new TKToolBarButton(icon(),plainText(),bar,name(),instance); + TTDEToolBarButton* b = new TTDEToolBarButton(icon(),plainText(),bar,name(),instance); // we don't need clicked() and buttonClicked(), do we? // connect(b,TQT_SIGNAL(clicked()),TQT_SLOT(slotActivated())); b->setIconMode(m_imode); @@ -75,44 +75,44 @@ int TKAction::plug(TQWidget* widget, int index) return containerCount() - 1; } - return KAction::plug(widget,index); + return TDEAction::plug(widget,index); } -void TKAction::initToolBarButton(TKToolBarButton* button) +void TTDEAction::initToolBarButton(TTDEToolBarButton* button) { connect(button,TQT_SIGNAL(buttonClicked()),TQT_SLOT(slotActivated())); } -TK::IconMode TKAction::iconMode() +TK::IconMode TTDEAction::iconMode() { return m_imode; } -void TKAction::setIconMode(TK::IconMode mode) +void TTDEAction::setIconMode(TK::IconMode mode) { m_imode = mode; - SET_FOR_ALL_CONTAINER(TKToolBarButton,setIconMode,mode) + SET_FOR_ALL_CONTAINER(TTDEToolBarButton,setIconMode,mode) } -void TKAction::setText(const TQString& text) +void TTDEAction::setText(const TQString& text) { - KAction::setText(text); + TDEAction::setText(text); updateLayout(); } -void TKAction::setIcon(const TQString& icon) +void TTDEAction::setIcon(const TQString& icon) { - KAction::setIcon(icon); + TDEAction::setIcon(icon); updateLayout(); } -void TKAction::updateLayout() +void TTDEAction::updateLayout() { int len = containerCount(); for( int id = 0; id < len; ++id ) { TQWidget* w = container( id ); - if (w->inherits("KToolBar")) { - TQWidget* r = static_cast(w)->getWidget(itemId(id)); + if (w->inherits("TDEToolBar")) { + TQWidget* r = static_cast(w)->getWidget(itemId(id)); if (qstrcmp(r->name(),"KTToolBarLayout")==0) { updateLayout(r); } @@ -120,7 +120,7 @@ void TKAction::updateLayout() } } -TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children) +TQWidget* TTDEAction::createLayout(TQWidget* parent, TQWidget* children) { TQWidget* base = new TQWidget(parent,"KTToolBarLayout"); TQLabel* textLabel = new TQLabel(base,"text"); @@ -138,7 +138,7 @@ TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children) return base; } -void TKAction::updateLayout(TQWidget* base) +void TTDEAction::updateLayout(TQWidget* base) { TQLabel* textLabel = (TQLabel*)base->child("text"); TQLabel* pixLabel = (TQLabel*)base->child("pixmap"); @@ -172,7 +172,7 @@ void TKAction::updateLayout(TQWidget* base) } /******************************************************************************/ TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name ) -: TKAction(parent,name) +: TTDEAction(parent,name) { m_current = 0; m_editable = false; @@ -184,10 +184,10 @@ TKBaseSelectAction::~TKBaseSelectAction() int TKBaseSelectAction::plug(TQWidget* widget, int index) { - if ( widget->inherits("KToolBar") ) + if ( widget->inherits("TDEToolBar") ) { - KToolBar* bar = static_cast( widget ); - int id_ = KAction::getToolButtonID(); + TDEToolBar* bar = static_cast( widget ); + int id_ = TDEAction::getToolButtonID(); TKComboBox* cb = new TKComboBox(m_editable,bar); initComboBox(cb); @@ -248,28 +248,28 @@ void TKBaseSelectAction::activate(int id) emit activated(id); } /******************************************************************************/ -TKSelectAction::TKSelectAction( TQObject* parent, const char* name ) +TTDESelectAction::TTDESelectAction( TQObject* parent, const char* name ) : TKBaseSelectAction(parent,name) { } -TKSelectAction::~TKSelectAction() +TTDESelectAction::~TTDESelectAction() { } -void TKSelectAction::initComboBox(TKComboBox* cb) +void TTDESelectAction::initComboBox(TKComboBox* cb) { TKBaseSelectAction::initComboBox(cb); connect(cb,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotActivated(const TQString&))); cb->insertStringList(items()); } -void TKSelectAction::slotActivated(const TQString& text) +void TTDESelectAction::slotActivated(const TQString& text) { emit activated(text); } -void TKSelectAction::setItems(const TQStringList& lst ) +void TTDESelectAction::setItems(const TQStringList& lst ) { m_list = lst; m_current = -1; @@ -281,17 +281,17 @@ void TKSelectAction::setItems(const TQStringList& lst ) setEnabled ( lst.count() > 0 || m_editable ); } -TQStringList TKSelectAction::items() const +TQStringList TTDESelectAction::items() const { return m_list; } -void TKSelectAction::clear() +void TTDESelectAction::clear() { SET_FOR_ALL_CONTAINER(TKComboBox,clear, ) } -void TKSelectAction::setEditText(const TQString& text) +void TTDESelectAction::setEditText(const TQString& text) { SET_FOR_ALL_CONTAINER(TKComboBox,setEditText,text) } diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h index da38f38d..736bb141 100644 --- a/lib/kofficeui/tkaction.h +++ b/lib/kofficeui/tkaction.h @@ -27,22 +27,22 @@ namespace TK { enum IconMode { IconOnly, IconAndText, TextOnly }; } -class TKToolBarButton; +class TTDEToolBarButton; class TKComboBox; -class KOFFICEUI_EXPORT TKAction : public KAction +class KOFFICEUI_EXPORT TTDEAction : public TDEAction { Q_OBJECT public: - TKAction(TQObject* parent, const char* name); - ~TKAction(); + TTDEAction(TQObject* parent, const char* name); + ~TTDEAction(); virtual int plug(TQWidget* widget, int index = -1); TK::IconMode iconMode(); protected: - virtual void initToolBarButton(TKToolBarButton*); + virtual void initToolBarButton(TTDEToolBarButton*); TQWidget* createLayout(TQWidget* parent, TQWidget* children); void updateLayout(); @@ -55,14 +55,14 @@ public slots: private: TK::IconMode m_imode; - class TKActionPrivate; - TKActionPrivate *d; + class TTDEActionPrivate; + TTDEActionPrivate *d; }; /******************************************************************************/ -class KOFFICEUI_EXPORT TKBaseSelectAction : public TKAction +class KOFFICEUI_EXPORT TKBaseSelectAction : public TTDEAction { Q_OBJECT -friend class TKSelectAction; +friend class TTDESelectAction; public: TKBaseSelectAction(TQObject* parent, const char* name); ~TKBaseSelectAction(); @@ -94,12 +94,12 @@ private: TKBaseSelectActionPrivate *d; }; /******************************************************************************/ -class KOFFICEUI_EXPORT TKSelectAction : public TKBaseSelectAction +class KOFFICEUI_EXPORT TTDESelectAction : public TKBaseSelectAction { Q_OBJECT public: - TKSelectAction(TQObject* parent, const char* name); - ~TKSelectAction(); + TTDESelectAction(TQObject* parent, const char* name); + ~TTDESelectAction(); TQStringList items() const; @@ -119,8 +119,8 @@ signals: private: TQStringList m_list; - class TKSelectActionPrivate; - TKSelectActionPrivate *d; + class TTDESelectActionPrivate; + TTDESelectActionPrivate *d; }; /******************************************************************************/ #endif diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 11ddbc7f..3e7d6480 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -33,7 +33,7 @@ #include TKColorPopupMenu::TKColorPopupMenu( TQWidget* parent, const char* name ) -: KPopupMenu(parent,name) +: TDEPopupMenu(parent,name) { } @@ -46,10 +46,10 @@ void TKColorPopupMenu::updateItemSize() styleChange(style()); } /****************************************************************************************/ -class TKSelectColorActionPrivate +class TTDESelectColorActionPrivate { public: - TKSelectColorActionPrivate() + TTDESelectColorActionPrivate() { } bool defaultColorMenu; @@ -57,10 +57,10 @@ public: }; -TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor ) -: TKAction(parent,name) +TTDESelectColorAction::TTDESelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor ) +: TTDEAction(parent,name) { - d=new TKSelectColorActionPrivate(); + d=new TTDESelectColorActionPrivate(); d->defaultColorMenu=menuDefaultColor; d->defaultColor=TQColor(); setText(text); @@ -68,12 +68,12 @@ TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObj init(); } -TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, +TTDESelectColorAction::TTDESelectColorAction( const TQString& text, Type type, TQObject* receiver, const char* slot, TQObject* parent, const char* name, bool menuDefaultColor) -: TKAction(parent,name) +: TTDEAction(parent,name) { - d=new TKSelectColorActionPrivate(); + d=new TTDESelectColorActionPrivate(); d->defaultColorMenu=menuDefaultColor; d->defaultColor=TQColor(); setText(text); @@ -82,7 +82,7 @@ TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, init(); } -void TKSelectColorAction::init() +void TTDESelectColorAction::init() { m_pStandardColor = new TKColorPanel(); m_pRecentColor = new TKColorPanel(); @@ -129,40 +129,40 @@ void TKSelectColorAction::init() connect(m_pRecentColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize())); } -TKSelectColorAction::~TKSelectColorAction() +TTDESelectColorAction::~TTDESelectColorAction() { delete m_pMenu; delete d; } -void TKSelectColorAction::initToolBarButton(TKToolBarButton* b) +void TTDESelectColorAction::initToolBarButton(TTDEToolBarButton* b) { TQWhatsThis::add( b, whatsThis() ); - TKAction::initToolBarButton(b); + TTDEAction::initToolBarButton(b); b->setDelayedPopup( popupMenu() ); updatePixmap(b); updatePixmap(); } -void TKSelectColorAction::defaultColor() +void TTDESelectColorAction::defaultColor() { m_pCurrentColor = d->defaultColor; emit activated(); } -void TKSelectColorAction::setDefaultColor(const TQColor &_col) +void TTDESelectColorAction::setDefaultColor(const TQColor &_col) { d->defaultColor=_col; } -void TKSelectColorAction::updatePixmap() +void TTDESelectColorAction::updatePixmap() { for( int id = 0; id < containerCount(); ++id ) { TQWidget* w = container(id); - if ( w->inherits("KToolBar") ) { - TQWidget* r = static_cast(w)->getWidget(itemId(id)); - if ( r->inherits("TKToolBarButton") ) { - updatePixmap(static_cast(r)); + if ( w->inherits("TDEToolBar") ) { + TQWidget* r = static_cast(w)->getWidget(itemId(id)); + if ( r->inherits("TTDEToolBarButton") ) { + updatePixmap(static_cast(r)); } } else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { @@ -191,7 +191,7 @@ void TKSelectColorAction::updatePixmap() } } -void TKSelectColorAction::updatePixmap(TKToolBarButton* b) +void TTDESelectColorAction::updatePixmap(TTDEToolBarButton* b) { if (!b) return; @@ -219,7 +219,7 @@ void TKSelectColorAction::updatePixmap(TKToolBarButton* b) b->setPixmap(pix); } -void TKSelectColorAction::setCurrentColor( const TQColor& color ) +void TTDESelectColorAction::setCurrentColor( const TQColor& color ) { if ( color == m_pCurrentColor ) return; @@ -229,12 +229,12 @@ void TKSelectColorAction::setCurrentColor( const TQColor& color ) updatePixmap(); } -void TKSelectColorAction::setActiveColor( const TQColor& color ) +void TTDESelectColorAction::setActiveColor( const TQColor& color ) { m_pStandardColor->setActiveColor(color); } -void TKSelectColorAction::selectColorDialog() +void TTDESelectColorAction::selectColorDialog() { TQColor c = color(); @@ -260,19 +260,19 @@ void TKSelectColorAction::selectColorDialog() } // Called when activating the menu item -void TKSelectColorAction::slotActivated() +void TTDESelectColorAction::slotActivated() { - //kdDebug() << "TKSelectColorAction::slotActivated" << endl; + //kdDebug() << "TTDESelectColorAction::slotActivated" << endl; selectColorDialog(); } -void TKSelectColorAction::activate() +void TTDESelectColorAction::activate() { emit colorSelected(m_pCurrentColor); emit activated(); } -void TKSelectColorAction::panelColorSelected( const TQColor& color ) +void TTDESelectColorAction::panelColorSelected( const TQColor& color ) { m_pMenu->hide(); setCurrentColor(color); @@ -280,7 +280,7 @@ void TKSelectColorAction::panelColorSelected( const TQColor& color ) activate(); } -void TKSelectColorAction::panelReject() +void TTDESelectColorAction::panelReject() { m_pMenu->hide(); } diff --git a/lib/kofficeui/tkcoloractions.h b/lib/kofficeui/tkcoloractions.h index 5ef5d3f4..2b5dcd82 100644 --- a/lib/kofficeui/tkcoloractions.h +++ b/lib/kofficeui/tkcoloractions.h @@ -28,9 +28,9 @@ class TQGridLayout; class TKColorPanel; -class TKSelectColorActionPrivate; +class TTDESelectColorActionPrivate; -class TKColorPopupMenu : public KPopupMenu +class TKColorPopupMenu : public TDEPopupMenu { Q_OBJECT public: @@ -41,7 +41,7 @@ public slots: void updateItemSize(); }; /****************************************************************************************/ -class KOFFICEUI_EXPORT TKSelectColorAction : public TKAction +class KOFFICEUI_EXPORT TTDESelectColorAction : public TTDEAction { Q_OBJECT public: @@ -52,16 +52,16 @@ public: Color }; - TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor=false); - TKSelectColorAction( const TQString& text, Type type, + TTDESelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor=false); + TTDESelectColorAction( const TQString& text, Type type, TQObject* receiver, const char* slot, TQObject* parent, const char* name,bool menuDefaultColor=false ); - virtual ~TKSelectColorAction(); + virtual ~TTDESelectColorAction(); TQColor color() const { return m_pCurrentColor; } - KPopupMenu* popupMenu() const { return m_pMenu; } + TDEPopupMenu* popupMenu() const { return m_pMenu; } void setDefaultColor(const TQColor &_col); @@ -82,9 +82,9 @@ protected slots: protected: void init(); - virtual void initToolBarButton(TKToolBarButton*); + virtual void initToolBarButton(TTDEToolBarButton*); void updatePixmap(); - void updatePixmap(TKToolBarButton*); + void updatePixmap(TTDEToolBarButton*); protected: TKColorPopupMenu* m_pMenu; @@ -95,7 +95,7 @@ protected: TQColor m_pCurrentColor; private: - TKSelectColorActionPrivate *d; + TTDESelectColorActionPrivate *d; }; /****************************************************************************************/ class TKColorPanelButton : public TQFrame diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index 92c42c10..c4c8e27b 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -36,10 +36,10 @@ // Delay in ms before delayed popup pops up #define POPUP_DELAY 500 -class TKToolBarButton::TKToolBarButtonPrivate +class TTDEToolBarButton::TTDEToolBarButtonPrivate { public: - TKToolBarButtonPrivate() + TTDEToolBarButtonPrivate() { m_iconMode = TK::IconOnly; m_isPopup = false; @@ -61,7 +61,7 @@ public: m_instance = TDEGlobal::instance(); } - ~TKToolBarButtonPrivate() + ~TTDEToolBarButtonPrivate() { delete m_delayTimer; m_delayTimer = 0; @@ -88,12 +88,12 @@ public: TDEInstance *m_instance; }; -TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt, +TTDEToolBarButton::TTDEToolBarButton( const TQString& icon, const TQString& txt, TQWidget* parent, const char* name, TDEInstance *instance ) : TQToolButton(parent,name) { - d = new TKToolBarButtonPrivate; + d = new TTDEToolBarButtonPrivate; d->m_text = txt; d->m_instance = instance; @@ -109,10 +109,10 @@ TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt, modeChange(); } -TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* parent, const char* name ) +TTDEToolBarButton::TTDEToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* parent, const char* name ) : TQToolButton(parent,name ) { - d = new TKToolBarButtonPrivate; + d = new TTDEToolBarButtonPrivate; d->m_text = txt; setFocusPolicy( TQ_NoFocus ); @@ -127,17 +127,17 @@ TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, T modeChange(); } -TKToolBarButton::~TKToolBarButton() +TTDEToolBarButton::~TTDEToolBarButton() { delete d; } -TQString TKToolBarButton::text() +TQString TTDEToolBarButton::text() { return d->m_text; } -void TKToolBarButton::modeChange() +void TTDEToolBarButton::modeChange() { TQToolTip::add(this,d->m_text); @@ -170,7 +170,7 @@ void TKToolBarButton::modeChange() updateGeometry(); } -void TKToolBarButton::setEnabled( bool enabled ) +void TTDEToolBarButton::setEnabled( bool enabled ) { if (isEnabled()==enabled) return; @@ -179,13 +179,13 @@ void TKToolBarButton::setEnabled( bool enabled ) TQToolButton::setEnabled( enabled ); } -void TKToolBarButton::setText( const TQString& text) +void TTDEToolBarButton::setText( const TQString& text) { d->m_text = text; repaint(false); } -void TKToolBarButton::setIcon( const TQString& icon ) +void TTDEToolBarButton::setIcon( const TQString& icon ) { d->m_iconName = icon; int iconSize = 16; @@ -195,31 +195,31 @@ void TKToolBarButton::setIcon( const TQString& icon ) setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) ); } -void TKToolBarButton::setDisabledIcon( const TQString &icon ) +void TTDEToolBarButton::setDisabledIcon( const TQString &icon ) { d->m_disabledIconName = icon; int iconSize = 16; setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) ); } -void TKToolBarButton::setDefaultIcon( const TQString &icon ) +void TTDEToolBarButton::setDefaultIcon( const TQString &icon ) { d->m_defaultIconName = icon; int iconSize = 16; setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) ); } -TQPixmap TKToolBarButton::getActivePixmap() const +TQPixmap TTDEToolBarButton::getActivePixmap() const { return activePixmap; } -void TKToolBarButton::setPixmap( const TQPixmap &pixmap ) +void TTDEToolBarButton::setPixmap( const TQPixmap &pixmap ) { setPixmap( pixmap, true ); } -void TKToolBarButton::setPixmap( const TQPixmap &pixmap, bool generate ) +void TTDEToolBarButton::setPixmap( const TQPixmap &pixmap, bool generate ) { activePixmap = pixmap; @@ -239,19 +239,19 @@ void TKToolBarButton::setPixmap( const TQPixmap &pixmap, bool generate ) TQToolButton::setPixmap( isEnabled() ? defaultPixmap : disabledPixmap ); } -void TKToolBarButton::setDefaultPixmap( const TQPixmap &pixmap ) +void TTDEToolBarButton::setDefaultPixmap( const TQPixmap &pixmap ) { defaultPixmap = pixmap; TQToolButton::setPixmap( isEnabled() ? defaultPixmap : disabledPixmap ); } -void TKToolBarButton::setDisabledPixmap( const TQPixmap &pixmap ) +void TTDEToolBarButton::setDisabledPixmap( const TQPixmap &pixmap ) { disabledPixmap = pixmap; TQToolButton::setPixmap( isEnabled() ? defaultPixmap : disabledPixmap ); } -void TKToolBarButton::setPopup(TQPopupMenu *p) +void TTDEToolBarButton::setPopup(TQPopupMenu *p) { d->m_popup = p; d->m_popup->setFont(TDEGlobalSettings::toolBarFont()); @@ -260,12 +260,12 @@ void TKToolBarButton::setPopup(TQPopupMenu *p) modeChange(); } -TQPopupMenu *TKToolBarButton::popup() +TQPopupMenu *TTDEToolBarButton::popup() { return d->m_popup; } -void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) +void TTDEToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) { d->m_isPopup = true; setToggle(toggle); @@ -278,18 +278,18 @@ void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) setPopup(p); } -void TKToolBarButton::setRaised(bool f) +void TTDEToolBarButton::setRaised(bool f) { d->m_isRaised = f; repaint(false); } -void TKToolBarButton::setAutoRaised(bool f) +void TTDEToolBarButton::setAutoRaised(bool f) { d->m_autoRaised = f; } -void TKToolBarButton::leaveEvent(TQEvent *) +void TTDEToolBarButton::leaveEvent(TQEvent *) { if (!d->m_isToggle && !(d->m_popup && d->m_popup->isVisible()) ) { TQToolButton::setPixmap(isEnabled() ? defaultPixmap : disabledPixmap); @@ -298,7 +298,7 @@ void TKToolBarButton::leaveEvent(TQEvent *) } } -void TKToolBarButton::enterEvent(TQEvent *) +void TTDEToolBarButton::enterEvent(TQEvent *) { if (!d->m_isToggle) { if (isEnabled()) { @@ -312,7 +312,7 @@ void TKToolBarButton::enterEvent(TQEvent *) } } -bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev) +bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) if (ev->type() == TQEvent::MouseButtonPress && d->m_popup && d->m_isPopup ) { @@ -348,7 +348,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev) return false; } -void TKToolBarButton::drawButton( TQPainter* p ) +void TTDEToolBarButton::drawButton( TQPainter* p ) { #define DRAW_PIXMAP_AND_TEXT \ int x = 3;\ @@ -402,7 +402,7 @@ void TKToolBarButton::drawButton( TQPainter* p ) } } -void TKToolBarButton::paletteChange(const TQPalette &) +void TTDEToolBarButton::paletteChange(const TQPalette &) { makeDisabledPixmap(); if ( !isEnabled() ) @@ -412,7 +412,7 @@ void TKToolBarButton::paletteChange(const TQPalette &) repaint(false); } -void TKToolBarButton::makeDefaultPixmap() +void TTDEToolBarButton::makeDefaultPixmap() { if (activePixmap.isNull()) return; @@ -421,7 +421,7 @@ void TKToolBarButton::makeDefaultPixmap() defaultPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DefaultState); } -void TKToolBarButton::makeDisabledPixmap() +void TTDEToolBarButton::makeDisabledPixmap() { if (activePixmap.isNull()) return; @@ -430,17 +430,17 @@ void TKToolBarButton::makeDisabledPixmap() disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState); } -TQSize TKToolBarButton::sizeHint() const +TQSize TTDEToolBarButton::sizeHint() const { return minimumSize(); } -TQSize TKToolBarButton::minimumSizeHint() const +TQSize TTDEToolBarButton::minimumSizeHint() const { return minimumSize(); } -void TKToolBarButton::showMenu() +void TTDEToolBarButton::showMenu() { TQPoint p ( mapToGlobal( TQPoint( 0, 0 ) ) ); const int deskHeight = TDEGlobalSettings::desktopGeometry(this).height(); @@ -452,13 +452,13 @@ void TKToolBarButton::showMenu() d->m_popup->popup(p); } -void TKToolBarButton::slotDelayTimeout() +void TTDEToolBarButton::slotDelayTimeout() { d->m_delayTimer->stop(); showMenu(); } -void TKToolBarButton::slotClicked() +void TTDEToolBarButton::slotClicked() { if ( d->ignoreNextMousePress ) { d->ignoreNextMousePress=false; @@ -471,7 +471,7 @@ void TKToolBarButton::slotClicked() emit buttonClicked(); } -void TKToolBarButton::slotPressed() +void TTDEToolBarButton::slotPressed() { if ( d->ignoreNextMousePress ) return; @@ -486,7 +486,7 @@ void TKToolBarButton::slotPressed() d->ignoreNextMousePress = false; } -void TKToolBarButton::slotReleased() +void TTDEToolBarButton::slotReleased() { if (d->m_popup && d->m_isPopup) d->m_delayTimer->stop(); @@ -494,23 +494,23 @@ void TKToolBarButton::slotReleased() emit buttonReleased(); } -void TKToolBarButton::slotToggled() +void TTDEToolBarButton::slotToggled() { emit buttonToggled(); } -void TKToolBarButton::on(bool flag) +void TTDEToolBarButton::on(bool flag) { d->m_isOn = flag; repaint(); } -void TKToolBarButton::toggle() +void TTDEToolBarButton::toggle() { on(!d->m_isOn); } -void TKToolBarButton::setToggle(bool flag) +void TTDEToolBarButton::setToggle(bool flag) { d->m_isToggle = flag; if (flag == true) @@ -522,7 +522,7 @@ void TKToolBarButton::setToggle(bool flag) repaint(); } -void TKToolBarButton::setIconMode( TK::IconMode m ) +void TTDEToolBarButton::setIconMode( TK::IconMode m ) { d->m_iconMode = m; modeChange(); diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 0e74b7e3..14d3b285 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -26,21 +26,21 @@ #include #include -class KToolBar; +class TDEToolBar; class TDEInstance; class TQPopupMenu; class TQPainter; -class TKToolBarButton : public TQToolButton +class TTDEToolBarButton : public TQToolButton { Q_OBJECT public: - TKToolBarButton(const TQString& icon, const TQString& txt, + TTDEToolBarButton(const TQString& icon, const TQString& txt, TQWidget* parent = 0, const char *name=0L, TDEInstance *_instance = TDEGlobal::instance()); - TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0); - ~TKToolBarButton(); + TTDEToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0); + ~TTDEToolBarButton(); void setIconMode(TK::IconMode); void setRaised(bool); @@ -213,8 +213,8 @@ private: TQPixmap activePixmap; TQPixmap disabledPixmap; virtual void setIcon(const TQPixmap &p) { TQButton::setIcon(p); } - class TKToolBarButtonPrivate; - TKToolBarButtonPrivate *d; + class TTDEToolBarButtonPrivate; + TTDEToolBarButtonPrivate *d; protected slots: diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index c84d6b5e..e93cae7c 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -44,7 +44,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) { #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90) - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); #endif setCloseMode( TQDockWindow::Never); setResizeEnabled(true); diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 2a9d1f5c..de35054a 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -42,7 +42,7 @@ #include -KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const char * name) +KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const char * name) : TQObject(view, name) { @@ -50,7 +50,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c m_view->installEventFilter(this); m_actionCollection = ac; - m_actions = new TQDict(); + m_actions = new TQDict(); m_widgets = new TQDict(); m_palettes = new TQDict(); m_palettes->setAutoDelete(true); @@ -63,16 +63,16 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c m_mapper = new TQSignalMapper(this); connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int))); - m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); + m_viewActionMenu = new TDEActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup("palettes"); bool palettesShown = cfg->readBoolEntry("palettesshown", true); - KToggleAction * m_toggleShowHidePalettes; + TDEToggleAction * m_toggleShowHidePalettes; if ( palettesShown) { - m_toggleShowHidePalettes = new KToggleAction(i18n("Hide All Palette Windows"), + m_toggleShowHidePalettes = new TDEToggleAction(i18n("Hide All Palette Windows"), "CTRL+SHIFT+H", this, TQT_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); @@ -80,7 +80,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c m_toggleShowHidePalettes->setCheckedState(i18n("Show Palette Windows Again")); } else { - m_toggleShowHidePalettes = new KToggleAction(i18n("Show Palette Windows Again"), + m_toggleShowHidePalettes = new TDEToggleAction(i18n("Show Palette Windows Again"), "CTRL+SHIFT+H", this, TQT_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); @@ -105,7 +105,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c } /* - KAction * a = new KAction(i18n("Restore Palettes"), + TDEAction * a = new TDEAction(i18n("Restore Palettes"), 0, this, TQT_SLOT(slotReset()), this, "restorePalettes"); @@ -164,8 +164,8 @@ void KoPaletteManager::addWidget(TQWidget * widget, m_defaultPaletteOrder.append(pname+ "," + TQString::number(style)); } - KToggleAction * a; - a = new KToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); + TDEToggleAction * a; + a = new TDEToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); a->setCheckedState(i18n("Hide %1").arg(widget->caption())); m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action @@ -285,7 +285,7 @@ void KoPaletteManager::showWidget(const TQString & name) KoPalette * p = m_palettes->find(pname); p->showPage(w); - KToggleAction * a = m_actions->find(name); + TDEToggleAction * a = m_actions->find(name); a->setChecked(true); } @@ -300,7 +300,7 @@ void KoPaletteManager::hideWidget(const TQString & name) KoPalette * p = m_palettes->find(pname); p->hidePage(w); - KToggleAction * a = m_actions->find(name); + TDEToggleAction * a = m_actions->find(name); a->setChecked(false); } @@ -320,7 +320,7 @@ void KoPaletteManager::removeWidget(const TQString & name) m_widgets->remove(name); m_currentMapping->remove(name); - KAction * a = m_actions->take(name); + TDEAction * a = m_actions->take(name); m_viewActionMenu->remove(a); m_actionCollection->remove(a); } @@ -458,7 +458,7 @@ void KoPaletteManager::slotToggleAllPalettes() { TQString name = m_hiddenWidgets.pop(); TQWidget *w = m_widgets->find(name); - KToggleAction * a = m_actions->find(name); + TDEToggleAction * a = m_actions->find(name); a->setChecked(true); TQString pname = *m_currentMapping->find(name); @@ -473,7 +473,7 @@ void KoPaletteManager::slotToggleAllPalettes() TQDictIterator it(*m_widgets); for (; it.current(); ++it) { - KToggleAction * a = m_actions->find(it.currentKey()); + TDEToggleAction * a = m_actions->find(it.currentKey()); if(a->isChecked()) { a->setChecked(false); diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h index 333a3cb6..090f237d 100644 --- a/lib/kopalette/kopalettemanager.h +++ b/lib/kopalette/kopalettemanager.h @@ -33,10 +33,10 @@ #include class KoPalette; -class KActionMenu; -class KAction; -class KActionCollection; -class KToggleAction; +class TDEActionMenu; +class TDEAction; +class TDEActionCollection; +class TDEToggleAction; enum enumKoDockability { DOCK_ENABLED = 0, // It's possible to dock the dockers @@ -90,7 +90,7 @@ class KOPALETTE_EXPORT KoPaletteManager : public TQObject { public: - KoPaletteManager(KoView * view, KActionCollection * ac, const char * name); + KoPaletteManager(KoView * view, TDEActionCollection * ac, const char * name); virtual ~KoPaletteManager(); public: @@ -199,9 +199,9 @@ private: private: KoView * m_view; - KActionCollection * m_actionCollection; - KActionMenu * m_viewActionMenu; - KToggleAction * m_toggleShowHidePalettes; + TDEActionCollection * m_actionCollection; + TDEActionMenu * m_viewActionMenu; + TDEToggleAction * m_toggleShowHidePalettes; enumKoDockability m_dockability; TQStringList * m_widgetNames; @@ -209,7 +209,7 @@ private: TQDict * m_widgets; TQDict * m_palettes; TQValueStack m_hiddenWidgets; // names of widgets actively hidden by hide all - TQDict * m_actions; + TQDict * m_actions; TQSignalMapper * m_mapper; TQMap * m_defaultMapping; // widget to docker diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 39c965a5..13638119 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -120,7 +120,7 @@ class EditorPrivate using namespace KoProperty; Editor::Editor(TQWidget *parent, bool autoSync, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { d = new EditorPrivate(this); d->itemDict.setAutoDelete(false); @@ -189,7 +189,7 @@ Editor::fill() d->itemToSelectLater = 0; tqApp->eventLoop()->processEvents(TQEventLoop::AllEvents); hideEditor(); - KListView::clear(); + TDEListView::clear(); d->itemDict.clear(); clearWidgetCache(); if(!d->set) { @@ -416,7 +416,7 @@ Editor::clear(bool editorOnly) if(d->set) d->set->disconnect(this); clearWidgetCache(); - KListView::clear(); + TDEListView::clear(); d->itemDict.clear(); d->topItem = 0; } @@ -872,7 +872,7 @@ TQSize Editor::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::sizeHint().height()); + TDEListView::sizeHint().height()); } void @@ -897,15 +897,15 @@ Editor::setFocus() d->currentWidget->setFocus(); } else { -// kopropertydbg << "KListView::setFocus()" << endl; - KListView::setFocus(); +// kopropertydbg << "TDEListView::setFocus()" << endl; + TDEListView::setFocus(); } } void Editor::resizeEvent(TQResizeEvent *ev) { - KListView::resizeEvent(ev); + TDEListView::resizeEvent(ev); if(d->undoButton->isVisible()) showUndoButton(true); update(); @@ -919,7 +919,7 @@ Editor::eventFilter( TQObject * watched, TQEvent * e ) if (handleKeyPress(TQT_TQKEYEVENT(e))) return true; } - return KListView::eventFilter(watched, e); + return TDEListView::eventFilter(watched, e); } bool @@ -998,7 +998,7 @@ Editor::event( TQEvent * e ) if (e->type()==TQEvent::ParentFontChange) { updateFont(); } - return KListView::event(e); + return TDEListView::event(e); } void @@ -1009,7 +1009,7 @@ Editor::contentsMousePressEvent( TQMouseEvent * e ) setOpen( item, !isOpen(item) ); return; } - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } void @@ -1017,7 +1017,7 @@ Editor::setSorting( int column, bool ascending ) { if (d->set && d->set->groupNames().count()>1) //do not sort when groups are present (maybe reenable this later?) return; - KListView::setSorting( column, ascending ); + TDEListView::setSorting( column, ascending ); updateEditorGeometry(); updateGroupLabelsPosition(); repaintContents(); diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index 7f8d41fa..0fbcf45f 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -60,7 +60,7 @@ class EditorItem; \author Alexander Dymo \author Jaroslaw Staniek */ -class KOPROPERTY_EXPORT Editor : public KListView +class KOPROPERTY_EXPORT Editor : public TDEListView { Q_OBJECT diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index b378f93a..a22bab55 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -89,7 +89,7 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T } //! @internal -//! Based on KPopupTitle, see kpopupmenu.cpp +//! Based on TDEPopupTitle, see kpopupmenu.cpp class GroupWidgetBase : public TQWidget { public: @@ -255,7 +255,7 @@ bool GroupContainer::event( TQEvent * e ) { ////////////////////////////////////////////////////// EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, TQListViewItem *after) - : KListViewItem(parent, after, + : TDEListViewItem(parent, after, property->captionForDisplaying().isEmpty() ? property->name() : property->captionForDisplaying()) { d = new EditorItemPrivate(); @@ -280,8 +280,8 @@ EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, T */ } -EditorItem::EditorItem(KListView *parent) - : KListViewItem(parent) +EditorItem::EditorItem(TDEListView *parent) + : TDEListViewItem(parent) { d = new EditorItemPrivate(); d->property = 0; @@ -290,7 +290,7 @@ EditorItem::EditorItem(KListView *parent) } EditorItem::EditorItem(EditorItem *parent, const TQString &text) - : KListViewItem(parent, text) + : TDEListViewItem(parent, text) { d = new EditorItemPrivate(); d->property = 0; @@ -299,7 +299,7 @@ EditorItem::EditorItem(EditorItem *parent, const TQString &text) } EditorItem::EditorItem(EditorItem *parent, EditorItem *after, const TQString &text) - : KListViewItem(parent, after, text) + : TDEListViewItem(parent, after, text) { d = new EditorItemPrivate(); d->property = 0; @@ -333,7 +333,7 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid p->setFont(font); p->setBrush(cg.highlight()); p->setPen(cg.highlightedText()); - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); p->fillRect(parent() ? 0 : 50, 0, width, height()-1, TQBrush(isSelected() ? cg.highlight() : backgroundColor())); p->setPen(isSelected() ? cg.highlightedText() : cg.text()); @@ -384,7 +384,7 @@ void EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h) { p->eraseRect(0,0,w,h); - KListViewItem *item = static_cast(firstChild()); + TDEListViewItem *item = static_cast(firstChild()); if(!item) return; @@ -475,7 +475,7 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in } p->translate(0, item->totalHeight()); - item = (KListViewItem*)item->nextSibling(); + item = (TDEListViewItem*)item->nextSibling(); } p->restore(); } @@ -507,7 +507,7 @@ EditorItem::compare( TQListViewItem *i, int col, bool ascending ) const void EditorItem::setHeight( int height ) { - KListViewItem::setHeight(height); + TDEListViewItem::setHeight(height); } ////////////////////////////////////////////////////// @@ -575,7 +575,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in p->setFont(font); p->setBrush(cg.highlight()); //p->setPen(cg.highlightedText()); - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); p->setPen(cg.text()); p->drawText(TQRect(0,0, totalWidth, height()), TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, text(0));*/ @@ -584,7 +584,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in void EditorGroupItem::setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight( height()+4 ); } @@ -602,7 +602,7 @@ EditorGroupItem::compare( TQListViewItem *i, int col, bool ascending ) const //////////////////////////////////////////////////////// -EditorDummyItem::EditorDummyItem(KListView *listview) +EditorDummyItem::EditorDummyItem(TDEListView *listview) : EditorItem(listview) { setSelectable(false); diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h index fc703239..a1300e5a 100644 --- a/lib/koproperty/editoritem.h +++ b/lib/koproperty/editoritem.h @@ -44,7 +44,7 @@ class GroupWidget; \author Jaroslaw Staniek @internal */ -class EditorItem : public KListViewItem +class EditorItem : public TDEListViewItem { public: typedef TQAsciiDict Dict; @@ -56,7 +56,7 @@ class EditorItem : public KListViewItem TQListViewItem *after=0); //! Two helper contructors for subclass - EditorItem(KListView *parent); + EditorItem(TDEListView *parent); EditorItem(EditorItem *parent, const TQString &text); EditorItem(EditorItem *parent, EditorItem *after, const TQString &text); @@ -66,12 +66,12 @@ class EditorItem : public KListViewItem Property* property(); protected: - /*! Reimplemented from KListViewItem to draw custom contents. Properties names are wriiten in bold if + /*! Reimplemented from TDEListViewItem to draw custom contents. Properties names are wriiten in bold if modified. Also takes care of drawing borders around the cells as well as pixmaps or colors if necessary. */ virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align); - /*! Reimplemented from KListViewItem to draw custom contents. It takes care of drawing the [+] and [-] + /*! Reimplemented from TDEListViewItem to draw custom contents. It takes care of drawing the [+] and [-] signs only if the item has children. */ virtual void paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h); @@ -102,7 +102,7 @@ class EditorGroupItem : public EditorItem protected: virtual void init(const TQString &icon); - /*! Reimplemented from KListViewItem to draw custom contents. */ + /*! Reimplemented from TDEListViewItem to draw custom contents. */ virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align); virtual void setup(); virtual int compare( TQListViewItem *i, int col, bool ascending ) const; @@ -115,7 +115,7 @@ class EditorGroupItem : public EditorItem class EditorDummyItem : public EditorItem { public: - EditorDummyItem(KListView *parent); + EditorDummyItem(TDEListView *parent); virtual ~EditorDummyItem(); protected: diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 589e0a3b..84c7c3d2 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -41,11 +41,11 @@ namespace KoProperty { -class FontEditRequester : public KFontRequester +class FontEditRequester : public TDEFontRequester { public: FontEditRequester(TQWidget* parent) - : KFontRequester(parent) + : TDEFontRequester(parent) { label()->setPaletteBackgroundColor(palette().active().base()); label()->setMinimumWidth(0); @@ -53,7 +53,7 @@ class FontEditRequester : public KFontRequester label()->setIndent(-1); #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) label()->setFocusPolicy(TQ_ClickFocus); - KAcceleratorManager::setNoAccel(label()); + TDEAcceleratorManager::setNoAccel(label()); #endif layout()->remove(label()); layout()->remove(button());//->reparent(this, 0, TQPoint(0,0)); @@ -67,7 +67,7 @@ class FontEditRequester : public KFontRequester } virtual void resizeEvent(TQResizeEvent *e) { - KFontRequester::resizeEvent(e); + TDEFontRequester::resizeEvent(e); label()->move(0,0); label()->resize(e->size()-TQSize(button()->width(),-1)); button()->move(label()->width(),0); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 30fd5dbd..f803d4c3 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -188,7 +188,7 @@ PixmapEdit::selectPixmap() //save last visited path KURL url(fileName); if (url.isLocalFile()) - KRecentDirs::add(":lastVisitedImagePath", url.directory()); + TDERecentDirs::add(":lastVisitedImagePath", url.directory()); #endif } diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index ecf41473..77ceb415 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -37,7 +37,7 @@ using namespace KoProperty; Test::Test() - : KMainWindow(0,"koproperty_test") + : TDEMainWindow(0,"koproperty_test") { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); const bool flat = args->isSet("flat"); diff --git a/lib/koproperty/test/test.h b/lib/koproperty/test/test.h index 8d9dedb2..51ee85f5 100644 --- a/lib/koproperty/test/test.h +++ b/lib/koproperty/test/test.h @@ -33,7 +33,7 @@ * @author Cedric Pasteur * @version 0.1 */ -class Test : public KMainWindow +class Test : public TDEMainWindow { Q_OBJECT diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index bc582bd5..4f503d17 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -584,7 +584,7 @@ void KoAutoFormatDia::setupTab3() connect(pbAdd,TQT_SIGNAL(clicked()),this, TQT_SLOT(slotAddEntry())); - m_pListView = new KListView( tab3 ); + m_pListView = new TDEListView( tab3 ); m_pListView->addColumn( i18n( "Find" ) ); m_pListView->addColumn( i18n( "Replace" ) ); m_pListView->setAllColumnsShowFocus( true ); diff --git a/lib/kotext/KoAutoFormatDia.h b/lib/kotext/KoAutoFormatDia.h index 354febf6..800028df 100644 --- a/lib/kotext/KoAutoFormatDia.h +++ b/lib/kotext/KoAutoFormatDia.h @@ -122,7 +122,7 @@ protected: TQPushButton *pbChangeFormat, *pbClearFormat; KCharSelect *charselect; KoAutoFormatLineEdit *m_find, *m_replace; - KListView *m_pListView; + TDEListView *m_pListView; TQChar oSimpleBegin, oSimpleEnd; TQChar oDoubleBegin, oDoubleEnd; diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index f3b84121..dd32a80e 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -159,7 +159,7 @@ int KoCustomVariablesListItem::width( const TQFontMetrics & fm, const TQListView ******************************************************************/ KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) - : KListView( parent ) + : TDEListView( parent ) { header()->setMovingEnabled( FALSE ); addColumn( i18n( "Variable" ) ); diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h index 915d6081..25b826ab 100644 --- a/lib/kotext/KoCustomVariablesDia.h +++ b/lib/kotext/KoCustomVariablesDia.h @@ -90,7 +90,7 @@ protected: * The listview. * Used by KoCustomVariablesDia */ -class KoCustomVariablesList : public KListView +class KoCustomVariablesList : public TDEListView { Q_OBJECT diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 258ea98d..1d82214c 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -59,7 +59,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, TQTabWidget *fontTabWidget = new TQTabWidget( mainHBox ); // Font tab - fontTab = new KoFontTab( KFontChooser::SmoothScalableFonts, this ); + fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); fontTabWidget->addTab( fontTab, i18n( "Font" ) ); connect( fontTab, TQT_SIGNAL( familyChanged() ), this, TQT_SLOT( slotFontFamilyChanged() ) ); @@ -103,7 +103,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, connect( languageTab, TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( slotLanguageChanged() ) ); //Related properties List View - //relatedPropertiesListView = new KListView( mainHBox ); + //relatedPropertiesListView = new TDEListView( mainHBox ); //Preview fontDiaPreview = new KoFontDiaPreview( mainWidget ); diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp index da0b524e..0615a337 100644 --- a/lib/kotext/KoFontTab.cpp +++ b/lib/kotext/KoFontTab.cpp @@ -23,7 +23,7 @@ KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, : KoFontTabBase( parent, name, fl ) { TQStringList list; - KFontChooser_local::getFontList(list, fontListCriteria); + TDEFontChooser_local::getFontList(list, fontListCriteria); characterFont->setFamilyList( list ); comparisonFont = characterFont->font(); diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index b022eb72..7bbca041 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -589,7 +589,7 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC m_checkVertAlign = new TQCheckBox( i18n( "Vertical alignment:" ), page ); - m_familyItem = new KFontCombo(page); + m_familyItem = new TDEFontCombo(page); m_familyItem->setCurrentFont(m_ctx->m_family); m_sizeItem = new TQSpinBox( 4, 100, 1, page ); diff --git a/lib/kotext/KoSearchDia.h b/lib/kotext/KoSearchDia.h index 40b4cb97..3c5ebf0b 100644 --- a/lib/kotext/KoSearchDia.h +++ b/lib/kotext/KoSearchDia.h @@ -47,7 +47,7 @@ class KoTextObject; class KCommand; class KoTextDocument; class KoFindReplace; -class KFontCombo; +class TDEFontCombo; class KoTextCursor; // // This class represents the KWord-specific search extension items, and also the @@ -321,7 +321,7 @@ private: TQCheckBox *m_checkFontAttribute; TQCheckBox *m_checkLanguage; - KFontCombo *m_familyItem; + TDEFontCombo *m_familyItem; TQSpinBox *m_sizeItem; KColorButton *m_colorItem; KColorButton *m_bgColorItem; diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 5a99c38b..0738f0e3 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -683,7 +683,7 @@ KoStyleFontTab::KoStyleFontTab( TQWidget * parent ) ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQTabWidget *fontTabContainer = new TQTabWidget( this ); - m_fontTab = new KoFontTab( KFontChooser::SmoothScalableFonts, this ); + m_fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); m_decorationTab = new KoDecorationTab( this ); m_highlightingTab = new KoHighlightingTab( this ); m_layoutTab = new KoLayoutTab( true, this ); diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 47d7004b..55c54e9d 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -175,14 +175,14 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ }*/ bool clearUndoRedoInfo = TRUE; - if ( KShortcut( KKey( e ) ) == KStdAccel::deleteWordBack() ) + if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordBack() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordRight(); else deleteWordLeft(); clearUndoRedoInfo = TRUE; - } else if ( KShortcut( KKey( e ) ) == KStdAccel::deleteWordForward() ) + } else if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordForward() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordLeft(); @@ -355,7 +355,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ removeToolTipCompletion(); } - // We should use KAccel instead, to make this configurable ! + // We should use TDEAccel instead, to make this configurable ! // Well, those are all alternate keys, for keys already configurable (KDE-wide) // and a kaccel makes it hard to else @@ -1087,7 +1087,7 @@ KoLinkVariable * KoTextView::linkVariable() return dynamic_cast(variable()); } -TQPtrList KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) +TQPtrList KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) { m_singleWord = false; m_wordUnderCursor = TQString(); @@ -1118,7 +1118,7 @@ TQPtrList KoTextView::dataToolActionList(TDEInstance * instance, const } if ( text.isEmpty() || textObject()->protectContent()) // Nothing to apply a tool to - return TQPtrList(); + return TQPtrList(); // Any tool that works on plain text is relevant TQValueList tools; diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h index 0954192b..20013ad7 100644 --- a/lib/kotext/KoTextView.h +++ b/lib/kotext/KoTextView.h @@ -35,7 +35,7 @@ class KoTextFormat; class KoParagCounter; class KCommand; class TQTimer; -class KAction; +class TDEAction; class TDEInstance; class KDataToolInfo; class KoLinkVariable; @@ -134,7 +134,7 @@ public: TQString wordUnderCursor( const KoTextCursor& cursor ); /** Return the list of actions from data-tools. Used to populate a RMB popupmenu usually. */ - TQPtrList dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); + TQPtrList dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); void insertSoftHyphen(); void insertLineBreak(); diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 8ee25c19..856c05f1 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -569,10 +569,10 @@ void KoVariableCollection::setVariableSelected(KoVariable * var) m_varSelected=var; } -// TODO change to TQValueList, but only once plugActionList takes that -TQPtrList KoVariableCollection::popupActionList() const +// TODO change to TQValueList, but only once plugActionList takes that +TQPtrList KoVariableCollection::popupActionList() const { - TQPtrList listAction; + TQPtrList listAction; // Insert list of actions that change the subtype const TQStringList subTypeList = m_varSelected->subTypeList(); kdDebug() << k_funcinfo << "current subtype=" << m_varSelected->subType() << endl; @@ -583,7 +583,7 @@ TQPtrList KoVariableCollection::popupActionList() const { // We store the subtype number as the action name TQCString name; name.setNum(i); - KToggleAction * act = new KToggleAction( *it, KShortcut(), 0, name ); + TDEToggleAction * act = new TDEToggleAction( *it, TDEShortcut(), 0, name ); connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeSubType()) ); if ( i == m_varSelected->subType() ) act->setChecked( true ); @@ -600,14 +600,14 @@ TQPtrList KoVariableCollection::popupActionList() const for ( int i = 0; it != list.end() ; ++it, ++i ) { if( i == 0 ) // first item, and list not empty - listAction.append( new KActionSeparator() ); + listAction.append( new TDEActionSeparator() ); if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { format->setFormatProperties( *it ); // temporary change TQString text = format->convert( m_varSelected->varValue() ); // We store the raw format as the action name - KToggleAction * act = new KToggleAction(text, KShortcut(), 0, (*it).utf8()); + TDEToggleAction * act = new TDEToggleAction(text, TDEShortcut(), 0, (*it).utf8()); connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeFormat()) ); if ( (*it) == currentFormat ) act->setChecked( true ); @@ -622,7 +622,7 @@ TQPtrList KoVariableCollection::popupActionList() const void KoVariableCollection::slotChangeSubType() { - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); int menuNumber = TQCString(act->name()).toInt(); int newSubType = m_varSelected->variableSubType(menuNumber); kdDebug(32500) << "slotChangeSubType: menuNumber=" << menuNumber << " newSubType=" << newSubType << endl; @@ -637,7 +637,7 @@ void KoVariableCollection::slotChangeSubType() void KoVariableCollection::slotChangeFormat() { - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); TQString newFormat = TQString::fromUtf8(act->name()); TQString oldFormat = m_varSelected->variableFormat()->formatProperties(); if (oldFormat != newFormat ) diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h index 5cadc5e9..8a066456 100644 --- a/lib/kotext/KoVariable.h +++ b/lib/kotext/KoVariable.h @@ -326,8 +326,8 @@ public: void setVariableSelected(KoVariable * var); KoVariable *selectedVariable()const {return m_varSelected;} - /// List of KActions to put into the popupmenu on a variable - TQPtrList popupActionList() const; + /// List of TDEActions to put into the popupmenu on a variable + TQPtrList popupActionList() const; protected slots: // This is here because variables and formats are not TQObjects @@ -335,7 +335,7 @@ public: void slotChangeFormat(); private: - //typedef TQMap VariableSubTextMap; + //typedef TQMap VariableSubTextMap; //VariableSubTextMap m_variableSubTextMap; TQPtrList variables; @@ -446,7 +446,7 @@ protected: TQVariant m_varValue; int m_ascent; - //typedef TQMap SubTextMap; + //typedef TQMap SubTextMap; //SubTextMap m_subTextMap; class Private; Private *d; diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am index 160c689c..fc2a2734 100644 --- a/lib/kotext/Makefile.am +++ b/lib/kotext/Makefile.am @@ -12,7 +12,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \ KoParagDia.cpp KoVariable.cpp KoCustomVariablesDia.cpp \ KoChangeCaseDia.cpp KoStyleManager.cpp KoSearchDia.cpp \ timedateformatwidget.ui TimeFormatWidget.cpp DateFormatWidget.cpp \ - KFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \ + TDEFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \ kodecorationtabbase.ui KoDecorationTab.cpp kolayouttabbase.ui KoLayoutTab.cpp kolanguagetabbase.ui KoLanguageTab.cpp \ KoFontDiaPreview.cpp KoCompletionDia.cpp KoCompletionBase.ui \ KoTextViewIface.skel KoTextViewIface.cc KoFontDia.cpp KoBgSpellCheck.cpp \ diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp similarity index 90% rename from lib/kotext/KFontDialog_local.cpp rename to lib/kotext/TDEFontDialog_local.cpp index 95bc2553..7103821b 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/TDEFontDialog_local.cpp @@ -56,8 +56,8 @@ #include -#include "KFontDialog_local.h" -#include "KFontDialog_local.moc" +#include "TDEFontDialog_local.h" +#include "TDEFontDialog_local.moc" static int minimumListWidth( const TQListBox *list ) { @@ -83,16 +83,16 @@ static int minimumListHeight( const TQListBox *list, int numVisibleEntry ) return ( w * numVisibleEntry + 2 * list->frameWidth() ); } -class KFontChooser_local::KFontChooser_localPrivate +class TDEFontChooser_local::TDEFontChooser_localPrivate { public: - KFontChooser_localPrivate() + TDEFontChooser_localPrivate() { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black); m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); } TQPalette m_palette; }; -KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, +TDEFontChooser_local::TDEFontChooser_local(TQWidget *parent, const char *name, bool onlyFixed, const TQStringList &fontList, bool makeFrame, int visibleListSize, bool diff, TQButton::ToggleState *sizeIsRelativeState ) @@ -104,7 +104,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, i18n( "Here you can choose the font to be used." ); TQWhatsThis::add( this, mainWhatsThisText ); - d = new KFontChooser_localPrivate; + d = new TDEFontChooser_localPrivate; TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); int checkBoxGap = KDialog::spacingHint() / 2; @@ -195,7 +195,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, // // now create the actual boxes that hold the info // - familyListBox = new KListBox( page, "familyListBox"); + familyListBox = new TDEListBox( page, "familyListBox"); familyListBox->setEnabled( !diff ); gridLayout->addWidget( familyListBox, row, 0 ); TQString fontFamilyWhatsThisText = @@ -217,7 +217,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, familyListBox->setMinimumHeight( minimumListHeight( familyListBox, visibleListSize ) ); - styleListBox = new KListBox( page, "styleListBox"); + styleListBox = new TDEListBox( page, "styleListBox"); styleListBox->setEnabled( !diff ); gridLayout->addWidget(styleListBox, row, 1); TQString fontStyleWhatsThisText = @@ -236,7 +236,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, TQT_SLOT(style_chosen_slot(const TQString &))); - sizeListBox = new KListBox( page, "sizeListBox"); + sizeListBox = new TDEListBox( page, "sizeListBox"); sizeOfFont = new KIntNumInput( page, "sizeOfFont"); sizeOfFont->setMinValue(4); @@ -337,12 +337,12 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } -KFontChooser_local::~KFontChooser_local() +TDEFontChooser_local::~TDEFontChooser_local() { delete d; } -void KFontChooser_local::fillSizeList() { +void TDEFontChooser_local::fillSizeList() { if(! sizeListBox) return; //assertion. static const int c[] = @@ -361,7 +361,7 @@ void KFontChooser_local::fillSizeList() { } } -void KFontChooser_local::setColor( const TQColor & col ) +void TDEFontChooser_local::setColor( const TQColor & col ) { d->m_palette.setColor( TQPalette::Active, TQColorGroup::Text, col ); TQPalette pal = sampleEdit->palette(); @@ -369,12 +369,12 @@ void KFontChooser_local::setColor( const TQColor & col ) sampleEdit->setPalette( pal ); } -TQColor KFontChooser_local::color() const +TQColor TDEFontChooser_local::color() const { return d->m_palette.color( TQPalette::Active, TQColorGroup::Text ); } -void KFontChooser_local::setBackgroundColor( const TQColor & col ) +void TDEFontChooser_local::setBackgroundColor( const TQColor & col ) { d->m_palette.setColor( TQPalette::Active, TQColorGroup::Base, col ); TQPalette pal = sampleEdit->palette(); @@ -382,12 +382,12 @@ void KFontChooser_local::setBackgroundColor( const TQColor & col ) sampleEdit->setPalette( pal ); } -TQColor KFontChooser_local::backgroundColor() const +TQColor TDEFontChooser_local::backgroundColor() const { return d->m_palette.color( TQPalette::Active, TQColorGroup::Base ); } -void KFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) +void TDEFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) { // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeCheckBox ) { @@ -398,20 +398,20 @@ void KFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) } } -TQButton::ToggleState KFontChooser_local::sizeIsRelative() const +TQButton::ToggleState TDEFontChooser_local::sizeIsRelative() const { return sizeIsRelativeCheckBox ? sizeIsRelativeCheckBox->state() : TQButton::NoChange; } -TQSize KFontChooser_local::sizeHint( void ) const +TQSize TDEFontChooser_local::sizeHint( void ) const { return minimumSizeHint(); } -void KFontChooser_local::enableColumn( int column, bool state ) +void TDEFontChooser_local::enableColumn( int column, bool state ) { if( column & FamilyList ) { @@ -428,7 +428,7 @@ void KFontChooser_local::enableColumn( int column, bool state ) } -void KFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) +void TDEFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) { selFont = aFont; selectedSize=aFont.pointSize(); @@ -445,7 +445,7 @@ void KFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) } -int KFontChooser_local::fontDiffFlags() { +int TDEFontChooser_local::fontDiffFlags() { int diffFlags = 0; if (familyCheckbox && styleCheckbox && sizeCheckbox) { diffFlags = (int)(familyCheckbox->isChecked() ? FontDiffFamily : 0) @@ -455,7 +455,7 @@ int KFontChooser_local::fontDiffFlags() { return diffFlags; } -void KFontChooser_local::toggled_checkbox() +void TDEFontChooser_local::toggled_checkbox() { familyListBox->setEnabled( familyCheckbox->isChecked() ); styleListBox->setEnabled( styleCheckbox->isChecked() ); @@ -463,7 +463,7 @@ void KFontChooser_local::toggled_checkbox() sizeOfFont->setEnabled( sizeCheckbox->isChecked() ); } -void KFontChooser_local::family_chosen_slot(const TQString& family) +void TDEFontChooser_local::family_chosen_slot(const TQString& family) { TQString currentFamily; if (family.isEmpty()) @@ -509,7 +509,7 @@ void KFontChooser_local::family_chosen_slot(const TQString& family) } -void KFontChooser_local::size_chosen_slot(const TQString& size){ +void TDEFontChooser_local::size_chosen_slot(const TQString& size){ selectedSize=size.toInt(); sizeOfFont->setValue(selectedSize); @@ -517,12 +517,12 @@ void KFontChooser_local::size_chosen_slot(const TQString& size){ emit fontSelected(selFont); } -void KFontChooser_local::size_value_slot(int val) { +void TDEFontChooser_local::size_value_slot(int val) { selFont.setPointSize(val); emit fontSelected(selFont); } -void KFontChooser_local::style_chosen_slot(const TQString& style) +void TDEFontChooser_local::style_chosen_slot(const TQString& style) { TQString currentStyle; if (style.isEmpty()) @@ -562,7 +562,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style) selectedStyle = style; } -void KFontChooser_local::displaySample(const TQFont& font) +void TDEFontChooser_local::displaySample(const TQFont& font) { sampleEdit->setFont(font); sampleEdit->setCursorPosition(0); @@ -574,7 +574,7 @@ void KFontChooser_local::displaySample(const TQFont& font) //kdDebug() << " (" << font.toString() << ")\n"; } -void KFontChooser_local::setupDisplay() +void TDEFontChooser_local::setupDisplay() { // Calling familyListBox->setCurrentItem() causes the value of selFont // to change, so we save the family, style and size beforehand. @@ -651,7 +651,7 @@ void KFontChooser_local::setupDisplay() } -void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) +void TDEFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) { TQFontDatabase dbase; TQStringList lstSys(dbase.families()); @@ -684,7 +684,7 @@ void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) list = lstSys; } -void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) +void TDEFontChooser_local::addFont( TQStringList &list, const char *xfont ) { const char *ptr = strchr( xfont, '-' ); if ( !ptr ) @@ -712,7 +712,7 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) } } -void KFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) +void TDEFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) { TQStringList fontList; getFontList(fontList, onlyFixedFonts?FixedWidthFonts:0); @@ -720,7 +720,7 @@ void KFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) familyListBox->insertStringList(fontList); } -void KFontChooser_local::setFamilyList( TQStringList list ) +void TDEFontChooser_local::setFamilyList( TQStringList list ) { familyListBox->blockSignals( true ); familyListBox->clear(); @@ -729,7 +729,7 @@ void KFontChooser_local::setFamilyList( TQStringList list ) familyListBox->blockSignals( false ); } -void KFontChooser_local::showXLFDArea(bool show) +void TDEFontChooser_local::showXLFDArea(bool show) { if( show ) { @@ -743,24 +743,24 @@ void KFontChooser_local::showXLFDArea(bool show) /////////////////////////////////////////////////////////////////////////////// -KFontDialog_local::KFontDialog_local( TQWidget *parent, const char* name, +TDEFontDialog_local::TDEFontDialog_local( TQWidget *parent, const char* name, bool onlyFixed, bool modal, const TQStringList &fontList, bool makeFrame, bool diff, TQButton::ToggleState *sizeIsRelativeState ) : KDialogBase( parent, name, modal, i18n("Select Font"), Ok|Cancel, Ok ) { - chooser = new KFontChooser_local( this, "fontChooser", + chooser = new TDEFontChooser_local( this, "fontChooser", onlyFixed, fontList, makeFrame, 8, diff, sizeIsRelativeState ); setMainWidget(chooser); } -int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, +int TDEFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), + TDEFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, true, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -775,11 +775,11 @@ int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFi return result; } -int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, +int TDEFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), + TDEFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -794,12 +794,12 @@ int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, } -int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, +int TDEFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, + TDEFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -814,8 +814,8 @@ int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, return result; } -void KFontChooser_local::virtual_hook( int, void* ) +void TDEFontChooser_local::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -void KFontDialog_local::virtual_hook( int id, void* data ) +void TDEFontDialog_local::virtual_hook( int id, void* data ) { KDialogBase::virtual_hook( id, data ); } diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/TDEFontDialog_local.h similarity index 91% rename from lib/kotext/KFontDialog_local.h rename to lib/kotext/TDEFontDialog_local.h index 3ed6ff08..4c238874 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/TDEFontDialog_local.h @@ -41,20 +41,20 @@ class TQFont; class TQGroupBox; class TQLabel; class TQStringList; -class KListBox; +class TDEListBox; class KIntNumInput; /** * @short A font selection widget. * - * While KFontChooser_local as an ordinary widget can be embedded in + * While TDEFontChooser_local as an ordinary widget can be embedded in * custom dialogs and therefore is very flexible, in most cases * it is preferable to use the convenience functions in - * KFontDialog_local. + * TDEFontDialog_local. * * @author Preston Brown , Bernd Wuebben * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ -class KOTEXT_EXPORT KFontChooser_local : public TQWidget +class KOTEXT_EXPORT TDEFontChooser_local : public TQWidget { Q_OBJECT @@ -83,8 +83,8 @@ public: *

      Consider the following code snippet; * \code * TQStringList list; - * KFontChooser_local::getFontList(list,SmoothScalableFonts); - * KFontChooser_local chooseFont = new KFontChooser_local(0, "FontList", false, list); + * TDEFontChooser_local::getFontList(list,SmoothScalableFonts); + * TDEFontChooser_local chooseFont = new TDEFontChooser_local(0, "FontList", false, list); * \endcode *

      * The above creates a font chooser dialog with only SmoothScaleble fonts. @@ -98,7 +98,7 @@ public: * If that has not been created, X is queried, and all fonts * available on the system are displayed. * @param diff Display the difference version dialog. - * See KFontDialog_local::getFontDiff(). + * See TDEFontDialog_local::getFontDiff(). * @param makeFrame Draws a frame with titles around the contents. * @param visibleListSize The minimum number of visible entries in the * fontlists. @@ -109,7 +109,7 @@ public: * *sizeIsRelativeState, user choice may be retrieved by * calling sizeIsRelative(). */ - KFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, + TDEFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, bool onlyFixed = false, const TQStringList &fontList = TQStringList(), bool makeFrame = true, int visibleListSize=8, @@ -118,7 +118,7 @@ public: /** * Destructs the font chooser. */ - virtual ~KFontChooser_local(); + virtual ~TDEFontChooser_local(); /** * Enables or disable a font column in the chooser. @@ -248,13 +248,13 @@ public: * * @param list The list is returned here. * @param fontListCriteria should contain all the restrictions for font selection as OR-ed values - * @see KFontChooser_local::FontListCriteria for the individual values + * @see TDEFontChooser_local::FontListCriteria for the individual values */ static void getFontList( TQStringList &list, uint fontListCriteria); /** * - * Fill the font family list of the KFontChooser + * Fill the font family list of the TDEFontChooser * * @param list The font list. */ @@ -302,9 +302,9 @@ private: TQCheckBox *styleCheckbox; TQCheckBox *sizeCheckbox; TQLabel *sizeLabel; - KListBox *familyListBox; - KListBox *styleListBox; - KListBox *sizeListBox; + TDEListBox *familyListBox; + TDEListBox *styleListBox; + TDEListBox *sizeListBox; TQComboBox *charsetsCombo; // BIC: remove in KDE4 TQCheckBox *sizeIsRelativeCheckBox; @@ -320,17 +320,17 @@ private: protected: virtual void virtual_hook( int id, void* data ); private: - class KFontChooser_localPrivate; - KFontChooser_localPrivate *d; + class TDEFontChooser_localPrivate; + TDEFontChooser_localPrivate *d; }; /** * @short A font selection dialog. * - * The KFontDialog_local provides a dialog for interactive font selection. - * It is basically a thin wrapper around the KFontChooser_local widget, + * The TDEFontDialog_local provides a dialog for interactive font selection. + * It is basically a thin wrapper around the TDEFontChooser_local widget, * which can also be used standalone. In most cases, the simplest - * use of this class is the static method KFontDialog_local::getFont(), + * use of this class is the static method TDEFontDialog_local::getFont(), * which pops up the dialog, allows the user to select a font, and * returns when the dialog is closed. * @@ -338,8 +338,8 @@ private: * * \code * TQFont myFont; - * int result = KFontDialog_local::getFont( myFont ); - * if ( result == KFontDialog_local::Accepted ) + * int result = TDEFontDialog_local::getFont( myFont ); + * if ( result == TDEFontDialog_local::Accepted ) * ... * \endcode * @@ -348,7 +348,7 @@ private: * @author Preston Brown , Bernd Wuebben * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ -class KOTEXT_EXPORT KFontDialog_local : public KDialogBase { +class KOTEXT_EXPORT TDEFontDialog_local : public KDialogBase { Q_OBJECT @@ -375,7 +375,7 @@ public: * calling sizeIsRelative(). * */ - KFontDialog_local( TQWidget *parent = 0L, const char *name = 0, + TDEFontDialog_local( TQWidget *parent = 0L, const char *name = 0, bool onlyFixed = false, bool modal = false, const TQStringList &fontlist = TQStringList(), bool makeFrame = true, bool diff = false, @@ -447,11 +447,11 @@ public: * difference selection bitmask should be written. * Check the returned bitmask like: * \code - * if ( diffFlags & KFontChooser_local::FontDiffFamily ) + * if ( diffFlags & TDEFontChooser_local::FontDiffFamily ) * [...] - * if ( diffFlags & KFontChooser_local::FontDiffStyle ) + * if ( diffFlags & TDEFontChooser_local::FontDiffStyle ) * [...] - * if ( diffFlags & KFontChooser_local::FontDiffSize ) + * if ( diffFlags & TDEFontChooser_local::FontDiffSize ) * [...] * \endcode * @param onlyFixed if true, only select from fixed-width fonts. @@ -504,13 +504,13 @@ signals: void fontSelected( const TQFont &font ); protected: - KFontChooser_local *chooser; + TDEFontChooser_local *chooser; protected: virtual void virtual_hook( int id, void* data ); private: - class KFontDialog_localPrivate; - KFontDialog_localPrivate *d; + class TDEFontDialog_localPrivate; + TDEFontDialog_localPrivate *d; }; diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui index fa8b9ba4..d6d0a2f6 100644 --- a/lib/kotext/kofonttabbase.ui +++ b/lib/kotext/kofonttabbase.ui @@ -11,7 +11,7 @@ unnamed - + characterFont @@ -20,9 +20,9 @@ - KFontDialog_local.h + TDEFontDialog_local.h - KFontDialog_local.h + TDEFontDialog_local.h diff --git a/lib/kross/api/eventaction.cpp b/lib/kross/api/eventaction.cpp index 4210fb0e..7578eb30 100644 --- a/lib/kross/api/eventaction.cpp +++ b/lib/kross/api/eventaction.cpp @@ -25,7 +25,7 @@ using namespace Kross::Api; -EventAction::EventAction(const TQString& name, KAction* action) +EventAction::EventAction(const TQString& name, TDEAction* action) : Event(name.isEmpty() ? TQString(action->name()) : name) , m_action(action) { diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h index e20656df..602a697f 100644 --- a/lib/kross/api/eventaction.h +++ b/lib/kross/api/eventaction.h @@ -33,7 +33,7 @@ namespace Kross { namespace Api { class ScriptContainer; /** - * The EventAction class is used to wrap KAction instances + * The EventAction class is used to wrap TDEAction instances * into the Kross object hierachy and provide access to * them. */ @@ -50,7 +50,7 @@ namespace Kross { namespace Api { /** * Constructor. */ - EventAction(const TQString& name, KAction* action); + EventAction(const TQString& name, TDEAction* action); /** * Destructor. @@ -64,7 +64,7 @@ namespace Kross { namespace Api { //virtual Object::Ptr call(const TQString& name, TDESharedPtr arguments); private: - KAction* m_action; + TDEAction* m_action; /// \return the text associated with this action. Kross::Api::Object::Ptr getText(Kross::Api::List::Ptr); diff --git a/lib/kross/main/mainmodule.cpp b/lib/kross/main/mainmodule.cpp index 8c29180f..bd5a9aab 100644 --- a/lib/kross/main/mainmodule.cpp +++ b/lib/kross/main/mainmodule.cpp @@ -105,11 +105,11 @@ QtObject::Ptr MainModule::addTQObject(TQObject* object, const TQString& name) return qtobject; } -EventAction::Ptr MainModule::addKAction(KAction* action, const TQString& name) +EventAction::Ptr MainModule::addTDEAction(TDEAction* action, const TQString& name) { EventAction* event = new EventAction(name, action); if(! addChild(name, event)) { - krosswarning( TQString("Failed to add KAction name='%1'").arg(action->name()) ); + krosswarning( TQString("Failed to add TDEAction name='%1'").arg(action->name()) ); return 0; } return event; diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h index 96abd06d..06a4836d 100644 --- a/lib/kross/main/mainmodule.h +++ b/lib/kross/main/mainmodule.h @@ -151,19 +151,19 @@ namespace Kross { namespace Api { QtObject::Ptr addTQObject(TQObject* object, const TQString& name = TQString()); /** - * Add a \a KAction to the eventcollection. The - * KAction will be wrapped by a \a EventAction + * Add a \a TDEAction to the eventcollection. The + * TDEAction will be wrapped by a \a EventAction * and will be added to this collection. * * \param name name to identify the \a action by - * \param action the KAction instance that should + * \param action the TDEAction instance that should * be added to this \a MainModule * \return the newly added \a EventAction instance * which is now a child of this \a MainModule * * \todo check \a name dox. */ - EventAction::Ptr addKAction(KAction* action, const TQString& name = TQString()); + EventAction::Ptr addTDEAction(TDEAction* action, const TQString& name = TQString()); //typedef TQValueList EventList; //EventList getEvents(); diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp index f7e11618..2e775fcb 100644 --- a/lib/kross/main/scriptaction.cpp +++ b/lib/kross/main/scriptaction.cpp @@ -83,7 +83,7 @@ namespace Kross { namespace Api { }} ScriptAction::ScriptAction(const TQString& file) - : KAction(0, file.latin1()) + : TDEAction(0, file.latin1()) , Kross::Api::ScriptContainer(file) , d( new ScriptActionPrivate() ) // initialize d-pointer class { @@ -102,7 +102,7 @@ ScriptAction::ScriptAction(const TQString& file) } ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& element) - : KAction() + : TDEAction() , Kross::Api::ScriptContainer() , d( new ScriptActionPrivate() ) // initialize d-pointer class { @@ -158,10 +158,10 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& ScriptContainer::setName(file); } - KAction::setName(name.latin1()); - KAction::setText(text); + TDEAction::setName(name.latin1()); + TDEAction::setText(text); setDescription(description); - KAction::setIcon(icon); + TDEAction::setIcon(icon); // connect signal connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activate())); diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h index 3d6e890b..4d60d4dc 100644 --- a/lib/kross/main/scriptaction.h +++ b/lib/kross/main/scriptaction.h @@ -33,11 +33,11 @@ namespace Kross { namespace Api { class ScriptActionPrivate; /** - * A ScriptAction extends a KAction by providing a wrapper around + * A ScriptAction extends a TDEAction by providing a wrapper around * a \a ScriptContainer to execute scripting code on activation. */ class ScriptAction - : public KAction + : public TDEAction , public Kross::Api::ScriptContainer { Q_OBJECT @@ -206,10 +206,10 @@ namespace Kross { namespace Api { TQMap m_actions; /** - * A KActionMenu which could be used to display the + * A TDEActionMenu which could be used to display the * content of this \a ScriptActionCollection instance. */ - KActionMenu* m_actionmenu; + TDEActionMenu* m_actionmenu; /** * Boolean value used to represent the modified-state. Will @@ -234,12 +234,12 @@ namespace Kross { namespace Api { * Constructor. * * \param text The text used to display some describing caption. - * \param ac The KActionCollection which should be used to as - * initial content for the KActionMenu \a m_actionmenu . + * \param ac The TDEActionCollection which should be used to as + * initial content for the TDEActionMenu \a m_actionmenu . * \param name The internal name. */ - ScriptActionCollection(const TQString& text, KActionCollection* ac, const char* name) - : m_actionmenu( new KActionMenu(text, ac, name) ) + ScriptActionCollection(const TQString& text, TDEActionCollection* ac, const char* name) + : m_actionmenu( new TDEActionMenu(text, ac, name) ) , m_dirty(true) {} @@ -263,9 +263,9 @@ namespace Kross { namespace Api { TQValueList actions() { return m_list; } /** - * \return the KActionMenu \a m_actionmenu . + * \return the TDEActionMenu \a m_actionmenu . */ - KActionMenu* actionMenu() { return m_actionmenu; } + TDEActionMenu* actionMenu() { return m_actionmenu; } /** * Attach a \a ScriptAction instance to this \a ScriptActionCollection . diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index eaf31101..9dd304ae 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -76,10 +76,10 @@ ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent) setInstance( ScriptGUIClient::instance() ); // action to execute a scriptfile. - new KAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); // acion to show the ScriptManagerGUI dialog. - new KAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); // The predefined ScriptActionCollection's this ScriptGUIClient provides. d->collections.replace("installedscripts", diff --git a/lib/kross/main/scriptguiclient.h b/lib/kross/main/scriptguiclient.h index c8ebf912..01a9b22e 100644 --- a/lib/kross/main/scriptguiclient.h +++ b/lib/kross/main/scriptguiclient.h @@ -50,8 +50,8 @@ namespace Kross { namespace Api { public: - /// List of KAction instances. - typedef TQPtrList List; + /// List of TDEAction instances. + typedef TQPtrList List; /** * Constructor. diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index c63b7603..de653fbd 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -87,7 +87,7 @@ class ListItem : public TQListViewItem class ToolTip : public TQToolTip { public: - ToolTip(KListView* parent) : TQToolTip(parent->viewport()), m_parent(parent) {} + ToolTip(TDEListView* parent) : TQToolTip(parent->viewport()), m_parent(parent) {} virtual ~ToolTip () { remove(m_parent->viewport()); } protected: virtual void maybeTip(const TQPoint& p) { @@ -100,7 +100,7 @@ class ToolTip : public TQToolTip } } private: - KListView* m_parent; + TDEListView* m_parent; }; class WdgScriptsManagerPrivate @@ -152,7 +152,7 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); #endif /* - toolBar->setIconText( KToolBar::IconTextRight ); + toolBar->setIconText( TDEToolBar::IconTextRight ); toolBar->insertButton("exec", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute")); toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 1140e848..116b1ca3 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -36,7 +36,7 @@ 0 - + scriptsList @@ -49,7 +49,7 @@ - + toolBar @@ -212,7 +212,7 @@ - KToolBar + TDEToolBar

      ktoolbar.h
      20 diff --git a/lib/kross/test/testaction.cpp b/lib/kross/test/testaction.cpp index 481de0cf..42963904 100644 --- a/lib/kross/test/testaction.cpp +++ b/lib/kross/test/testaction.cpp @@ -22,15 +22,15 @@ TestAction::TestAction(Kross::Api::ScriptContainer::Ptr scriptcontainer) : TQWidget() { - m_actioncollection = new KActionCollection(this, this); + m_actioncollection = new TDEActionCollection(this, this); - m_action1 = new KAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); + m_action1 = new TDEAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); m_actionlist.append(m_action1); - scriptcontainer->addKAction(m_action1); + scriptcontainer->addTDEAction(m_action1); - m_action2 = new KAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); + m_action2 = new TDEAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); m_actionlist.append(m_action2); - scriptcontainer->addKAction(m_action2); + scriptcontainer->addTDEAction(m_action2); } TestAction::~TestAction() diff --git a/lib/kross/test/testaction.h b/lib/kross/test/testaction.h index 7f4dd79c..32e6cdcd 100644 --- a/lib/kross/test/testaction.h +++ b/lib/kross/test/testaction.h @@ -42,10 +42,10 @@ class TestAction : public TQWidget void activatedAction2(); private: - KAction* m_action1; - KAction* m_action2; - KActionCollection* m_actioncollection; - KActionPtrList m_actionlist; + TDEAction* m_action1; + TDEAction* m_action2; + TDEActionCollection* m_actioncollection; + TDEActionPtrList m_actionlist; }; #endif diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index ec0090b6..f83d7ace 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -35,7 +35,7 @@ #include TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptcode) - : KMainWindow() + : TDEMainWindow() , m_interpretername(interpretername) , m_scriptcode(scriptcode) { @@ -43,7 +43,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco manager->addModule( new TestPluginModule("krosstestpluginmodule") ); m_scriptcontainer = manager->getScriptContainer("test"); - KPopupMenu *menuFile = new KPopupMenu( this ); + TDEPopupMenu *menuFile = new TDEPopupMenu( this ); menuBar()->insertItem( "&File", menuFile ); m_scriptextension = new Kross::Api::ScriptGUIClient(this, this); @@ -58,15 +58,15 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco //menuFile->insertSeparator(); - KAction* execaction = m_scriptextension->action("executescriptfile"); + TDEAction* execaction = m_scriptextension->action("executescriptfile"); if(execaction) execaction->plug(menuFile); - KAction* configaction = m_scriptextension->action("configurescripts"); + TDEAction* configaction = m_scriptextension->action("configurescripts"); if(configaction) configaction->plug(menuFile); - KAction* scriptsaction = m_scriptextension->action("installedscripts"); + TDEAction* scriptsaction = m_scriptextension->action("installedscripts"); if(scriptsaction) scriptsaction->plug(menuFile); - //menuFile->insertItem( ( (KActionMenu*)m_scriptextension->action("scripts") )->popupMenu() ); + //menuFile->insertItem( ( (TDEActionMenu*)m_scriptextension->action("scripts") )->popupMenu() ); TQVBox* mainbox = new TQVBox(this); diff --git a/lib/kross/test/testwindow.h b/lib/kross/test/testwindow.h index 9a10104c..c3da5cc5 100644 --- a/lib/kross/test/testwindow.h +++ b/lib/kross/test/testwindow.h @@ -33,7 +33,7 @@ class TQComboBox; class KTextEdit; -class TestWindow : public KMainWindow +class TestWindow : public TDEMainWindow { Q_OBJECT diff --git a/plugins/scan/scan.cpp b/plugins/scan/scan.cpp index 5478744b..b8fd6c60 100644 --- a/plugins/scan/scan.cpp +++ b/plugins/scan/scan.cpp @@ -38,7 +38,7 @@ Scan::Scan(TQObject *parent, const char *name, const TQStringList &) { setInstance(ScanFactory::instance()); - (void) new KAction(i18n("&Scan Image..."), SmallIcon("scanner"), 0, this, TQT_SLOT(slotScan()), actionCollection(), "scan_image"); + (void) new TDEAction(i18n("&Scan Image..."), SmallIcon("scanner"), 0, this, TQT_SLOT(slotScan()), actionCollection(), "scan_image"); } Scan::~Scan()