From 9771f17f8cc5252b12ec5f3edf47ff9bffdf997f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:16:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kimagemapeditor/arealistview.cpp | 2 +- kimagemapeditor/arealistview.h | 4 +- kimagemapeditor/imageslistview.cpp | 2 +- kimagemapeditor/imageslistview.h | 2 +- kimagemapeditor/kimagemapeditor.cpp | 84 +++++++++++++------------- kimagemapeditor/kimagemapeditor.h | 116 ++++++++++++++++++------------------ kimagemapeditor/mapslistview.cpp | 2 +- kimagemapeditor/mapslistview.h | 6 +- 8 files changed, 109 insertions(+), 109 deletions(-) (limited to 'kimagemapeditor') diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp index 203a741f..3739114a 100644 --- a/kimagemapeditor/arealistview.cpp +++ b/kimagemapeditor/arealistview.cpp @@ -34,7 +34,7 @@ AreaListView::AreaListView(TQWidget *parent, const char *name) : TQVBox(parent, name) { - listView = new KListView(this); + listView = new TDEListView(this); listView->addColumn(i18n("Areas")); listView->addColumn(i18n("Preview")); diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h index cd2c1c43..48f495f4 100644 --- a/kimagemapeditor/arealistview.h +++ b/kimagemapeditor/arealistview.h @@ -21,7 +21,7 @@ #include #include -class KListView; +class TDEListView; class TQPushButton; class Area; @@ -39,7 +39,7 @@ public: AreaListView(TQWidget *parent, const char *name); ~AreaListView(); - KListView* listView; + TDEListView* listView; TQPushButton *upBtn; TQPushButton *downBtn; diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp index 7db15e1e..ff14a98a 100644 --- a/kimagemapeditor/imageslistview.cpp +++ b/kimagemapeditor/imageslistview.cpp @@ -52,7 +52,7 @@ ImageTag* ImagesListViewItem::imageTag() { ImagesListView::ImagesListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { addColumn(i18n("Images")); addColumn(i18n("Usemap")); diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h index fe2784ec..1a118d2f 100644 --- a/kimagemapeditor/imageslistview.h +++ b/kimagemapeditor/imageslistview.h @@ -44,7 +44,7 @@ class ImagesListViewItem : public TQListViewItem * Simple class that shows a list of imagenames with a preview * Jan Schaefer **/ -class ImagesListView : public KListView +class ImagesListView : public TDEListView { Q_OBJECT diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 199b757b..bccccc7c 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -322,7 +322,7 @@ void KImageMapEditor::setReadWrite(bool) void KImageMapEditor::setModified(bool modified) { // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; @@ -431,7 +431,7 @@ void KImageMapEditor::saveLastURL(TDEConfig* config) { void KImageMapEditor::setupActions() { // File Open - KAction *temp=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + TDEAction *temp=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "openimage", SmallIcon("fileopen") ); temp->setWhatsThis(i18n("

Open File

Click this to open a new picture or HTML file.")); temp->setToolTip(i18n("Open new picture or HTML file")); @@ -478,7 +478,7 @@ void KImageMapEditor::setupActions() // Edit Delete - deleteAction=new KAction(i18n("&Delete"), "editdelete", + deleteAction=new TDEAction(i18n("&Delete"), "editdelete", Key_Delete,this,TQT_SLOT (slotDelete()),actionCollection(), "edit_delete"); TQMimeSourceFactory::defaultFactory()->setPixmap( "editdeleteimage", SmallIcon("editdelete") ); deleteAction->setWhatsThis(i18n("

Delete

" @@ -489,7 +489,7 @@ void KImageMapEditor::setupActions() _commandHistory = new KCommandHistory( actionCollection(), true); // Edit Properties - areaPropertiesAction= new KAction(i18n("Pr&operties"),0,this,TQT_SLOT(showTagEditor()), + areaPropertiesAction= new TDEAction(i18n("Pr&operties"),0,this,TQT_SLOT(showTagEditor()), actionCollection(), "edit_properties"); areaPropertiesAction->setEnabled(false); @@ -499,7 +499,7 @@ void KImageMapEditor::setupActions() zoomOutAction=KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection()); // View Zoom - zoomAction=new KSelectAction(i18n("Zoom"), 0,this,TQT_SLOT (slotZoom()), + zoomAction=new TDESelectAction(i18n("Zoom"), 0,this,TQT_SLOT (slotZoom()), actionCollection(), "view_zoom"); zoomAction->setWhatsThis(i18n("

Zoom

" "Choose the desired zoom level.")); @@ -517,55 +517,55 @@ void KImageMapEditor::setupActions() zoomAction->setCurrentItem(2); - highlightAreasAction = new KToggleAction(i18n("Highlight Areas"),0, this, TQT_SLOT (slotHightlightAreas()), + highlightAreasAction = new TDEToggleAction(i18n("Highlight Areas"),0, this, TQT_SLOT (slotHightlightAreas()), actionCollection(), "view_highlightareas"); - showAltAction = new KToggleAction(i18n("Show Alt Tag"),0, this, TQT_SLOT (slotShowAltTag()), + showAltAction = new TDEToggleAction(i18n("Show Alt Tag"),0, this, TQT_SLOT (slotShowAltTag()), actionCollection(), "view_showalt"); #if KDE_IS_VERSION(3,2,90) showAltAction->setCheckedState(i18n("Hide Alt Tag")); #endif - mapNameAction= new KAction(i18n("Map &Name..."),0,this,TQT_SLOT(mapEditName()), + mapNameAction= new TDEAction(i18n("Map &Name..."),0,this,TQT_SLOT(mapEditName()), actionCollection(), "map_name"); - mapNewAction = new KAction(i18n("Ne&w Map..."),0,this,TQT_SLOT(mapNew()), + mapNewAction = new TDEAction(i18n("Ne&w Map..."),0,this,TQT_SLOT(mapNew()), actionCollection(), "map_new"); mapNewAction->setToolTip(i18n("Create a new map")); - mapDeleteAction = new KAction(i18n("D&elete Map"),0,this,TQT_SLOT(mapDelete()), + mapDeleteAction = new TDEAction(i18n("D&elete Map"),0,this,TQT_SLOT(mapDelete()), actionCollection(), "map_delete"); mapDeleteAction->setToolTip(i18n("Delete the current active map")); - mapDefaultAreaAction = new KAction(i18n("Edit &Default Area..."),0,this,TQT_SLOT(mapDefaultArea()), + mapDefaultAreaAction = new TDEAction(i18n("Edit &Default Area..."),0,this,TQT_SLOT(mapDefaultArea()), actionCollection(), "map_defaultarea"); mapDefaultAreaAction->setToolTip(i18n("Edit the default area of the current active map")); - temp = new KAction(i18n("&Preview"),0,this,TQT_SLOT(mapPreview()), + temp = new TDEAction(i18n("&Preview"),0,this,TQT_SLOT(mapPreview()), actionCollection(), "map_preview"); temp->setToolTip(i18n("Show a preview")); // IMAGE i18n("&Image"); - imageAddAction = new KAction(i18n("Add Image..."),0,this,TQT_SLOT(imageAdd()), + imageAddAction = new TDEAction(i18n("Add Image..."),0,this,TQT_SLOT(imageAdd()), actionCollection(), "image_add"); imageAddAction->setToolTip(i18n("Add a new image")); - imageRemoveAction = new KAction(i18n("Remove Image"),0,this,TQT_SLOT(imageRemove()), + imageRemoveAction = new TDEAction(i18n("Remove Image"),0,this,TQT_SLOT(imageRemove()), actionCollection(), "image_remove"); imageRemoveAction->setToolTip(i18n("Remove the current visible image")); - imageUsemapAction = new KAction(i18n("Edit Usemap..."),0,this,TQT_SLOT(imageUsemap()), + imageUsemapAction = new TDEAction(i18n("Edit Usemap..."),0,this,TQT_SLOT(imageUsemap()), actionCollection(), "image_usemap"); imageUsemapAction->setToolTip(i18n("Edit the usemap tag of the current visible image")); - temp= new KAction(i18n("Show &HTML"),0,this,TQT_SLOT(mapShowHTML()), + temp= new TDEAction(i18n("Show &HTML"),0,this,TQT_SLOT(mapShowHTML()), actionCollection(), "map_showhtml"); // Selection Tool - arrowAction=new KRadioAction(i18n("&Selection"), "arrow", + arrowAction=new TDERadioAction(i18n("&Selection"), "arrow", 0,this,TQT_SLOT (slotDrawArrow()), actionCollection(), "tool_arrow"); TQMimeSourceFactory::defaultFactory()->setPixmap( "arrowimage", SmallIcon("arrow") ); @@ -575,7 +575,7 @@ void KImageMapEditor::setupActions() arrowAction->setChecked(true); // Circle - circleAction=new KRadioAction(i18n("&Circle"), "circle", + circleAction=new TDERadioAction(i18n("&Circle"), "circle", 0,this,TQT_SLOT (slotDrawCircle()), actionCollection(), "tool_circle"); TQMimeSourceFactory::defaultFactory()->setPixmap( "circleimage", SmallIcon("drawcircle") ); @@ -584,7 +584,7 @@ void KImageMapEditor::setupActions() circleAction->setExclusiveGroup("drawing"); // Rectangle - rectangleAction=new KRadioAction(i18n("&Rectangle"), "rectangle", + rectangleAction=new TDERadioAction(i18n("&Rectangle"), "rectangle", 0,this,TQT_SLOT (slotDrawRectangle()), actionCollection(), "tool_rectangle"); TQMimeSourceFactory::defaultFactory()->setPixmap( "rectangleimage", SmallIcon("drawrectangle") ); @@ -593,7 +593,7 @@ void KImageMapEditor::setupActions() rectangleAction->setExclusiveGroup("drawing"); // Polygon - polygonAction=new KRadioAction(i18n("&Polygon"), "polygon", + polygonAction=new TDERadioAction(i18n("&Polygon"), "polygon", 0,this,TQT_SLOT (slotDrawPolygon()), actionCollection(), "tool_polygon"); TQMimeSourceFactory::defaultFactory()->setPixmap( "polygonimage", SmallIcon("drawpolygon") ); @@ -602,7 +602,7 @@ void KImageMapEditor::setupActions() polygonAction->setExclusiveGroup("drawing"); // Freehand - freehandAction=new KRadioAction(i18n("&Freehand Polygon"), "freehand", + freehandAction=new TDERadioAction(i18n("&Freehand Polygon"), "freehand", 0,this,TQT_SLOT (slotDrawFreehand()), actionCollection(), "tool_freehand"); TQMimeSourceFactory::defaultFactory()->setPixmap( "freehandimage", SmallIcon("freehand") ); @@ -611,7 +611,7 @@ void KImageMapEditor::setupActions() freehandAction->setExclusiveGroup("drawing"); // Add Point - addPointAction=new KRadioAction(i18n("&Add Point"), "addpoint", + addPointAction=new TDERadioAction(i18n("&Add Point"), "addpoint", 0,this,TQT_SLOT (slotDrawAddPoint()), actionCollection(), "tool_addpoint"); TQMimeSourceFactory::defaultFactory()->setPixmap( "addpointimage", SmallIcon("addpoint") ); @@ -620,7 +620,7 @@ void KImageMapEditor::setupActions() addPointAction->setExclusiveGroup("drawing"); // Remove Point - removePointAction=new KRadioAction(i18n("&Remove Point"), "removepoint", + removePointAction=new TDERadioAction(i18n("&Remove Point"), "removepoint", 0,this,TQT_SLOT (slotDrawRemovePoint()), actionCollection(), "tool_removepoint"); TQMimeSourceFactory::defaultFactory()->setPixmap( "removepointimage", SmallIcon("removepoint") ); @@ -629,36 +629,36 @@ void KImageMapEditor::setupActions() removePointAction->setExclusiveGroup("drawing"); #if TDE_VERSION < 300 - KAction *cancelAction = + TDEAction *cancelAction = #endif - new KAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ), + new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ), actionCollection(), "canceldrawing" ); - moveLeftAction = new KAction(i18n("Move Left"), Key_Left, this, TQT_SLOT( slotMoveLeft() ), + moveLeftAction = new TDEAction(i18n("Move Left"), Key_Left, this, TQT_SLOT( slotMoveLeft() ), actionCollection() , "moveleft" ); - moveRightAction = new KAction(i18n("Move Right"), Key_Right, this, TQT_SLOT( slotMoveRight() ), + moveRightAction = new TDEAction(i18n("Move Right"), Key_Right, this, TQT_SLOT( slotMoveRight() ), actionCollection() , "moveright" ); - moveUpAction = new KAction(i18n("Move Up"), Key_Up, this, TQT_SLOT( slotMoveUp() ), + moveUpAction = new TDEAction(i18n("Move Up"), Key_Up, this, TQT_SLOT( slotMoveUp() ), actionCollection() , "moveup" ); - moveDownAction = new KAction(i18n("Move Down"), Key_Down, this, TQT_SLOT( slotMoveDown() ), + moveDownAction = new TDEAction(i18n("Move Down"), Key_Down, this, TQT_SLOT( slotMoveDown() ), actionCollection() , "movedown" ); - increaseWidthAction = new KAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQT_SLOT( slotIncreaseWidth() ), + increaseWidthAction = new TDEAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQT_SLOT( slotIncreaseWidth() ), actionCollection() , "increasewidth" ); - decreaseWidthAction = new KAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQT_SLOT( slotDecreaseWidth() ), + decreaseWidthAction = new TDEAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQT_SLOT( slotDecreaseWidth() ), actionCollection() , "decreasewidth" ); - increaseHeightAction = new KAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQT_SLOT( slotIncreaseHeight() ), + increaseHeightAction = new TDEAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQT_SLOT( slotIncreaseHeight() ), actionCollection() , "increaseheight" ); - decreaseHeightAction = new KAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ), + decreaseHeightAction = new TDEAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ), actionCollection() , "decreaseheight" ); #if TDE_VERSION < 300 - accel = new KAccel(widget()); + accel = new TDEAccel(widget()); cancelAction->plugAccel(accel, true); moveLeftAction->plugAccel(accel, true); moveRightAction->plugAccel(accel, true); @@ -670,15 +670,15 @@ void KImageMapEditor::setupActions() decreaseHeightAction->plugAccel(accel, true); #endif - toFrontAction = new KAction(i18n("Bring to Front"), 0 , this, TQT_SLOT( slotToFront() ), + toFrontAction = new TDEAction(i18n("Bring to Front"), 0 , this, TQT_SLOT( slotToFront() ), actionCollection() , "tofront" ); - toBackAction = new KAction(i18n("Send to Back"), 0 , this, TQT_SLOT( slotToBack() ), + toBackAction = new TDEAction(i18n("Send to Back"), 0 , this, TQT_SLOT( slotToBack() ), actionCollection() , "toback" ); - forwardOneAction = new KAction(i18n("Bring Forward One"), "raise" ,0, this, TQT_SLOT( slotForwardOne() ), + forwardOneAction = new TDEAction(i18n("Bring Forward One"), "raise" ,0, this, TQT_SLOT( slotForwardOne() ), actionCollection() , "forwardone" ); - backOneAction = new KAction(i18n("Send Back One"), "lower" ,0, this, TQT_SLOT( slotBackOne() ), + backOneAction = new TDEAction(i18n("Send Back One"), "lower" ,0, this, TQT_SLOT( slotBackOne() ), actionCollection() , "backone" ); forwardOneAction->plug(areaListView->upBtn); @@ -687,20 +687,20 @@ void KImageMapEditor::setupActions() connect( areaListView->upBtn, TQT_SIGNAL(pressed()), forwardOneAction, TQT_SLOT(activate())); connect( areaListView->downBtn, TQT_SIGNAL(pressed()), backOneAction, TQT_SLOT(activate())); - new KAction( i18n("Configure KImageMapEditor..."), "configure", 0, + new TDEAction( i18n("Configure KImageMapEditor..."), "configure", 0, this, TQT_SLOT(slotShowPreferences()), actionCollection(), "configure_kimagemapeditor" ); if (areaDock) { - configureShowAreaListAction = new KToggleAction( i18n("Show Area List"), 0L, 0, + configureShowAreaListAction = new TDEToggleAction( i18n("Show Area List"), 0L, 0, this, TQT_SLOT(configureShowAreaList()), actionCollection(), "configure_show_arealist" ); - configureShowMapListAction = new KToggleAction( i18n("Show Map List"), 0L, 0, + configureShowMapListAction = new TDEToggleAction( i18n("Show Map List"), 0L, 0, this, TQT_SLOT(configureShowMapList()), actionCollection(), "configure_show_maplist" ); - configureShowImageListAction = new KToggleAction( i18n("Show Image List"), 0L, 0, + configureShowImageListAction = new TDEToggleAction( i18n("Show Image List"), 0L, 0, this, TQT_SLOT(configureShowImageList()), actionCollection(), "configure_show_imagelist" ); #if KDE_IS_VERSION(3,2,90) diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index 17401b29..d500c099 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -41,7 +41,7 @@ class TQPushButton; class DrawZone; class TQComboBox; class TQListViewItem; -class KToggleAction; +class TDEToggleAction; @@ -107,12 +107,12 @@ class HtmlContent : public TQPtrList {} ; -class KSelectAction; -class KRadioAction; -class KRecentFilesAction; -class KAction; +class TDESelectAction; +class TDERadioAction; +class TDERecentFilesAction; +class TDEAction; #if TDE_VERSION < 300 - class KAccel; + class TDEAccel; #endif ///class TQListViewItem; class KCommandHistory; @@ -257,60 +257,60 @@ private: // // Actions // - KSelectAction* zoomAction; - KRadioAction *arrowAction; - KRadioAction *circleAction; - KRadioAction *rectangleAction; - KRadioAction *polygonAction; - KRadioAction *freehandAction; - KRadioAction *addPointAction; - KRadioAction *removePointAction; - - KAction *cutAction; - KAction *deleteAction; - KAction *copyAction; - KAction *pasteAction; - KAction *zoomInAction; - KAction *zoomOutAction; - - KAction *mapNewAction; - KAction *mapDeleteAction; - KAction *mapNameAction; - KAction *mapDefaultAreaAction; - - KAction *imageAddAction; - KAction *imageRemoveAction; - KAction *imageUsemapAction; - - KToggleAction *highlightAreasAction; - KToggleAction *showAltAction; - - KAction *areaPropertiesAction; - - KAction *moveLeftAction; - KAction *moveRightAction; - KAction *moveUpAction; - KAction *moveDownAction; - - KAction *increaseWidthAction; - KAction *decreaseWidthAction; - KAction *increaseHeightAction; - KAction *decreaseHeightAction; - - KAction *toFrontAction; - KAction *toBackAction; - KAction *forwardOneAction; - KAction *backOneAction; - - KToggleAction* configureShowAreaListAction; - KToggleAction* configureShowMapListAction; - KToggleAction* configureShowImageListAction; - - - KRecentFilesAction* recentFilesAction; + TDESelectAction* zoomAction; + TDERadioAction *arrowAction; + TDERadioAction *circleAction; + TDERadioAction *rectangleAction; + TDERadioAction *polygonAction; + TDERadioAction *freehandAction; + TDERadioAction *addPointAction; + TDERadioAction *removePointAction; + + TDEAction *cutAction; + TDEAction *deleteAction; + TDEAction *copyAction; + TDEAction *pasteAction; + TDEAction *zoomInAction; + TDEAction *zoomOutAction; + + TDEAction *mapNewAction; + TDEAction *mapDeleteAction; + TDEAction *mapNameAction; + TDEAction *mapDefaultAreaAction; + + TDEAction *imageAddAction; + TDEAction *imageRemoveAction; + TDEAction *imageUsemapAction; + + TDEToggleAction *highlightAreasAction; + TDEToggleAction *showAltAction; + + TDEAction *areaPropertiesAction; + + TDEAction *moveLeftAction; + TDEAction *moveRightAction; + TDEAction *moveUpAction; + TDEAction *moveDownAction; + + TDEAction *increaseWidthAction; + TDEAction *decreaseWidthAction; + TDEAction *increaseHeightAction; + TDEAction *decreaseHeightAction; + + TDEAction *toFrontAction; + TDEAction *toBackAction; + TDEAction *forwardOneAction; + TDEAction *backOneAction; + + TDEToggleAction* configureShowAreaListAction; + TDEToggleAction* configureShowMapListAction; + TDEToggleAction* configureShowImageListAction; + + + TDERecentFilesAction* recentFilesAction; #if TDE_VERSION < 300 - KAccel *accel; + TDEAccel *accel; #endif KDockMainWindow *mainDock; diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp index 252afdb8..399ad2b5 100644 --- a/kimagemapeditor/mapslistview.cpp +++ b/kimagemapeditor/mapslistview.cpp @@ -25,7 +25,7 @@ MapsListView::MapsListView(TQWidget *parent, const char *name) : TQVBox(parent, name) { - _listView = new KListView(this); + _listView = new TDEListView(this); _listView->addColumn(i18n("Maps")); _listView->setFullWidth(true); _listView->setSelectionMode(TQListView::Single); diff --git a/kimagemapeditor/mapslistview.h b/kimagemapeditor/mapslistview.h index c256888a..aff57761 100644 --- a/kimagemapeditor/mapslistview.h +++ b/kimagemapeditor/mapslistview.h @@ -21,7 +21,7 @@ #include #include "kimagemapeditor.h" -class KListView; +class TDEListView; /** * Simple class that shows all map tags of the current open html file in a ListView @@ -99,9 +99,9 @@ public: */ uint count(); - KListView* listView() { return _listView; } + TDEListView* listView() { return _listView; } protected: - KListView* _listView; + TDEListView* _listView; protected slots: void slotSelectionChanged(TQListViewItem*); -- cgit v1.2.1