diff options
Diffstat (limited to 'kimagemapeditor')
-rw-r--r-- | kimagemapeditor/imageslistview.cpp | 4 | ||||
-rw-r--r-- | kimagemapeditor/kimagemapeditor.cpp | 134 | ||||
-rw-r--r-- | kimagemapeditor/kimedialogs.cpp | 40 | ||||
-rw-r--r-- | kimagemapeditor/kimeshell.cpp | 24 | ||||
-rw-r--r-- | kimagemapeditor/mapslistview.cpp | 8 | ||||
-rw-r--r-- | kimagemapeditor/qextfileinfo.cpp | 18 |
6 files changed, 114 insertions, 114 deletions
diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp index 15529a45..773fd9b4 100644 --- a/kimagemapeditor/imageslistview.cpp +++ b/kimagemapeditor/imageslistview.cpp @@ -60,8 +60,8 @@ ImagesListView::ImagesListView(TQWidget *parent, const char *name) setFullWidth(true); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*)), - this, TQT_SLOT( slotSelectionChanged(TQListViewItem*))); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*)), + this, TQ_SLOT( slotSelectionChanged(TQListViewItem*))); } diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 1d9eeba7..8e92947d 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -118,7 +118,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, mapsDock->manualDock( (KDockWidget*) areaDock, KDockWidget::DockCenter); imagesDock->manualDock( (KDockWidget*) mapsDock, KDockWidget::DockCenter); - connect( mainDock->manager(), TQT_SIGNAL(change()), this, TQT_SLOT(dockingStateChanged())); + connect( mainDock->manager(), TQ_SIGNAL(change()), this, TQ_SLOT(dockingStateChanged())); } else { @@ -137,25 +137,25 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, } - connect( areaListView->listView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect( areaListView->listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(showTagEditor(TQListViewItem*))); - connect( areaListView->listView, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, - TQT_SLOT(slotShowPopupMenu(TQListViewItem*,const TQPoint &))); + connect( areaListView->listView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect( areaListView->listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(showTagEditor(TQListViewItem*))); + connect( areaListView->listView, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, + TQ_SLOT(slotShowPopupMenu(TQListViewItem*,const TQPoint &))); - connect( mapsListView, TQT_SIGNAL( mapSelected(const TQString &)), - this, TQT_SLOT( setMap(const TQString &))); + connect( mapsListView, TQ_SIGNAL( mapSelected(const TQString &)), + this, TQ_SLOT( setMap(const TQString &))); - connect( mapsListView, TQT_SIGNAL( mapRenamed(const TQString &)), - this, TQT_SLOT( setMapName(const TQString &))); + connect( mapsListView, TQ_SIGNAL( mapRenamed(const TQString &)), + this, TQ_SLOT( setMapName(const TQString &))); - connect( mapsListView->listView(), TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, - TQT_SLOT(slotShowMapPopupMenu(TQListViewItem*,const TQPoint &))); + connect( mapsListView->listView(), TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, + TQ_SLOT(slotShowMapPopupMenu(TQListViewItem*,const TQPoint &))); - connect( imagesListView, TQT_SIGNAL( imageSelected(const KURL &)), - this, TQT_SLOT( setPicture(const KURL &))); + connect( imagesListView, TQ_SIGNAL( imageSelected(const KURL &)), + this, TQ_SLOT( setPicture(const KURL &))); - connect( imagesListView, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, - TQT_SLOT(slotShowImagePopupMenu(TQListViewItem*,const TQPoint &))); + connect( imagesListView, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, + TQ_SLOT(slotShowImagePopupMenu(TQListViewItem*,const TQPoint &))); // Shows the text: // "Drop an image or html file" @@ -431,46 +431,46 @@ void KImageMapEditor::saveLastURL(TDEConfig* config) { void KImageMapEditor::setupActions() { // File Open - TDEAction *temp=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + TDEAction *temp=KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "openimage", SmallIcon("document-open") ); temp->setWhatsThis(i18n("<h3>Open File</h3>Click this to <em>open</em> a new picture or HTML file.")); temp->setToolTip(i18n("Open new picture or HTML file")); // File Open Recent - recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), + recentFilesAction = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); // File Save - temp =KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + temp =KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "saveimage", SmallIcon("document-save") ); temp->setWhatsThis(i18n("<h3>Save File</h3>Click this to <em>save</em> the changes to the HTML file.")); temp->setToolTip(i18n("Save HTML file")); // File Save As - (void)KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + (void)KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); // File Close - temp=KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); + temp=KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "closeimage", SmallIcon("window-close") ); temp->setWhatsThis(i18n("<h3>Close File</h3>Click this to <em>close</em> the currently open HTML file.")); temp->setToolTip(i18n("Close HTML file")); // Edit Copy - copyAction=KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection()); + copyAction=KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "editcopyimage", SmallIcon("edit-copy") ); copyAction->setWhatsThis(i18n("<h3>Copy</h3>" "Click this to <em>copy</em> the selected area.")); copyAction->setEnabled(false); // Edit Cut - cutAction=KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection()); + cutAction=KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "editcutimage", SmallIcon("edit-cut") ); cutAction->setWhatsThis(i18n("<h3>Cut</h3>" "Click this to <em>cut</em> the selected area.")); cutAction->setEnabled(false); // Edit Paste - pasteAction=KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection()); + pasteAction=KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "editpasteimage", SmallIcon("edit-paste") ); pasteAction->setWhatsThis(i18n("<h3>Paste</h3>" "Click this to <em>paste</em> the copied area.")); @@ -479,7 +479,7 @@ void KImageMapEditor::setupActions() // Edit Delete deleteAction=new TDEAction(i18n("&Delete"), "edit-delete", - Key_Delete,this,TQT_SLOT (slotDelete()),actionCollection(), "edit_delete"); + Key_Delete,this,TQ_SLOT (slotDelete()),actionCollection(), "edit_delete"); TQMimeSourceFactory::defaultFactory()->setPixmap( "editdeleteimage", SmallIcon("edit-delete") ); deleteAction->setWhatsThis(i18n("<h3>Delete</h3>" "Click this to <em>delete</em> the selected area.")); @@ -489,17 +489,17 @@ void KImageMapEditor::setupActions() _commandHistory = new KCommandHistory( actionCollection(), true); // Edit Properties - areaPropertiesAction= new TDEAction(i18n("Pr&operties"),0,this,TQT_SLOT(showTagEditor()), + areaPropertiesAction= new TDEAction(i18n("Pr&operties"),0,this,TQ_SLOT(showTagEditor()), actionCollection(), "edit_properties"); areaPropertiesAction->setEnabled(false); // View Zoom In - zoomInAction=KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection()); + zoomInAction=KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()), actionCollection()); // View Zoom Out - zoomOutAction=KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection()); + zoomOutAction=KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()), actionCollection()); // View Zoom - zoomAction=new TDESelectAction(i18n("Zoom"), 0,this,TQT_SLOT (slotZoom()), + zoomAction=new TDESelectAction(i18n("Zoom"), 0,this,TQ_SLOT (slotZoom()), actionCollection(), "view_zoom"); zoomAction->setWhatsThis(i18n("<h3>Zoom</h3>" "Choose the desired zoom level.")); @@ -517,56 +517,56 @@ void KImageMapEditor::setupActions() zoomAction->setCurrentItem(2); - highlightAreasAction = new TDEToggleAction(i18n("Highlight Areas"),0, this, TQT_SLOT (slotHightlightAreas()), + highlightAreasAction = new TDEToggleAction(i18n("Highlight Areas"),0, this, TQ_SLOT (slotHightlightAreas()), actionCollection(), "view_highlightareas"); - showAltAction = new TDEToggleAction(i18n("Show Alt Tag"),0, this, TQT_SLOT (slotShowAltTag()), + showAltAction = new TDEToggleAction(i18n("Show Alt Tag"),0, this, TQ_SLOT (slotShowAltTag()), actionCollection(), "view_showalt"); #if KDE_IS_VERSION(3,2,90) showAltAction->setCheckedState(i18n("Hide Alt Tag")); #endif - mapNameAction= new TDEAction(i18n("Map &Name..."),0,this,TQT_SLOT(mapEditName()), + mapNameAction= new TDEAction(i18n("Map &Name..."),0,this,TQ_SLOT(mapEditName()), actionCollection(), "map_name"); - mapNewAction = new TDEAction(i18n("Ne&w Map..."),0,this,TQT_SLOT(mapNew()), + mapNewAction = new TDEAction(i18n("Ne&w Map..."),0,this,TQ_SLOT(mapNew()), actionCollection(), "map_new"); mapNewAction->setToolTip(i18n("Create a new map")); - mapDeleteAction = new TDEAction(i18n("D&elete Map"),0,this,TQT_SLOT(mapDelete()), + mapDeleteAction = new TDEAction(i18n("D&elete Map"),0,this,TQ_SLOT(mapDelete()), actionCollection(), "map_delete"); mapDeleteAction->setToolTip(i18n("Delete the current active map")); - mapDefaultAreaAction = new TDEAction(i18n("Edit &Default Area..."),0,this,TQT_SLOT(mapDefaultArea()), + mapDefaultAreaAction = new TDEAction(i18n("Edit &Default Area..."),0,this,TQ_SLOT(mapDefaultArea()), actionCollection(), "map_defaultarea"); mapDefaultAreaAction->setToolTip(i18n("Edit the default area of the current active map")); - temp = new TDEAction(i18n("&Preview"),0,this,TQT_SLOT(mapPreview()), + temp = new TDEAction(i18n("&Preview"),0,this,TQ_SLOT(mapPreview()), actionCollection(), "map_preview"); temp->setToolTip(i18n("Show a preview")); // IMAGE i18n("&Image"); - imageAddAction = new TDEAction(i18n("Add Image..."),0,this,TQT_SLOT(imageAdd()), + imageAddAction = new TDEAction(i18n("Add Image..."),0,this,TQ_SLOT(imageAdd()), actionCollection(), "image_add"); imageAddAction->setToolTip(i18n("Add a new image")); - imageRemoveAction = new TDEAction(i18n("Remove Image"),0,this,TQT_SLOT(imageRemove()), + imageRemoveAction = new TDEAction(i18n("Remove Image"),0,this,TQ_SLOT(imageRemove()), actionCollection(), "image_remove"); imageRemoveAction->setToolTip(i18n("Remove the current visible image")); - imageUsemapAction = new TDEAction(i18n("Edit Usemap..."),0,this,TQT_SLOT(imageUsemap()), + imageUsemapAction = new TDEAction(i18n("Edit Usemap..."),0,this,TQ_SLOT(imageUsemap()), actionCollection(), "image_usemap"); imageUsemapAction->setToolTip(i18n("Edit the usemap tag of the current visible image")); - temp= new TDEAction(i18n("Show &HTML"),0,this,TQT_SLOT(mapShowHTML()), + temp= new TDEAction(i18n("Show &HTML"),0,this,TQ_SLOT(mapShowHTML()), actionCollection(), "map_showhtml"); // Selection Tool arrowAction=new TDERadioAction(i18n("&Selection"), "arrow", - 0,this,TQT_SLOT (slotDrawArrow()), + 0,this,TQ_SLOT (slotDrawArrow()), actionCollection(), "tool_arrow"); TQMimeSourceFactory::defaultFactory()->setPixmap( "arrowimage", SmallIcon("arrow") ); arrowAction->setWhatsThis(i18n("<h3>Selection</h3>" @@ -576,7 +576,7 @@ void KImageMapEditor::setupActions() // Circle circleAction=new TDERadioAction(i18n("&Circle"), "circle", - 0,this,TQT_SLOT (slotDrawCircle()), + 0,this,TQ_SLOT (slotDrawCircle()), actionCollection(), "tool_circle"); TQMimeSourceFactory::defaultFactory()->setPixmap( "circleimage", SmallIcon("drawcircle") ); circleAction->setWhatsThis(i18n("<h3>Circle</h3>" @@ -585,7 +585,7 @@ void KImageMapEditor::setupActions() // Rectangle rectangleAction=new TDERadioAction(i18n("&Rectangle"), "rectangle", - 0,this,TQT_SLOT (slotDrawRectangle()), + 0,this,TQ_SLOT (slotDrawRectangle()), actionCollection(), "tool_rectangle"); TQMimeSourceFactory::defaultFactory()->setPixmap( "rectangleimage", SmallIcon("drawrectangle") ); rectangleAction->setWhatsThis(i18n("<h3>Rectangle</h3>" @@ -594,7 +594,7 @@ void KImageMapEditor::setupActions() // Polygon polygonAction=new TDERadioAction(i18n("&Polygon"), "polygon", - 0,this,TQT_SLOT (slotDrawPolygon()), + 0,this,TQ_SLOT (slotDrawPolygon()), actionCollection(), "tool_polygon"); TQMimeSourceFactory::defaultFactory()->setPixmap( "polygonimage", SmallIcon("drawpolygon") ); polygonAction->setWhatsThis(i18n("<h3>Polygon</h3>" @@ -603,7 +603,7 @@ void KImageMapEditor::setupActions() // Freehand freehandAction=new TDERadioAction(i18n("&Freehand Polygon"), "freehand", - 0,this,TQT_SLOT (slotDrawFreehand()), + 0,this,TQ_SLOT (slotDrawFreehand()), actionCollection(), "tool_freehand"); TQMimeSourceFactory::defaultFactory()->setPixmap( "freehandimage", SmallIcon("freehand") ); freehandAction->setWhatsThis(i18n("<h3>Freehandpolygon</h3>" @@ -612,7 +612,7 @@ void KImageMapEditor::setupActions() // Add Point addPointAction=new TDERadioAction(i18n("&Add Point"), "addpoint", - 0,this,TQT_SLOT (slotDrawAddPoint()), + 0,this,TQ_SLOT (slotDrawAddPoint()), actionCollection(), "tool_addpoint"); TQMimeSourceFactory::defaultFactory()->setPixmap( "addpointimage", SmallIcon("addpoint") ); addPointAction->setWhatsThis(i18n("<h3>Add Point</h3>" @@ -621,7 +621,7 @@ void KImageMapEditor::setupActions() // Remove Point removePointAction=new TDERadioAction(i18n("&Remove Point"), "removepoint", - 0,this,TQT_SLOT (slotDrawRemovePoint()), + 0,this,TQ_SLOT (slotDrawRemovePoint()), actionCollection(), "tool_removepoint"); TQMimeSourceFactory::defaultFactory()->setPixmap( "removepointimage", SmallIcon("removepoint") ); removePointAction->setWhatsThis(i18n("<h3>Remove Point</h3>" @@ -631,31 +631,31 @@ void KImageMapEditor::setupActions() #if TDE_VERSION < 300 TDEAction *cancelAction = #endif - new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ), + new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQ_SLOT( slotCancelDrawing() ), actionCollection(), "canceldrawing" ); - moveLeftAction = new TDEAction(i18n("Move Left"), Key_Left, this, TQT_SLOT( slotMoveLeft() ), + moveLeftAction = new TDEAction(i18n("Move Left"), Key_Left, this, TQ_SLOT( slotMoveLeft() ), actionCollection() , "moveleft" ); - moveRightAction = new TDEAction(i18n("Move Right"), Key_Right, this, TQT_SLOT( slotMoveRight() ), + moveRightAction = new TDEAction(i18n("Move Right"), Key_Right, this, TQ_SLOT( slotMoveRight() ), actionCollection() , "moveright" ); - moveUpAction = new TDEAction(i18n("Move Up"), Key_Up, this, TQT_SLOT( slotMoveUp() ), + moveUpAction = new TDEAction(i18n("Move Up"), Key_Up, this, TQ_SLOT( slotMoveUp() ), actionCollection() , "moveup" ); - moveDownAction = new TDEAction(i18n("Move Down"), Key_Down, this, TQT_SLOT( slotMoveDown() ), + moveDownAction = new TDEAction(i18n("Move Down"), Key_Down, this, TQ_SLOT( slotMoveDown() ), actionCollection() , "movedown" ); - increaseWidthAction = new TDEAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQT_SLOT( slotIncreaseWidth() ), + increaseWidthAction = new TDEAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQ_SLOT( slotIncreaseWidth() ), actionCollection() , "increasewidth" ); - decreaseWidthAction = new TDEAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQT_SLOT( slotDecreaseWidth() ), + decreaseWidthAction = new TDEAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQ_SLOT( slotDecreaseWidth() ), actionCollection() , "decreasewidth" ); - increaseHeightAction = new TDEAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQT_SLOT( slotIncreaseHeight() ), + increaseHeightAction = new TDEAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQ_SLOT( slotIncreaseHeight() ), actionCollection() , "increaseheight" ); - decreaseHeightAction = new TDEAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ), + decreaseHeightAction = new TDEAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQ_SLOT( slotDecreaseHeight() ), actionCollection() , "decreaseheight" ); #if TDE_VERSION < 300 accel = new TDEAccel(widget()); @@ -670,38 +670,38 @@ void KImageMapEditor::setupActions() decreaseHeightAction->plugAccel(accel, true); #endif - toFrontAction = new TDEAction(i18n("Bring to Front"), 0 , this, TQT_SLOT( slotToFront() ), + toFrontAction = new TDEAction(i18n("Bring to Front"), 0 , this, TQ_SLOT( slotToFront() ), actionCollection() , "tofront" ); - toBackAction = new TDEAction(i18n("Send to Back"), 0 , this, TQT_SLOT( slotToBack() ), + toBackAction = new TDEAction(i18n("Send to Back"), 0 , this, TQ_SLOT( slotToBack() ), actionCollection() , "toback" ); - forwardOneAction = new TDEAction(i18n("Bring Forward One"), "raise" ,0, this, TQT_SLOT( slotForwardOne() ), + forwardOneAction = new TDEAction(i18n("Bring Forward One"), "raise" ,0, this, TQ_SLOT( slotForwardOne() ), actionCollection() , "forwardone" ); - backOneAction = new TDEAction(i18n("Send Back One"), "lower" ,0, this, TQT_SLOT( slotBackOne() ), + backOneAction = new TDEAction(i18n("Send Back One"), "lower" ,0, this, TQ_SLOT( slotBackOne() ), actionCollection() , "backone" ); forwardOneAction->plug(areaListView->upBtn); backOneAction->plug(areaListView->downBtn); - connect( areaListView->upBtn, TQT_SIGNAL(pressed()), forwardOneAction, TQT_SLOT(activate())); - connect( areaListView->downBtn, TQT_SIGNAL(pressed()), backOneAction, TQT_SLOT(activate())); + connect( areaListView->upBtn, TQ_SIGNAL(pressed()), forwardOneAction, TQ_SLOT(activate())); + connect( areaListView->downBtn, TQ_SIGNAL(pressed()), backOneAction, TQ_SLOT(activate())); new TDEAction( i18n("Configure KImageMapEditor..."), "configure", 0, - this, TQT_SLOT(slotShowPreferences()), + this, TQ_SLOT(slotShowPreferences()), actionCollection(), "configure_kimagemapeditor" ); if (areaDock) { configureShowAreaListAction = new TDEToggleAction( i18n("Show Area List"), 0L, 0, - this, TQT_SLOT(configureShowAreaList()), + this, TQ_SLOT(configureShowAreaList()), actionCollection(), "configure_show_arealist" ); configureShowMapListAction = new TDEToggleAction( i18n("Show Map List"), 0L, 0, - this, TQT_SLOT(configureShowMapList()), + this, TQ_SLOT(configureShowMapList()), actionCollection(), "configure_show_maplist" ); configureShowImageListAction = new TDEToggleAction( i18n("Show Image List"), 0L, 0, - this, TQT_SLOT(configureShowImageList()), + this, TQ_SLOT(configureShowImageList()), actionCollection(), "configure_show_imagelist" ); #if KDE_IS_VERSION(3,2,90) configureShowAreaListAction->setCheckedState(i18n("Hide Area List")); @@ -725,7 +725,7 @@ void KImageMapEditor::setupStatusBar() void KImageMapEditor::slotShowPreferences() { PreferencesDialog *dialog = new PreferencesDialog(widget(),config()); - connect(dialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotConfigChanged())); + connect(dialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotConfigChanged())); dialog->exec(); delete dialog; } @@ -1327,7 +1327,7 @@ int KImageMapEditor::showTagEditor(Area *a) { drawZone->repaintArea(*a); AreaDialog *dialog= new AreaDialog(this,a); - connect (dialog, TQT_SIGNAL(areaChanged(Area*)), this, TQT_SLOT(slotAreaChanged(Area*))); + connect (dialog, TQ_SIGNAL(areaChanged(Area*)), this, TQ_SLOT(slotAreaChanged(Area*))); int result = dialog->exec(); diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 2b7b92bb..fe389c1a 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -76,7 +76,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) topXSpin->setMinValue(0); topXSpin->setValue(a->rect().left()); layout->addWidget(topXSpin,0,1); - connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topXSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Top &X:"),this); lbl->setBuddy(topXSpin); @@ -87,7 +87,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) topYSpin->setMinValue(0); topYSpin->setValue(a->rect().top()); layout->addWidget(topYSpin,1,1); - connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topYSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Top &Y:"),this); lbl->setBuddy(topYSpin); @@ -98,7 +98,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) widthSpin->setMinValue(0); widthSpin->setValue(a->rect().width()); layout->addWidget(widthSpin,2,1); - connect( widthSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( widthSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("&Width:"),this); lbl->setBuddy(widthSpin); @@ -109,7 +109,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) heightSpin->setMinValue(0); heightSpin->setValue(a->rect().height()); layout->addWidget(heightSpin,3,1); - connect( heightSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( heightSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Hei&ght:"),this); lbl->setBuddy(heightSpin); @@ -137,7 +137,7 @@ CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) centerXSpin->setMinValue(0); centerXSpin->setValue(a->rect().center().x()); layout->addWidget(centerXSpin,0,1); - connect( centerXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( centerXSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Center &X:"),this); lbl->setBuddy(centerXSpin); @@ -148,7 +148,7 @@ CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) centerYSpin->setMinValue(0); centerYSpin->setValue(a->rect().center().y()); layout->addWidget(centerYSpin,1,1); - connect( centerYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( centerYSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Center &Y:"),this); @@ -160,7 +160,7 @@ CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) radiusSpin->setMinValue(0); radiusSpin->setValue(a->rect().width()/2); layout->addWidget(radiusSpin,2,1); - connect( radiusSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( radiusSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("&Radius:"),this); @@ -199,7 +199,7 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) coordsTable->setText(i,1, TQString::number(area->coords()->point(i).y()) ); } - connect( coordsTable, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotHighlightPoint(int))); + connect( coordsTable, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotHighlightPoint(int))); // coordsTable->setMinimumHeight(50); // coordsTable->setMaximumHeight(400); @@ -209,9 +209,9 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) layout->setStretchFactor(coordsTable,-1); TQHBox *hbox= new TQHBox(this); TQPushButton *addBtn=new TQPushButton(i18n("Add"),hbox); - connect( addBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPoint())); + connect( addBtn, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPoint())); TQPushButton *removeBtn=new TQPushButton(i18n("Remove"),hbox); - connect( removeBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemovePoint())); + connect( removeBtn, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotRemovePoint())); layout->addWidget(hbox); slotHighlightPoint(1); @@ -284,7 +284,7 @@ SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) topXSpin->setMinValue(0); topXSpin->setValue(a->rect().left()); layout->addWidget(topXSpin,0,1); - connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topXSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Top &X"),this); lbl->setBuddy(topXSpin); @@ -295,7 +295,7 @@ SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) topYSpin->setMinValue(0); topYSpin->setValue(a->rect().top()); layout->addWidget(topYSpin,1,1); - connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topYSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Top &Y"),this); lbl->setBuddy(topYSpin); @@ -329,7 +329,7 @@ TQWidget* AreaDialog::createGeneralPage() hrefEdit = new TQLineEdit(area->attribute("href"),hbox); TQPushButton *btn = new TQPushButton("",hbox); btn->setPixmap(SmallIcon("document-open")); - connect( btn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseHref())); + connect( btn, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChooseHref())); hbox->setMinimumHeight(hbox->height()); layout->addWidget(hbox,0,2); @@ -363,7 +363,7 @@ TQWidget* AreaDialog::createCoordsPage() coordsEdit = createCoordsEdit(page,area); layout->addWidget(coordsEdit); - connect( coordsEdit, TQT_SIGNAL(update()), this, TQT_SLOT(slotUpdateArea())); + connect( coordsEdit, TQ_SIGNAL(update()), this, TQ_SLOT(slotUpdateArea())); return page; } @@ -395,9 +395,9 @@ TQWidget* AreaDialog::createButtonBar() TQPushButton *applyBtn = new KPushButton(KStdGuiItem::apply(),box); TQPushButton *cancelBtn = new KPushButton(KStdGuiItem::cancel(),box); - connect(okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOk())); - connect(applyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotApply())); - connect(cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCancel())); + connect(okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOk())); + connect(applyBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotApply())); + connect(cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCancel())); box->setSpacing(5); box->setStretchFactor(spacer,10); @@ -635,7 +635,7 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_ for (MapTag *tag = maps->first(); tag!=0L; tag=maps->next()) { mapListBox->insertItem(tag->name); } - connect (mapListBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotMapChanged(int))); + connect (mapListBox, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotMapChanged(int))); } initImageListTable(page); @@ -696,7 +696,7 @@ void ImageMapChooseDialog::initImageListTable(TQWidget* parent) { imageListTable->setText(row,1,usemap); row++; } - connect (imageListTable, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotImageChanged())); + connect (imageListTable, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotImageChanged())); imageListTable->selectRow(0); slotImageChanged(); @@ -855,7 +855,7 @@ HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* parent, KURL url, const TQString // dialog->adjustSize(); TQLabel* lbl = new TQLabel(page,"urllabel"); - connect( htmlPart, TQT_SIGNAL( onURL(const TQString&)), lbl, TQT_SLOT( setText(const TQString&))); + connect( htmlPart, TQ_SIGNAL( onURL(const TQString&)), lbl, TQ_SLOT( setText(const TQString&))); } HTMLPreviewDialog::~HTMLPreviewDialog() { diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index a3ef0f40..2c69ab22 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -73,11 +73,11 @@ KimeShell::KimeShell(const char *name ) if (!initialGeometrySet()) resize( TQSize(725, 525).expandedTo(minimumSizeHint())); - connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - this, TQT_SLOT(slotSetStatusBarText ( const TQString & ))); + connect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + this, TQ_SLOT(slotSetStatusBarText ( const TQString & ))); - connect( m_part, TQT_SIGNAL(setWindowCaption(const TQString &)), - this, TQT_SLOT(setCaption( const TQString &))); + connect( m_part, TQ_SIGNAL(setWindowCaption(const TQString &)), + this, TQ_SLOT(setCaption( const TQString &))); setAutoSaveSettings( "General Options" ); @@ -109,16 +109,16 @@ bool KimeShell::queryExit() void KimeShell::setupActions() { - (void)KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + (void)KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); // File Quit - (void)KStdAction::quit(this, TQT_SLOT(close()),actionCollection()); + (void)KStdAction::quit(this, TQ_SLOT(close()),actionCollection()); - (void)KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - (void)KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - (void)KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - (void)KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + (void)KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + (void)KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + (void)KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + (void)KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); } @@ -258,8 +258,8 @@ void KimeShell::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp index 84a77bc2..38884cf6 100644 --- a/kimagemapeditor/mapslistview.cpp +++ b/kimagemapeditor/mapslistview.cpp @@ -31,11 +31,11 @@ MapsListView::MapsListView(TQWidget *parent, const char *name) _listView->setSelectionMode(TQListView::Single); _listView->setItemsRenameable(true); - connect( _listView, TQT_SIGNAL( selectionChanged(TQListViewItem*)), - this, TQT_SLOT( slotSelectionChanged(TQListViewItem*))); + connect( _listView, TQ_SIGNAL( selectionChanged(TQListViewItem*)), + this, TQ_SLOT( slotSelectionChanged(TQListViewItem*))); - connect( _listView, TQT_SIGNAL( itemRenamed(TQListViewItem*)), - this, TQT_SLOT( slotItemRenamed(TQListViewItem*))); + connect( _listView, TQ_SIGNAL( itemRenamed(TQListViewItem*)), + this, TQ_SLOT( slotItemRenamed(TQListViewItem*))); } diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 04bafce2..8bb304b2 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -220,10 +220,10 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& bJobOK = true; TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), - this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); // kdDebug(24000) << "Now listing: " << startURL.url() << endl; enter_loop(); @@ -247,11 +247,11 @@ bool QExtFileInfo::internalExists(const KURL& url) TDEIO::StatJob * job = TDEIO::stat( url, false); job->setDetails(0); job->setSide(false); //check the url for writing - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); //To avoid lock-ups, start a timer. - TQTimer::singleShot(10*1000, this,TQT_SLOT(slotTimeout())); + TQTimer::singleShot(10*1000, this,TQ_SLOT(slotTimeout())); // kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl; enter_loop(); // kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl; @@ -266,8 +266,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss TDEIO::Scheduler::checkSlaveOnHold(true); TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; |