diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 15:02:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 15:02:43 -0600 |
| commit | aea627236e4de24599c3e30617cf264c3c1b7d40 (patch) | |
| tree | 467e13ca5a7eb0ab292259289ecc3572f53c5eae /chalk | |
| parent | 786304c6211f35ddc4cdd54b7aa7985fef4a2e70 (diff) | |
| download | koffice-aea627236e4de24599c3e30617cf264c3c1b7d40.tar.gz koffice-aea627236e4de24599c3e30617cf264c3c1b7d40.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'chalk')
123 files changed, 652 insertions, 652 deletions
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<KisView*>(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. <UML:Parameter visibility="private" xmi.id="2168" value="" type="const QCursor &" name="cursor" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="2169" type="virtual void" isAbstract="true" name="setup" > - <UML:Parameter visibility="private" xmi.id="2170" value="" type="KActionCollection *" name="collection" /> + <UML:Parameter visibility="private" xmi.id="2170" value="" type="TDEActionCollection *" name="collection" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="2171" type="virtual void" isAbstract="true" name="tabletEvent" > <UML:Parameter visibility="private" xmi.id="2172" value="" type="QTabletEvent *" name="e" /> @@ -2786,7 +2786,7 @@ in the constructor, you have to call loadAsync. <UML:Parameter visibility="private" xmi.id="2197" value="" type="const KisToolFactory &" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="2198" type="void" name="create" > - <UML:Parameter visibility="private" xmi.id="2199" value="" type="KActionCollection *" name="actionCollection" /> + <UML:Parameter visibility="private" xmi.id="2199" value="" type="TDEActionCollection *" name="actionCollection" /> <UML:Parameter visibility="private" xmi.id="2200" value="" type="KisCanvasSubject *" name="subject" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="2201" type="KisToolFactory *" name="singleton" ownerScope="classifier" /> @@ -3149,60 +3149,60 @@ in the constructor, you have to call loadAsync. <UML:Attribute visibility="private" xmi.id="2374" value="" type="mutable KisImageSP" name="m_current" /> <UML:Attribute visibility="private" xmi.id="2375" value="" type="KisGuideSP" name="m_currentGuide" /> <UML:Attribute visibility="private" xmi.id="2376" value="" type="DCOPObject *" name="m_dcop" /> - <UML:Attribute visibility="private" xmi.id="2377" value="" type="KToggleAction *" name="m_dlgBrushToggle" /> - <UML:Attribute visibility="private" xmi.id="2378" value="" type="KToggleAction *" name="m_dlgChannelsToggle" /> - <UML:Attribute visibility="private" xmi.id="2379" value="" type="KToggleAction *" name="m_dlgColorsToggle" /> - <UML:Attribute visibility="private" xmi.id="2380" value="" type="KToggleAction *" name="m_dlgLayersToggle" /> - <UML:Attribute visibility="private" xmi.id="2381" value="" type="KToggleAction *" name="m_dlgPatternToggle" /> + <UML:Attribute visibility="private" xmi.id="2377" value="" type="TDEToggleAction *" name="m_dlgBrushToggle" /> + <UML:Attribute visibility="private" xmi.id="2378" value="" type="TDEToggleAction *" name="m_dlgChannelsToggle" /> + <UML:Attribute visibility="private" xmi.id="2379" value="" type="TDEToggleAction *" name="m_dlgColorsToggle" /> + <UML:Attribute visibility="private" xmi.id="2380" value="" type="TDEToggleAction *" name="m_dlgLayersToggle" /> + <UML:Attribute visibility="private" xmi.id="2381" value="" type="TDEToggleAction *" name="m_dlgPatternToggle" /> <UML:Attribute visibility="private" xmi.id="2383" value="" type="KoColor" name="m_fg" /> - <UML:Attribute visibility="private" xmi.id="2384" value="" type="KToggleAction *" name="m_floatsidebarToggle" /> + <UML:Attribute visibility="private" xmi.id="2384" value="" type="TDEToggleAction *" name="m_floatsidebarToggle" /> <UML:Attribute visibility="private" xmi.id="2386" value="" type="QWidget *" name="m_gradientChooser" /> <UML:Attribute visibility="private" xmi.id="2387" value="" type="KisRuler *" name="m_hRuler" /> <UML:Attribute visibility="private" xmi.id="2388" value="" type="QScrollBar *" name="m_hScroll" /> <UML:Attribute visibility="private" xmi.id="2389" value="" type="QWidget *" name="m_imageChooser" /> - <UML:Attribute visibility="private" xmi.id="2391" value="" type="KAction *" name="m_imgDup" /> - <UML:Attribute visibility="private" xmi.id="2392" value="" type="KAction *" name="m_imgExport" /> - <UML:Attribute visibility="private" xmi.id="2393" value="" type="KAction *" name="m_imgImport" /> - <UML:Attribute visibility="private" xmi.id="2394" value="" type="KAction *" name="m_imgMergeAll" /> - <UML:Attribute visibility="private" xmi.id="2395" value="" type="KAction *" name="m_imgMergeLinked" /> - <UML:Attribute visibility="private" xmi.id="2396" value="" type="KAction *" name="m_imgMergeVisible" /> - <UML:Attribute visibility="private" xmi.id="2397" value="" type="KAction *" name="m_imgResize" /> - <UML:Attribute visibility="private" xmi.id="2398" value="" type="KAction *" name="m_imgResizeToLayer" /> - <UML:Attribute visibility="private" xmi.id="2399" value="" type="KAction *" name="m_imgRm" /> - <UML:Attribute visibility="private" xmi.id="2400" value="" type="KAction *" name="m_imgScan" /> + <UML:Attribute visibility="private" xmi.id="2391" value="" type="TDEAction *" name="m_imgDup" /> + <UML:Attribute visibility="private" xmi.id="2392" value="" type="TDEAction *" name="m_imgExport" /> + <UML:Attribute visibility="private" xmi.id="2393" value="" type="TDEAction *" name="m_imgImport" /> + <UML:Attribute visibility="private" xmi.id="2394" value="" type="TDEAction *" name="m_imgMergeAll" /> + <UML:Attribute visibility="private" xmi.id="2395" value="" type="TDEAction *" name="m_imgMergeLinked" /> + <UML:Attribute visibility="private" xmi.id="2396" value="" type="TDEAction *" name="m_imgMergeVisible" /> + <UML:Attribute visibility="private" xmi.id="2397" value="" type="TDEAction *" name="m_imgResize" /> + <UML:Attribute visibility="private" xmi.id="2398" value="" type="TDEAction *" name="m_imgResizeToLayer" /> + <UML:Attribute visibility="private" xmi.id="2399" value="" type="TDEAction *" name="m_imgRm" /> + <UML:Attribute visibility="private" xmi.id="2400" value="" type="TDEAction *" name="m_imgScan" /> <UML:Attribute visibility="private" xmi.id="2401" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_lastGuidePoint" /> - <UML:Attribute visibility="private" xmi.id="2402" value="" type="KAction *" name="m_layerAdd" /> - <UML:Attribute visibility="private" xmi.id="2403" value="" type="KAction *" name="m_layerBottom" /> + <UML:Attribute visibility="private" xmi.id="2402" value="" type="TDEAction *" name="m_layerAdd" /> + <UML:Attribute visibility="private" xmi.id="2403" value="" type="TDEAction *" name="m_layerBottom" /> <UML:Attribute visibility="private" xmi.id="2404" value="" type="KisListBox *" name="m_layerBox" /> - <UML:Attribute visibility="private" xmi.id="2405" value="" type="KAction *" name="m_layerDup" /> - <UML:Attribute visibility="private" xmi.id="2406" value="" type="KAction *" name="m_layerHide" /> - <UML:Attribute visibility="private" xmi.id="2407" value="" type="KAction *" name="m_layerLink" /> - <UML:Attribute visibility="private" xmi.id="2408" value="" type="KAction *" name="m_layerLower" /> - <UML:Attribute visibility="private" xmi.id="2409" value="" type="KAction *" name="m_layerProperties" /> - <UML:Attribute visibility="private" xmi.id="2410" value="" type="KAction *" name="m_layerRaise" /> - <UML:Attribute visibility="private" xmi.id="2411" value="" type="KAction *" name="m_layerResize" /> - <UML:Attribute visibility="private" xmi.id="2412" value="" type="KAction *" name="m_layerResizeToImage" /> - <UML:Attribute visibility="private" xmi.id="2413" value="" type="KAction *" name="m_layerRm" /> - <UML:Attribute visibility="private" xmi.id="2414" value="" type="KAction *" name="m_layerSaveAs" /> - <UML:Attribute visibility="private" xmi.id="2415" value="" type="KAction *" name="m_layerScale" /> - <UML:Attribute visibility="private" xmi.id="2416" value="" type="KAction *" name="m_layerToImage" /> - <UML:Attribute visibility="private" xmi.id="2417" value="" type="KAction *" name="m_layerTop" /> - <UML:Attribute visibility="private" xmi.id="2418" value="" type="KToggleAction *" name="m_lsidebarToggle" /> + <UML:Attribute visibility="private" xmi.id="2405" value="" type="TDEAction *" name="m_layerDup" /> + <UML:Attribute visibility="private" xmi.id="2406" value="" type="TDEAction *" name="m_layerHide" /> + <UML:Attribute visibility="private" xmi.id="2407" value="" type="TDEAction *" name="m_layerLink" /> + <UML:Attribute visibility="private" xmi.id="2408" value="" type="TDEAction *" name="m_layerLower" /> + <UML:Attribute visibility="private" xmi.id="2409" value="" type="TDEAction *" name="m_layerProperties" /> + <UML:Attribute visibility="private" xmi.id="2410" value="" type="TDEAction *" name="m_layerRaise" /> + <UML:Attribute visibility="private" xmi.id="2411" value="" type="TDEAction *" name="m_layerResize" /> + <UML:Attribute visibility="private" xmi.id="2412" value="" type="TDEAction *" name="m_layerResizeToImage" /> + <UML:Attribute visibility="private" xmi.id="2413" value="" type="TDEAction *" name="m_layerRm" /> + <UML:Attribute visibility="private" xmi.id="2414" value="" type="TDEAction *" name="m_layerSaveAs" /> + <UML:Attribute visibility="private" xmi.id="2415" value="" type="TDEAction *" name="m_layerScale" /> + <UML:Attribute visibility="private" xmi.id="2416" value="" type="TDEAction *" name="m_layerToImage" /> + <UML:Attribute visibility="private" xmi.id="2417" value="" type="TDEAction *" name="m_layerTop" /> + <UML:Attribute visibility="private" xmi.id="2418" value="" type="TDEToggleAction *" name="m_lsidebarToggle" /> <UML:Attribute visibility="private" xmi.id="2419" value="" type="vKisCanvasObserver" name="m_observers" /> <UML:Attribute visibility="private" xmi.id="2420" value="" type="QWidget *" name="m_paletteChooser" /> <UML:Attribute visibility="private" xmi.id="2421" value="" type="QWidget *" name="m_pathView" /> - <UML:Attribute visibility="private" xmi.id="2424" value="" type="KAction *" name="m_selectionCopy" /> - <UML:Attribute visibility="private" xmi.id="2425" value="" type="KAction *" name="m_selectionCrop" /> - <UML:Attribute visibility="private" xmi.id="2426" value="" type="KAction *" name="m_selectionCut" /> - <UML:Attribute visibility="private" xmi.id="2427" value="" type="KAction *" name="m_selectionFillBg" /> - <UML:Attribute visibility="private" xmi.id="2428" value="" type="KAction *" name="m_selectionFillFg" /> - <UML:Attribute visibility="private" xmi.id="2429" value="" type="KAction *" name="m_selectionPaste" /> - <UML:Attribute visibility="private" xmi.id="2430" value="" type="KAction *" name="m_selectionPasteInto" /> - <UML:Attribute visibility="private" xmi.id="2431" value="" type="KAction *" name="m_selectionRm" /> - <UML:Attribute visibility="private" xmi.id="2432" value="" type="KAction *" name="m_selectionSelectAll" /> - <UML:Attribute visibility="private" xmi.id="2433" value="" type="KAction *" name="m_selectionSelectNone" /> + <UML:Attribute visibility="private" xmi.id="2424" value="" type="TDEAction *" name="m_selectionCopy" /> + <UML:Attribute visibility="private" xmi.id="2425" value="" type="TDEAction *" name="m_selectionCrop" /> + <UML:Attribute visibility="private" xmi.id="2426" value="" type="TDEAction *" name="m_selectionCut" /> + <UML:Attribute visibility="private" xmi.id="2427" value="" type="TDEAction *" name="m_selectionFillBg" /> + <UML:Attribute visibility="private" xmi.id="2428" value="" type="TDEAction *" name="m_selectionFillFg" /> + <UML:Attribute visibility="private" xmi.id="2429" value="" type="TDEAction *" name="m_selectionPaste" /> + <UML:Attribute visibility="private" xmi.id="2430" value="" type="TDEAction *" name="m_selectionPasteInto" /> + <UML:Attribute visibility="private" xmi.id="2431" value="" type="TDEAction *" name="m_selectionRm" /> + <UML:Attribute visibility="private" xmi.id="2432" value="" type="TDEAction *" name="m_selectionSelectAll" /> + <UML:Attribute visibility="private" xmi.id="2433" value="" type="TDEAction *" name="m_selectionSelectNone" /> <UML:Attribute visibility="private" xmi.id="2434" value="" type="KisSideBar *" name="m_sideBar" /> - <UML:Attribute visibility="private" xmi.id="2435" value="" type="KToggleAction *" name="m_sidebarToggle" /> + <UML:Attribute visibility="private" xmi.id="2435" value="" type="TDEToggleAction *" name="m_sidebarToggle" /> <UML:Attribute visibility="private" xmi.id="2436" value="" type="KoTabBar *" name="m_tabBar" /> <UML:Attribute visibility="private" xmi.id="2437" value="" type="QButton *" name="m_tabFirst" /> <UML:Attribute visibility="private" xmi.id="2438" value="" type="QButton *" name="m_tabLast" /> @@ -3212,8 +3212,8 @@ in the constructor, you have to call loadAsync. <UML:Attribute visibility="private" xmi.id="2443" value="" type="QScrollBar *" name="m_vScroll" /> <UML:Attribute visibility="private" xmi.id="2444" value="" type="TQ_INT32" name="m_xoff" /> <UML:Attribute visibility="private" xmi.id="2445" value="" type="TQ_INT32" name="m_yoff" /> - <UML:Attribute visibility="private" xmi.id="2446" value="" type="KAction *" name="m_zoomIn" /> - <UML:Attribute visibility="private" xmi.id="2447" value="" type="KAction *" name="m_zoomOut" /> + <UML:Attribute visibility="private" xmi.id="2446" value="" type="TDEAction *" name="m_zoomIn" /> + <UML:Attribute visibility="private" xmi.id="2447" value="" type="TDEAction *" name="m_zoomOut" /> </UML:Class> <UML:DataType stereotype="datatype" visibility="public" xmi.id="2570" name="vKisCanvasObserver_it" /> <UML:DataType stereotype="datatype" visibility="public" xmi.id="2571" name="vKisCanvasObserver" /> @@ -53537,27 +53537,27 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgBrushToggle;" > + <ccfdeclarationcodeblock parent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgBrushToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgChannelsToggle;" > + <ccfdeclarationcodeblock parent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgChannelsToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgColorsToggle;" > + <ccfdeclarationcodeblock parent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgColorsToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgLayersToggle;" > + <ccfdeclarationcodeblock parent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgLayersToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgPatternToggle;" > + <ccfdeclarationcodeblock parent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgPatternToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -53567,7 +53567,7 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_floatsidebarToggle;" > + <ccfdeclarationcodeblock parent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_floatsidebarToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -53592,52 +53592,52 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgDup;" > + <ccfdeclarationcodeblock parent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgDup;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgExport;" > + <ccfdeclarationcodeblock parent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgExport;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgImport;" > + <ccfdeclarationcodeblock parent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgImport;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeAll;" > + <ccfdeclarationcodeblock parent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgMergeAll;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeLinked;" > + <ccfdeclarationcodeblock parent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgMergeLinked;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeVisible;" > + <ccfdeclarationcodeblock parent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgMergeVisible;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResize;" > + <ccfdeclarationcodeblock parent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgResize;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResizeToLayer;" > + <ccfdeclarationcodeblock parent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgResizeToLayer;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgRm;" > + <ccfdeclarationcodeblock parent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgRm;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgScan;" > + <ccfdeclarationcodeblock parent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgScan;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -53647,12 +53647,12 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerAdd;" > + <ccfdeclarationcodeblock parent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerAdd;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerBottom;" > + <ccfdeclarationcodeblock parent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerBottom;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -53662,72 +53662,72 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerDup;" > + <ccfdeclarationcodeblock parent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerDup;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerHide;" > + <ccfdeclarationcodeblock parent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerHide;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLink;" > + <ccfdeclarationcodeblock parent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerLink;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLower;" > + <ccfdeclarationcodeblock parent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerLower;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerProperties;" > + <ccfdeclarationcodeblock parent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerProperties;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRaise;" > + <ccfdeclarationcodeblock parent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerRaise;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResize;" > + <ccfdeclarationcodeblock parent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerResize;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResizeToImage;" > + <ccfdeclarationcodeblock parent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerResizeToImage;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRm;" > + <ccfdeclarationcodeblock parent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerRm;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerSaveAs;" > + <ccfdeclarationcodeblock parent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerSaveAs;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerScale;" > + <ccfdeclarationcodeblock parent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerScale;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerToImage;" > + <ccfdeclarationcodeblock parent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerToImage;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerTop;" > + <ccfdeclarationcodeblock parent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerTop;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_lsidebarToggle;" > + <ccfdeclarationcodeblock parent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_lsidebarToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -53747,52 +53747,52 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCopy;" > + <ccfdeclarationcodeblock parent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionCopy;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCrop;" > + <ccfdeclarationcodeblock parent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionCrop;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCut;" > + <ccfdeclarationcodeblock parent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionCut;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillBg;" > + <ccfdeclarationcodeblock parent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionFillBg;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillFg;" > + <ccfdeclarationcodeblock parent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionFillFg;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPaste;" > + <ccfdeclarationcodeblock parent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionPaste;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPasteInto;" > + <ccfdeclarationcodeblock parent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionPasteInto;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionRm;" > + <ccfdeclarationcodeblock parent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionRm;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectAll;" > + <ccfdeclarationcodeblock parent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionSelectAll;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectNone;" > + <ccfdeclarationcodeblock parent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionSelectNone;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -53802,7 +53802,7 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_sidebarToggle;" > + <ccfdeclarationcodeblock parent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_sidebarToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -53852,12 +53852,12 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomIn;" > + <ccfdeclarationcodeblock parent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_zoomIn;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomOut;" > + <ccfdeclarationcodeblock parent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_zoomOut;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -54813,7 +54813,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgBrushToggle;" > + <ccfdeclarationcodeblock parent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgBrushToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -54833,7 +54833,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgChannelsToggle;" > + <ccfdeclarationcodeblock parent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgChannelsToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -54853,7 +54853,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgColorsToggle;" > + <ccfdeclarationcodeblock parent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgColorsToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -54873,7 +54873,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgLayersToggle;" > + <ccfdeclarationcodeblock parent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgLayersToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -54893,7 +54893,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgPatternToggle;" > + <ccfdeclarationcodeblock parent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_dlgPatternToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -54933,7 +54933,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_floatsidebarToggle;" > + <ccfdeclarationcodeblock parent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_floatsidebarToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55033,7 +55033,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgDup;" > + <ccfdeclarationcodeblock parent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgDup;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55053,7 +55053,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgExport;" > + <ccfdeclarationcodeblock parent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgExport;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55073,7 +55073,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgImport;" > + <ccfdeclarationcodeblock parent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgImport;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55093,7 +55093,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeAll;" > + <ccfdeclarationcodeblock parent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgMergeAll;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55113,7 +55113,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeLinked;" > + <ccfdeclarationcodeblock parent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgMergeLinked;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55133,7 +55133,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeVisible;" > + <ccfdeclarationcodeblock parent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgMergeVisible;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55153,7 +55153,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResize;" > + <ccfdeclarationcodeblock parent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgResize;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55173,7 +55173,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResizeToLayer;" > + <ccfdeclarationcodeblock parent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgResizeToLayer;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55193,7 +55193,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgRm;" > + <ccfdeclarationcodeblock parent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgRm;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55213,7 +55213,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgScan;" > + <ccfdeclarationcodeblock parent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_imgScan;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55253,7 +55253,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerAdd;" > + <ccfdeclarationcodeblock parent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerAdd;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55273,7 +55273,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerBottom;" > + <ccfdeclarationcodeblock parent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerBottom;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55313,7 +55313,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerDup;" > + <ccfdeclarationcodeblock parent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerDup;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55333,7 +55333,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerHide;" > + <ccfdeclarationcodeblock parent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerHide;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55353,7 +55353,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLink;" > + <ccfdeclarationcodeblock parent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerLink;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55373,7 +55373,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLower;" > + <ccfdeclarationcodeblock parent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerLower;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55393,7 +55393,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerProperties;" > + <ccfdeclarationcodeblock parent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerProperties;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55413,7 +55413,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRaise;" > + <ccfdeclarationcodeblock parent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerRaise;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55433,7 +55433,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResize;" > + <ccfdeclarationcodeblock parent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerResize;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55453,7 +55453,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResizeToImage;" > + <ccfdeclarationcodeblock parent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerResizeToImage;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55473,7 +55473,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRm;" > + <ccfdeclarationcodeblock parent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerRm;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55493,7 +55493,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerSaveAs;" > + <ccfdeclarationcodeblock parent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerSaveAs;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55513,7 +55513,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerScale;" > + <ccfdeclarationcodeblock parent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerScale;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55533,7 +55533,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerToImage;" > + <ccfdeclarationcodeblock parent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerToImage;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55553,7 +55553,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerTop;" > + <ccfdeclarationcodeblock parent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_layerTop;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55573,7 +55573,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_lsidebarToggle;" > + <ccfdeclarationcodeblock parent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_lsidebarToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55653,7 +55653,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCopy;" > + <ccfdeclarationcodeblock parent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionCopy;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55673,7 +55673,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCrop;" > + <ccfdeclarationcodeblock parent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionCrop;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55693,7 +55693,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCut;" > + <ccfdeclarationcodeblock parent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionCut;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55713,7 +55713,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillBg;" > + <ccfdeclarationcodeblock parent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionFillBg;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55733,7 +55733,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillFg;" > + <ccfdeclarationcodeblock parent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionFillFg;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55753,7 +55753,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPaste;" > + <ccfdeclarationcodeblock parent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionPaste;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55773,7 +55773,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPasteInto;" > + <ccfdeclarationcodeblock parent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionPasteInto;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55793,7 +55793,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionRm;" > + <ccfdeclarationcodeblock parent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionRm;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55813,7 +55813,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectAll;" > + <ccfdeclarationcodeblock parent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionSelectAll;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55833,7 +55833,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectNone;" > + <ccfdeclarationcodeblock parent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_selectionSelectNone;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -55873,7 +55873,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_sidebarToggle;" > + <ccfdeclarationcodeblock parent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" TDEToggleAction * m_sidebarToggle;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -56073,7 +56073,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomIn;" > + <ccfdeclarationcodeblock parent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_zoomIn;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -56093,7 +56093,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomOut;" > + <ccfdeclarationcodeblock parent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAction * m_zoomOut;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> 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 @@ <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1645" isRoot="false" isAbstract="false" name="KisTransformVisitor&" elementReference="1318" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1668" isRoot="false" isAbstract="false" name="const QColor" elementReference="591" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1699" isRoot="false" isAbstract="false" name="KisView*" elementReference="1675" /> - <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1701" isRoot="false" isAbstract="false" name="KActionCollection*" elementReference="1679" /> + <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1701" isRoot="false" isAbstract="false" name="TDEActionCollection*" elementReference="1679" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1709" isRoot="false" isAbstract="false" name="KisTool*" elementReference="418" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1717" isRoot="false" isAbstract="false" name="KisGenericRegistry< QWidget * >*" elementReference="631" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1719" isRoot="false" isAbstract="false" name="KisGenericRegistry< KisDockFrameDocker * >*" elementReference="631" /> @@ -132,7 +132,7 @@ <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1789" isRoot="false" isAbstract="false" name="KisPaletteWidget*" elementReference="1692" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1791" isRoot="false" isAbstract="false" name="KisResourceMediator*" elementReference="1693" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1803" isRoot="false" isAbstract="false" name="KisDoc*" elementReference="1796" /> - <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1809" isRoot="false" isAbstract="false" name="KAction*" elementReference="1674" /> + <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1809" isRoot="false" isAbstract="false" name="TDEAction*" elementReference="1674" /> <UML:DataType stereotype="3" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1837" isRoot="false" isAbstract="false" name="KisClipboard*" elementReference="1797" /> <UML:Interface stereotype="12" isSpecification="false" isLeaf="false" visibility="public" xmi.id="11" isRoot="false" isAbstract="true" name="KisCanvasControllerInterface" > <UML:Classifier.feature> @@ -289,7 +289,7 @@ XXX: Should this be the basis for simple scriptability? Have every controller re <UML:Parameter kind="return" xmi.id="5323" type="22" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation comment="Get the KActionCollection of the current view. This can be used to associate actions directly with the main view instead of relying on the KXMLGui based configuration mechanism." isSpecification="false" isLeaf="false" visibility="public" xmi.id="25" isRoot="false" isAbstract="false" name="getActionCollection" /> + <UML:Operation comment="Get the TDEActionCollection of the current view. This can be used to associate actions directly with the main view instead of relying on the KXMLGui based configuration mechanism." isSpecification="false" isLeaf="false" visibility="public" xmi.id="25" isRoot="false" isAbstract="false" name="getActionCollection" /> <UML:Operation comment="Get the canvas controller. The canvas controller enables zooming of the canvas and converting image coordinates to canvas and view coordinates." isSpecification="false" isLeaf="false" visibility="public" xmi.id="28" isRoot="false" isAbstract="false" name="getCanvasController" > <UML:BehavioralFeature.parameter> <UML:Parameter kind="return" xmi.id="5324" type="11" /> @@ -3169,12 +3169,12 @@ MITCHELL_FILTER <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1431" isRoot="false" isAbstract="false" name="KisHLineIteratorPixel" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1432" isRoot="false" isAbstract="false" name="KNamedCommand" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1618" isRoot="false" isAbstract="false" name="TQ_INT8" /> - <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1674" isRoot="false" isAbstract="false" name="KAction" /> + <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1674" isRoot="false" isAbstract="false" name="TDEAction" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1675" isRoot="false" isAbstract="false" name="KisView" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1676" isRoot="false" isAbstract="false" name="KisDockFrameDocker" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1677" isRoot="false" isAbstract="false" name="KoTabbedToolDock" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1678" isRoot="false" isAbstract="false" name="KoToolDockManager" /> - <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1679" isRoot="false" isAbstract="false" name="KActionCollection" /> + <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1679" isRoot="false" isAbstract="false" name="TDEActionCollection" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1680" isRoot="false" isAbstract="false" name="KisPaintBox" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1681" isRoot="false" isAbstract="false" name="KisLayerBox" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1682" isRoot="false" isAbstract="false" name="KisFilterBox" /> @@ -5249,7 +5249,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" writeOutText="false" /> </header> </codeblockwithcomments> - <codeblockwithcomments tag="imports" text="&#010;import KActionCollection;&#010;import KisCanvasControllerInterface;&#010;import KisSelectionControllerInterface;&#010;import KisLayerControllerInterface;&#010;import KisImageControllerInterface;&#010;import KisDockerControllerInterface;&#010;import KisPainterControllerInterface;&#010;import KisToolControllerInterface;" > + <codeblockwithcomments tag="imports" text="&#010;import TDEActionCollection;&#010;import KisCanvasControllerInterface;&#010;import KisSelectionControllerInterface;&#010;import KisLayerControllerInterface;&#010;import KisImageControllerInterface;&#010;import KisDockerControllerInterface;&#010;import KisPainterControllerInterface;&#010;import KisToolControllerInterface;" > <header> <codecomment tag="" writeOutText="false" /> </header> @@ -5313,7 +5313,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeoperation> <codeoperation parent_id="25" tag="operation_25" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Get the KActionCollection of the current view. This can be used to associate actions directly with the main view instead of relying on the KXMLGui based configuration mechanism." /> + <javacodedocumentation tag="" indentLevel="1" text="Get the TDEActionCollection of the current view. This can be used to associate actions directly with the main view instead of relying on the KXMLGui based configuration mechanism." /> </header> </codeoperation> <codeoperation parent_id="28" tag="operation_28" canDelete="false" indentLevel="1" > @@ -18831,97 +18831,97 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private KAction* m_copy;" > + <ccfdeclarationcodeblock parent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private TDEAction* m_copy;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private KAction* m_cut;" > + <ccfdeclarationcodeblock parent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private TDEAction* m_cut;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private KAction* m_paste;" > + <ccfdeclarationcodeblock parent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private TDEAction* m_paste;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private KAction* m_selectAll;" > + <ccfdeclarationcodeblock parent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private TDEAction* m_selectAll;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private KAction* m_deselect;" > + <ccfdeclarationcodeblock parent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private TDEAction* m_deselect;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private KAction* m_clear;" > + <ccfdeclarationcodeblock parent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private TDEAction* m_clear;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private KAction* m_reselect;" > + <ccfdeclarationcodeblock parent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private TDEAction* m_reselect;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private KAction* m_invert;" > + <ccfdeclarationcodeblock parent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private TDEAction* m_invert;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private KAction* m_toNewLayer;" > + <ccfdeclarationcodeblock parent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private TDEAction* m_toNewLayer;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private KAction* m_feather;" > + <ccfdeclarationcodeblock parent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private TDEAction* m_feather;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private KAction* m_border;" > + <ccfdeclarationcodeblock parent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private TDEAction* m_border;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private KAction* m_expand;" > + <ccfdeclarationcodeblock parent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private TDEAction* m_expand;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private KAction* m_smooth;" > + <ccfdeclarationcodeblock parent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private TDEAction* m_smooth;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private KAction* m_contract;" > + <ccfdeclarationcodeblock parent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private TDEAction* m_contract;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private KAction* m_grow;" > + <ccfdeclarationcodeblock parent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private TDEAction* m_grow;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private KAction* m_similar;" > + <ccfdeclarationcodeblock parent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private TDEAction* m_similar;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private KAction* m_transform;" > + <ccfdeclarationcodeblock parent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private TDEAction* m_transform;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private KAction* m_load;" > + <ccfdeclarationcodeblock parent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private TDEAction* m_load;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private KAction* m_save;" > + <ccfdeclarationcodeblock parent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private TDEAction* m_save;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19475,7 +19475,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private KAction* m_copy;" > + <ccfdeclarationcodeblock parent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private TDEAction* m_copy;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19495,7 +19495,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private KAction* m_cut;" > + <ccfdeclarationcodeblock parent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private TDEAction* m_cut;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19515,7 +19515,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private KAction* m_paste;" > + <ccfdeclarationcodeblock parent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private TDEAction* m_paste;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19535,7 +19535,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private KAction* m_selectAll;" > + <ccfdeclarationcodeblock parent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private TDEAction* m_selectAll;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19555,7 +19555,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private KAction* m_deselect;" > + <ccfdeclarationcodeblock parent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private TDEAction* m_deselect;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19575,7 +19575,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private KAction* m_clear;" > + <ccfdeclarationcodeblock parent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private TDEAction* m_clear;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19595,7 +19595,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private KAction* m_reselect;" > + <ccfdeclarationcodeblock parent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private TDEAction* m_reselect;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19615,7 +19615,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private KAction* m_invert;" > + <ccfdeclarationcodeblock parent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private TDEAction* m_invert;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19635,7 +19635,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private KAction* m_toNewLayer;" > + <ccfdeclarationcodeblock parent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private TDEAction* m_toNewLayer;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19655,7 +19655,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private KAction* m_feather;" > + <ccfdeclarationcodeblock parent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private TDEAction* m_feather;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19675,7 +19675,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private KAction* m_border;" > + <ccfdeclarationcodeblock parent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private TDEAction* m_border;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19695,7 +19695,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private KAction* m_expand;" > + <ccfdeclarationcodeblock parent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private TDEAction* m_expand;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19715,7 +19715,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private KAction* m_smooth;" > + <ccfdeclarationcodeblock parent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private TDEAction* m_smooth;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19735,7 +19735,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private KAction* m_contract;" > + <ccfdeclarationcodeblock parent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private TDEAction* m_contract;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19755,7 +19755,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private KAction* m_grow;" > + <ccfdeclarationcodeblock parent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private TDEAction* m_grow;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19775,7 +19775,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private KAction* m_similar;" > + <ccfdeclarationcodeblock parent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private TDEAction* m_similar;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19795,7 +19795,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private KAction* m_transform;" > + <ccfdeclarationcodeblock parent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private TDEAction* m_transform;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19815,7 +19815,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private KAction* m_load;" > + <ccfdeclarationcodeblock parent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private TDEAction* m_load;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -19835,7 +19835,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private KAction* m_save;" > + <ccfdeclarationcodeblock parent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private TDEAction* m_save;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -34576,7 +34576,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="1674" parent_class="1674" fileExt=".java" fileName="KAction" > + <classifiercodedocument writeOutCode="true" package="" id="1674" parent_class="1674" fileExt=".java" fileName="TDEAction" > <textblocks> <codeblockwithcomments tag="packages" writeOutText="false" > <header> @@ -34590,7 +34590,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeblockwithcomments> <javaclassdeclarationblock parent_id="1674" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class KAction&#010;" /> + <javacodedocumentation tag="" text="Class TDEAction&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -34609,7 +34609,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KAction ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEAction ( ) { }" > <header> <codecomment tag="" indentLevel="1" text="Empty Constructor" /> </header> @@ -34951,7 +34951,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="1679" parent_class="1679" fileExt=".java" fileName="KActionCollection" > + <classifiercodedocument writeOutCode="true" package="" id="1679" parent_class="1679" fileExt=".java" fileName="TDEActionCollection" > <textblocks> <codeblockwithcomments tag="packages" writeOutText="false" > <header> @@ -34965,7 +34965,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeblockwithcomments> <javaclassdeclarationblock parent_id="1679" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class KActionCollection&#010;" /> + <javacodedocumentation tag="" text="Class TDEActionCollection&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -34984,7 +34984,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KActionCollection ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEActionCollection ( ) { }" > <header> <codecomment tag="" indentLevel="1" text="Empty Constructor" /> </header> @@ -36123,7 +36123,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private KActionCollection* m_ac;" > + <ccfdeclarationcodeblock parent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private TDEActionCollection* m_ac;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -36922,7 +36922,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private KActionCollection* m_ac;" > + <ccfdeclarationcodeblock parent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private TDEActionCollection* m_ac;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -37595,7 +37595,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="1701" parent_class="1701" fileExt=".java" fileName="KActionCollection*" > + <classifiercodedocument writeOutCode="true" package="" id="1701" parent_class="1701" fileExt=".java" fileName="TDEActionCollection*" > <textblocks> <codeblockwithcomments tag="packages" writeOutText="false" > <header> @@ -37609,7 +37609,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeblockwithcomments> <javaclassdeclarationblock parent_id="1701" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class KActionCollection*&#010;" /> + <javacodedocumentation tag="" text="Class TDEActionCollection*&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -37628,7 +37628,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KActionCollection* ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEActionCollection* ( ) { }" > <header> <codecomment tag="" indentLevel="1" text="Empty Constructor" /> </header> @@ -39545,7 +39545,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="1809" parent_class="1809" fileExt=".java" fileName="KAction*" > + <classifiercodedocument writeOutCode="true" package="" id="1809" parent_class="1809" fileExt=".java" fileName="TDEAction*" > <textblocks> <codeblockwithcomments tag="packages" writeOutText="false" > <header> @@ -39559,7 +39559,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeblockwithcomments> <javaclassdeclarationblock parent_id="1809" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class KAction*&#010;" /> + <javacodedocumentation tag="" text="Class TDEAction*&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -39578,7 +39578,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KAction* ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEAction* ( ) { }" > <header> <codecomment tag="" indentLevel="1" text="Empty Constructor" /> </header> 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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&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<KisPoint> KisToolBezierSelect::convertCurve() return points; } -void KisToolBezierSelect::setup(KActionCollection *collection) +void KisToolBezierSelect::setup(TDEActionCollection *collection) { - m_action = static_cast<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Polygon"), + 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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Polyline"), + 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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(TQt::Key_Plus); - shortcut.append(KShortcut(TQt::Key_F9)); - m_action = new KRadioAction(i18n("&Star"), + 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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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<KisView*>(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 <tdeparts/plugin.h> 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<KisView*>(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<KisSeparateChannelsPlugin>::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 <koffice_export.h> -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<KAction> m_filterActions; + TQPtrList<TDEAction> 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<KActionMenu> m_filterActionMenus; + TQDict<TDEActionMenu> 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 <kpixmapio.h> #include <tqwidget.h> -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<int> 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 <tqscrollview.h> #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 <tqobject.h> -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 <koffice_export.h> -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<KAction> 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<TDEAction> 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<KRadioAction *>(collection->action(name())); + m_action = static_cast<TDERadioAction *>(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 <koffice_export.h> -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. <p>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 <KoRect.h> 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<LayerProperty> 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 T> 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 @@ </widget> </hbox> </widget> - <widget class="KToolBar"> + <widget class="TDEToolBar"> <property name="name"> <cstring>toolbar</cstring> </property> @@ -266,7 +266,7 @@ </widget> <customwidgets> <customwidget> - <class>KToolBar</class> + <class>TDEToolBar</class> <header location="local">ktoolbar.h</header> <sizehint> <width>20</width> |