diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 14:38:52 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-21 23:13:10 +0900 |
| commit | dd3ce2e1c41671cffcb72c90f88f536269079869 (patch) | |
| tree | b87fa0d6f8911e0009d033326f5e36972ae2f6d3 | |
| parent | 40eb6401dea18d69ccd84eb13526b9356db621d1 (diff) | |
| download | tdewebdev-dd3ce2e1c41671cffcb72c90f88f536269079869.tar.gz tdewebdev-dd3ce2e1c41671cffcb72c90f88f536269079869.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 931991843ab3b6b0b0157dd433c226f7fc2ebc1b)
190 files changed, 1982 insertions, 1982 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; diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 570157d1..26a969df 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -89,34 +89,34 @@ void ActionManager::initPart(KLinkStatusPart* part) new TDEAction(i18n("New Link Check"), "document-new", 0, - d->part, TQT_SLOT(slotNewLinkCheck()), + d->part, TQ_SLOT(slotNewLinkCheck()), d->actionCollection, "new_link_check"); new TDEAction(i18n("Open URL..."), "document-open", 0, - d->part, TQT_SLOT(slotOpenLink()), + d->part, TQ_SLOT(slotOpenLink()), d->actionCollection, "open_link"); action = new TDEAction(i18n("Close Tab"), "window-close", 0, - d->part, TQT_SLOT(slotClose()), + d->part, TQ_SLOT(slotClose()), d->actionCollection, "close_tab"); action->setEnabled(false); // *************** Settings menu ********************* (void) new TDEAction(i18n("Configure KLinkStatus..."), "configure", - 0, d->part, TQT_SLOT(slotConfigureKLinkStatus()), + 0, d->part, TQ_SLOT(slotConfigureKLinkStatus()), d->actionCollection, "configure_klinkstatus"); // *************** Help menu ********************* (void) new TDEAction(i18n("About KLinkStatus"), "klinkstatus", - 0, d->part, TQT_SLOT(slotAbout()), + 0, d->part, TQ_SLOT(slotAbout()), d->actionCollection, "about_klinkstatus"); (void) new TDEAction(i18n("&Report Bug..."), 0, 0, d->part, - TQT_SLOT(slotReportBug()), d->actionCollection, "report_bug"); + TQ_SLOT(slotReportBug()), d->actionCollection, "report_bug"); // *************** View menu ********************* } @@ -133,7 +133,7 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession) // *************** File menu ********************* TDEAction* action = new TDEAction(i18n("E&xport Results as HTML..."), "document-save", 0, - d->tabWidgetSession, TQT_SLOT(slotExportAsHTML()), + d->tabWidgetSession, TQ_SLOT(slotExportAsHTML()), d->actionCollection, "file_export_html"); action->setEnabled(false); @@ -142,38 +142,38 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession) // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget TDEToggleAction* toggle_action = new TDEToggleAction(i18n("&Follow last Link checked"), "make_tdevelop", "Ctrl+f", - d->tabWidgetSession, TQT_SLOT(slotFollowLastLinkChecked()), + d->tabWidgetSession, TQ_SLOT(slotFollowLastLinkChecked()), d->actionCollection, "follow_last_link_checked"); toggle_action->setChecked(KLSConfig::followLastLinkChecked()); // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget toggle_action = new TDEToggleAction(i18n("&Hide Search Panel"), "go-bottom", "Ctrl+h", - d->tabWidgetSession, TQT_SLOT(slotHideSearchPanel()), + d->tabWidgetSession, TQ_SLOT(slotHideSearchPanel()), d->actionCollection, "hide_search_bar"); KGuiItem item(i18n("&Show Search Panel"), "go-top", "Show Search Panel"); toggle_action->setCheckedState(item); new TDEAction(i18n("&Reset Search Options"), "reload", "F5", - d->tabWidgetSession, TQT_SLOT(slotResetSearchOptions()), + d->tabWidgetSession, TQ_SLOT(slotResetSearchOptions()), d->actionCollection, "reset_search_bar"); // *************** Search menu ********************* toggle_action = new TDEToggleAction(i18n("&Start Search"), "media-playback-start", "Ctrl+s", - d->tabWidgetSession, TQT_SLOT(slotStartSearch()), + d->tabWidgetSession, TQ_SLOT(slotStartSearch()), d->actionCollection, "start_search"); toggle_action->setEnabled(false); toggle_action = new TDEToggleAction(i18n("&Pause Search"), "media-playback-pause", "Ctrl+p", - d->tabWidgetSession, TQT_SLOT(slotPauseSearch()), + d->tabWidgetSession, TQ_SLOT(slotPauseSearch()), d->actionCollection, "pause_search"); toggle_action->setEnabled(false); action = new TDEAction(i18n("St&op Search"), "media-playback-stop", "Ctrl+c", - d->tabWidgetSession, TQT_SLOT(slotStopSearch()), + d->tabWidgetSession, TQ_SLOT(slotStopSearch()), d->actionCollection, "stop_search"); action->setEnabled(false); } diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 82572997..1f36c485 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -97,16 +97,16 @@ void LinkChecker::check() t_job_->addMetaData("SendUserAgent", "false"); - TQObject::connect(t_job_, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::connect(t_job_, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); - TQObject::connect(t_job_, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::connect(t_job_, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), - this, TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); - - TQTimer::singleShot( time_out_ * 1000, this, TQT_SLOT(slotTimeOut()) ); + TQObject::connect(t_job_, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(t_job_, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); + TQObject::connect(t_job_, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(t_job_, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + this, TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); + + TQTimer::singleShot( time_out_ * 1000, this, TQ_SLOT(slotTimeOut()) ); t_job_->setInteractive(false); } diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 45fdc24b..e05087d1 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -191,11 +191,11 @@ void SearchManager::checkRoot() LinkChecker* checker = new LinkChecker(&root_, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); + connect(checker, TQ_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); /* - connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), - this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); + connect(checker, TQ_SIGNAL(jobFinnished(LinkChecker *)), + this, TQ_SLOT(slotLinkCheckerFinnished(LinkChecker *))); */ checker->check(); } @@ -524,11 +524,11 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links) LinkChecker* checker = new LinkChecker(ls, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); + connect(checker, TQ_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); /* - connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), - this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); + connect(checker, TQ_SIGNAL(jobFinnished(LinkChecker *)), + this, TQ_SLOT(slotLinkCheckerFinnished(LinkChecker *))); */ checker->check(); } diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index b5ac9619..6a24578f 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -149,12 +149,12 @@ void Global::execCommand(TQString const& command) self()->process_PS_ = new TDEProcess(); *(self()->process_PS_) << TQStringList::split(" ",command); - connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(processExited(TDEProcess*)), - self(), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(processExited(TDEProcess*)), + self(), TQ_SLOT(slotProcessExited(TDEProcess*))); //if TDEProcess fails I think a message box is needed... I will fix it if (!self()->process_PS_->start(TDEProcess::NotifyOnExit,TDEProcess::All)) @@ -164,8 +164,8 @@ void Global::execCommand(TQString const& command) { //To avoid lock-ups, start a timer. TQTimer* timer = new TQTimer(self()); - connect(timer, TQT_SIGNAL(timeout()), - self(), TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + self(), TQ_SLOT(slotProcessTimeout())); timer->start(120*1000, true); self()->loop_started_ = true; kapp->enter_loop(); diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 1e069117..7a125bb5 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -97,7 +97,7 @@ void KLinkStatus::load(const KURL& url) void KLinkStatus::setupActions() { - // KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + // KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); // The above causes a segfault when using File->Quit. // Here's Waldo's explanation: /* I had a look. The problem is due to the SessionWidget destructor calling @@ -113,13 +113,13 @@ void KLinkStatus::setupActions() administration. The easiest solution is to call close() on the mainwindow instead of TDEApplication::quit()*/ - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); - //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - //m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + //m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + //m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KLinkStatus::setupPartActions() @@ -199,8 +199,8 @@ void KLinkStatus::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/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index bf8e1db7..6b379387 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -153,7 +153,7 @@ void KLinkStatusPart::slotConfigureKLinkStatus() dialog->addPage(new ConfigIdentificationDialog(0), i18n("Identification"), "agent", i18n("Configure the way KLinkstatus reports itself")); dialog->show(); - connect(dialog, TQT_SIGNAL(settingsChanged()), tabwidget_, TQT_SLOT(slotLoadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), tabwidget_, TQ_SLOT(slotLoadSettings())); } void KLinkStatusPart::slotAbout() diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index 888526a3..1ae0c449 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -53,12 +53,12 @@ DocumentRootDialog::DocumentRootDialog(TQWidget *parent, TQString const& url) m_urlRequester->setMode(KFile::Directory); // enableButtonOK(false); - connect(m_urlRequester, TQT_SIGNAL(textChanged (const TQString &)), - this, TQT_SLOT(slotTextChanged (const TQString &))); - connect(m_urlRequester, TQT_SIGNAL(returnPressed (const TQString &)), - this, TQT_SLOT(slotReturnPressed (const TQString &))); - connect(m_urlRequester, TQT_SIGNAL(urlSelected (const TQString &)), - this, TQT_SLOT(slotTextChanged (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(textChanged (const TQString &)), + this, TQ_SLOT(slotTextChanged (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(returnPressed (const TQString &)), + this, TQ_SLOT(slotReturnPressed (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(urlSelected (const TQString &)), + this, TQ_SLOT(slotTextChanged (const TQString &))); } DocumentRootDialog::~DocumentRootDialog() diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index cdcf1a59..21de0de3 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -32,8 +32,8 @@ KLSHistoryCombo::KLSHistoryCombo(TQWidget *parent, const char *name) setDuplicatesEnabled(false); setAutoCompletion(false); - connect(this, TQT_SIGNAL(activated(const TQString& )), - this, TQT_SLOT(addToHistory(const TQString& ))); + connect(this, TQ_SIGNAL(activated(const TQString& )), + this, TQ_SLOT(addToHistory(const TQString& ))); } KLSHistoryCombo::~KLSHistoryCombo() diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 3b6e6603..adea6013 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -73,8 +73,8 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) d->layout->addWidget(searchLabel); d->searchLine = new KLineEdit(this, "searchline"); - connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotSearchStringChanged(const TQString &))); + connect(d->searchLine, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); d->layout->addWidget(d->searchLine); @@ -101,13 +101,13 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list")); TQToolTip::add( d->searchCombo, i18n("Choose what kind of link status to show in result list")); - connect(clearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT(slotClearSearch()) ); + connect(clearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT(slotClearSearch()) ); - connect(d->searchCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSearchComboChanged(int))); + connect(d->searchCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSearchComboChanged(int))); - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotActivateSearch())); } ResultsSearchBar::~ResultsSearchBar() diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 2ad6867b..b1072add 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -81,13 +81,13 @@ SessionWidget::SessionWidget(int max_simultaneous_connections, int time_out, init(); slotLoadSettings(); - connect(combobox_url, TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotEnableCheckButton( const TQString & ) ) ); + connect(combobox_url, TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotEnableCheckButton( const TQString & ) ) ); - connect(tree_view, TQT_SIGNAL( clicked ( TQListViewItem * ) ), - this, TQT_SLOT( showBottomStatusLabel( TQListViewItem * ) ) ); + connect(tree_view, TQ_SIGNAL( clicked ( TQListViewItem * ) ), + this, TQ_SLOT( showBottomStatusLabel( TQListViewItem * ) ) ); - connect(&bottom_status_timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearBottomStatusLabel()) ); + connect(&bottom_status_timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearBottomStatusLabel()) ); } SessionWidget::~SessionWidget() @@ -107,14 +107,14 @@ void SessionWidget::init() pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("document-open", TDEIcon::Small)); TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("document-open", TDEIcon::Small); pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8); - connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog())); + connect(pushbutton_url, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChooseUrlDialog())); resultsSearchBar->hide(); start_search_action_ = static_cast<TDEToggleAction*> (action_manager_->action("start_search")); - connect(resultsSearchBar, TQT_SIGNAL(signalSearch(LinkMatcher)), - this, TQT_SLOT(slotApplyFilter(LinkMatcher))); + connect(resultsSearchBar, TQ_SIGNAL(signalSearch(LinkMatcher)), + this, TQ_SLOT(slotApplyFilter(LinkMatcher))); } void SessionWidget::slotLoadSettings(bool modify_current_widget_settings) @@ -154,20 +154,20 @@ void SessionWidget::newSearchManager() this, "search_manager"); Q_ASSERT(search_manager_); - connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); - connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); - connect(search_manager_, TQT_SIGNAL(signalSearchFinished()), - this, TQT_SLOT(slotSearchFinished())); - connect(search_manager_, TQT_SIGNAL(signalSearchPaused()), - this, TQT_SLOT(slotSearchPaused())); - connect(search_manager_, TQT_SIGNAL(signalAddingLevelTotalSteps(uint)), - this, TQT_SLOT(slotAddingLevelTotalSteps(uint))); - connect(search_manager_, TQT_SIGNAL(signalAddingLevelProgress()), - this, TQT_SLOT(slotAddingLevelProgress())); - connect(search_manager_, TQT_SIGNAL(signalLinksToCheckTotalSteps(uint)), - this, TQT_SLOT(slotLinksToCheckTotalSteps(uint))); + connect(search_manager_, TQ_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); + connect(search_manager_, TQ_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); + connect(search_manager_, TQ_SIGNAL(signalSearchFinished()), + this, TQ_SLOT(slotSearchFinished())); + connect(search_manager_, TQ_SIGNAL(signalSearchPaused()), + this, TQ_SLOT(slotSearchPaused())); + connect(search_manager_, TQ_SIGNAL(signalAddingLevelTotalSteps(uint)), + this, TQ_SLOT(slotAddingLevelTotalSteps(uint))); + connect(search_manager_, TQ_SIGNAL(signalAddingLevelProgress()), + this, TQ_SLOT(slotAddingLevelProgress())); + connect(search_manager_, TQ_SIGNAL(signalLinksToCheckTotalSteps(uint)), + this, TQ_SLOT(slotLinksToCheckTotalSteps(uint))); } void SessionWidget::setColumns(TQStringList const& colunas) diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp index 31906ace..b7d7800f 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp +++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp @@ -37,7 +37,7 @@ ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *parent, const c slotDefaultUA(); } - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultUA())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultUA())); } diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 4a886e1d..28ac2aa0 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -67,8 +67,8 @@ TableLinkstatus::TableLinkstatus(TQWidget * parent, const char * name, sub_menu_ = new TQPopupMenu(this, "sub_menu_referrers"); - connect(this, TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& )), - this, TQT_SLOT( slotPopupContextMenu( int, int, const TQPoint&)) ); + connect(this, TQ_SIGNAL( contextMenuRequested ( int, int, const TQPoint& )), + this, TQ_SLOT( slotPopupContextMenu( int, int, const TQPoint&)) ); } TableLinkstatus::~TableLinkstatus() @@ -274,14 +274,14 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers, if(!is_root) { - sub_menu_->insertItem(i18n("All"), this, TQT_SLOT(slotEditReferrersWithQuanta())); + sub_menu_->insertItem(i18n("All"), this, TQ_SLOT(slotEditReferrersWithQuanta())); sub_menu_->insertSeparator(); for(uint i = 0; i != referrers.size(); ++i) { sub_menu_->insertItem(referrers[i].prettyURL()); } - connect(sub_menu_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEditReferrerWithQuanta(int))); + connect(sub_menu_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEditReferrerWithQuanta(int))); context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Edit Referrer with Quanta"), sub_menu_); @@ -293,21 +293,21 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers, } context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"), - this, TQT_SLOT(slotViewUrlInBrowser())); + this, TQ_SLOT(slotViewUrlInBrowser())); context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open Referrer URL"), - this, TQT_SLOT(slotViewParentUrlInBrowser())); + this, TQ_SLOT(slotViewParentUrlInBrowser())); context_table_menu_.insertSeparator(); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"), - this, TQT_SLOT(slotCopyUrlToClipboard())); + this, TQ_SLOT(slotCopyUrlToClipboard())); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Referrer URL"), - this, TQT_SLOT(slotCopyParentUrlToClipboard())); + this, TQ_SLOT(slotCopyParentUrlToClipboard())); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Cell Text"), - this, TQT_SLOT(slotCopyCellTextToClipboard())); + this, TQ_SLOT(slotCopyCellTextToClipboard())); } void TableLinkstatus::slotCopyUrlToClipboard() const diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 9ed1aef5..e2f6a54f 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -55,7 +55,7 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) TQToolButton* tabs_new = new TQToolButton(this); tabs_new->setAccel(TQKeySequence("Ctrl+N")); - connect(tabs_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewSession())); + connect(tabs_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewSession())); tabs_new->setIconSet(SmallIconSet("tab_new_raised")); tabs_new->adjustSize(); TQToolTip::add(tabs_new, i18n("Open new tab")); @@ -63,13 +63,13 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) tabs_close_ = new TQToolButton(this); tabs_close_->setAccel(TQKeySequence("Ctrl+W")); - connect(tabs_close_, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeSession())); + connect(tabs_close_, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeSession())); tabs_close_->setIconSet(SmallIconSet("tab_remove")); tabs_close_->adjustSize(); TQToolTip::add(tabs_close_, i18n("Close the current tab")); setCornerWidget(tabs_close_, TopRight); - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*))); } TabWidgetSession::~TabWidgetSession() @@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession() { // TODO: settings: number of connections, timeout SessionWidget* session_widget = newSessionWidget(); - connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)), - this, TQT_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*))); + connect(session_widget, TQ_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)), + this, TQ_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*))); insertTab(session_widget, i18n("Session") + i18n(TQString::number(count() + 1).ascii())); diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index 52e7883b..c0cebe68 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -54,8 +54,8 @@ TreeView::TreeView(TQWidget *parent, const char *name) sub_menu_ = new TQPopupMenu(this, "sub_menu_referrers"); - connect(this, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotPopupContextMenu( TQListViewItem *, const TQPoint &, int )) ); + connect(this, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( slotPopupContextMenu( TQListViewItem *, const TQPoint &, int )) ); } @@ -345,14 +345,14 @@ void TreeView::loadContextTableMenu(TQValueVector<KURL> const& referrers, bool i if(!is_root) { - sub_menu_->insertItem(i18n("All"), this, TQT_SLOT(slotEditReferrersWithQuanta())); + sub_menu_->insertItem(i18n("All"), this, TQ_SLOT(slotEditReferrersWithQuanta())); sub_menu_->insertSeparator(); for(uint i = 0; i != referrers.size(); ++i) { sub_menu_->insertItem(referrers[i].prettyURL()); } - connect(sub_menu_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEditReferrerWithQuanta(int))); + connect(sub_menu_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEditReferrerWithQuanta(int))); context_table_menu_.insertItem(SmallIconSet("edit"), i18n("Edit Referrer with Quanta"), sub_menu_); @@ -365,21 +365,21 @@ void TreeView::loadContextTableMenu(TQValueVector<KURL> const& referrers, bool i } context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"), - this, TQT_SLOT(slotViewUrlInBrowser())); + this, TQ_SLOT(slotViewUrlInBrowser())); context_table_menu_.insertItem(/*SmallIconSet("document-open"), */i18n("Open Referrer URL"), - this, TQT_SLOT(slotViewParentUrlInBrowser())); + this, TQ_SLOT(slotViewParentUrlInBrowser())); context_table_menu_.insertSeparator(); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"), - this, TQT_SLOT(slotCopyUrlToClipboard())); + this, TQ_SLOT(slotCopyUrlToClipboard())); context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Referrer URL"), - this, TQT_SLOT(slotCopyParentUrlToClipboard())); + this, TQ_SLOT(slotCopyParentUrlToClipboard())); context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Cell Text"), - this, TQT_SLOT(slotCopyCellTextToClipboard())); + this, TQ_SLOT(slotCopyCellTextToClipboard())); } TreeViewItem* TreeView::myItem(TQListViewItem* item) const diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 13bdaa4c..bc3b2a21 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -76,8 +76,8 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQTool const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(TQt::Orientation)), - this, TQT_SLOT(setOrientation(TQt::Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -201,7 +201,7 @@ void QDesignerToolBar::findFormWindow() void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); if ( a->inherits( "TQActionGroup" ) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); @@ -998,7 +998,7 @@ void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e ) popupMenu->close(); } e->accept(); - TQTimer::singleShot( 0, this, TQT_SLOT(createPopupMenu()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(createPopupMenu()) ); return; } mousePressed = true; @@ -1217,7 +1217,7 @@ TQPoint QDesignerPopupMenu::calcIndicatorPos( const TQPoint &pos ) void QDesignerPopupMenu::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); } void QDesignerPopupMenu::actionRemoved() diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 8e54da57..3b5df0e8 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -44,17 +44,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( false ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( i18n("New &Action" ), this, TQT_SLOT( newAction() ) ); - popup->insertItem( i18n("New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); - popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); + popup->insertItem( i18n("New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( i18n("New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); - connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); - connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); - connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); - connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 78b883b0..ab7517f7 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -30,8 +30,8 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) header()->setStretchEnabled( true ); setRootIsDecorated( true ); setSorting( -1 ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) diff --git a/kommander/editor/assistproc.cpp b/kommander/editor/assistproc.cpp index 8fbf61f3..580b2b2d 100644 --- a/kommander/editor/assistproc.cpp +++ b/kommander/editor/assistproc.cpp @@ -23,14 +23,14 @@ AssistProc::AssistProc( TQObject *parent, const char *name, const TQString &path : TQProcess( parent, name ) { assistantPath = path; - connect( this, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(processOutput()) ); - connect( this, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(processErrOutput()) ); + connect( this, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(processOutput()) ); + connect( this, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(processErrOutput()) ); } AssistProc::~AssistProc() { tryTerminate(); - TQTimer::singleShot( 5000, this, TQT_SLOT(kill())); // If busy, kill in 5 sec... + TQTimer::singleShot( 5000, this, TQ_SLOT(kill())); // If busy, kill in 5 sec... } bool AssistProc::run( const TQString &path ) diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index f42acc2b..93e33b17 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -138,7 +138,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction = view->actionCollection()->action("tools_toggle_write_lock"); popup->insertSeparator(); highlightPopup = new TDEPopupMenu(popup); - connect(highlightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotHighlightingChanged(int))); + connect(highlightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotHighlightingChanged(int))); popup->insertItem(i18n("&Highlighting"), highlightPopup); @@ -151,13 +151,13 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction->activate(); setWidget(a_widget); - connect(doc, TQT_SIGNAL(textChanged()), TQT_SLOT(textEditChanged())); - connect(widgetsComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(widgetChanged(int))); - connect(stateComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(stateChanged(int))); - connect(filePushButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFile())); - connect(functionButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFunction())); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(insertWidgetName(int))); - connect(treeWidgetButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectWidget())); + connect(doc, TQ_SIGNAL(textChanged()), TQ_SLOT(textEditChanged())); + connect(widgetsComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(widgetChanged(int))); + connect(stateComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(stateChanged(int))); + connect(filePushButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFile())); + connect(functionButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFunction())); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(insertWidgetName(int))); + connect(treeWidgetButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectWidget())); view->setFocus(); } diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index 62f545a0..f399b8b5 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -32,8 +32,8 @@ ChooseWidget::ChooseWidget(TQWidget* a_parent, const char* a_name, bool a_modal) : ChooseWidgetBase(a_parent, a_name, a_modal) { - connect( nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( widgetView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(selectedItem(TQListViewItem*))); + connect( nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( widgetView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(selectedItem(TQListViewItem*))); widgetView->setFullWidth(true); widgetView->addColumn(i18n("Widgets")); widgetView->setRootIsDecorated(true); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 6612e49f..8d15c885 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -1611,7 +1611,7 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { TQObjectList clo = action->childrenListObject(); if (!clo.isEmpty()) { @@ -1635,7 +1635,7 @@ void AddActionToToolBarCommand::execute() } } toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } @@ -1649,7 +1649,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { @@ -1701,13 +1701,13 @@ void AddActionToPopupCommand::execute() } } popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } else { if ( !action->inherits( "QDesignerAction" ) || ( (QDesignerAction*)action )->supportsMenu() ) { action->addTo( popup ); popup->insertAction( index, action ); popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } } } @@ -1716,7 +1716,7 @@ void AddActionToPopupCommand::unexecute() { action->removeFrom( popup ); popup->removeAction( action ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( popup ); } else { diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 05c1dc4c..e9ae6738 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -128,16 +128,16 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r updateDisconnectButton(); // Connections - connect(comboSender, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(senderChanged(const TQString&))); - connect(comboReceiver, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(receiverChanged(const TQString&))); - connect(signalBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(slotBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(connectButton, TQT_SIGNAL(clicked()), TQT_SLOT(connectClicked())); - connect(disconnectButton, TQT_SIGNAL(clicked()), TQT_SLOT(disconnectClicked())); - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(okClicked())); - connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(cancelClicked())); - connect(signalBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); - connect(slotBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); + connect(comboSender, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(senderChanged(const TQString&))); + connect(comboReceiver, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(receiverChanged(const TQString&))); + connect(signalBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(slotBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(connectButton, TQ_SIGNAL(clicked()), TQ_SLOT(connectClicked())); + connect(disconnectButton, TQ_SIGNAL(clicked()), TQ_SLOT(disconnectClicked())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(okClicked())); + connect(cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(cancelClicked())); + connect(signalBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); + connect(slotBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); } ConnectionEditor::~ConnectionEditor() diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index ac0aad5a..347eacf5 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -13,15 +13,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp index c82e961d..874918d3 100644 --- a/kommander/editor/formfile.cpp +++ b/kommander/editor/formfile.cpp @@ -45,15 +45,15 @@ FormFile::FormFile(const TQString &fn, bool temp) : filename(fn), fileNameTemp(temp), fw(0) { - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } void FormFile::init() { - connect(this, TQT_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileAdded(FormFile*))); - connect(this, TQT_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileRemoved(FormFile*))); + connect(this, TQ_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileAdded(FormFile*))); + connect(this, TQ_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileRemoved(FormFile*))); emit addedFormFile(this); } diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index c511fc55..81489695 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -143,26 +143,26 @@ void FormWindow::init() setFocusPolicy(TQWidget::ClickFocus); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer(this, "checkSelectionsTimer"); - connect(checkSelectionsTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(invalidCheckedSelections())); + connect(checkSelectionsTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(invalidCheckedSelections())); updatePropertiesTimer = new TQTimer(this); - connect(updatePropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updatePropertiesTimerDone())); + connect(updatePropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updatePropertiesTimerDone())); showPropertiesTimer = new TQTimer(this); - connect(showPropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(showPropertiesTimerDone())); + connect(showPropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(showPropertiesTimerDone())); selectionChangedTimer = new TQTimer(this); - connect(selectionChangedTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(selectionChangedTimerDone())); + connect(selectionChangedTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(selectionChangedTimerDone())); insertParent = 0; - connect(&commands, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); + connect(&commands, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); propShowBlocked = false; setIcon(PixmapChooser::loadPixmap("form.xpm", PixmapChooser::Mini)); - connect(&commands, TQT_SIGNAL(modificationChanged(bool)), - this, TQT_SLOT(modificationChanged(bool))); + connect(&commands, TQ_SIGNAL(modificationChanged(bool)), + this, TQ_SLOT(modificationChanged(bool))); buffer = 0; TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this); @@ -2604,6 +2604,6 @@ void FormWindow::setFormFile(FormFile *f) { ff = f; if (ff) - connect(this, TQT_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQT_SLOT(formWindowChangedSomehow())); + connect(this, TQ_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQ_SLOT(formWindowChangedSomehow())); } #include "formwindow.moc" diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index c1c3f41d..88521a97 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -49,11 +49,11 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict<TQWidget>& a_w copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", TDEIcon::Toolbar)); groupComboBox->insertStringList(SpecialInformation::groups()); - connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(functionListBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(functionChanged(int))); - connect(copyButton, TQT_SIGNAL(clicked()), TQT_SLOT(copyText())); - connect(clearButton, TQT_SIGNAL(clicked()), insertedText, TQT_SLOT(clear())); + connect(groupComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(functionListBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(functionChanged(int))); + connect(copyButton, TQ_SIGNAL(clicked()), TQ_SLOT(copyText())); + connect(clearButton, TQ_SIGNAL(clicked()), insertedText, TQ_SLOT(clear())); // build widget name list for (TQDictIterator<TQWidget> It(m_widgetList); It.current(); ++It) diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index 75b001b5..b6113d37 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -193,18 +193,18 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = true; setColumnWidthMode( 1, Manual ); @@ -502,8 +502,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) } else { if ( !tabWidgetMenu ) tabWidgetMenu = - formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQT_SLOT( addTabPage() ), - TQT_SLOT( removeTabPage() ) ); + formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp index 2fe8eed4..97c7514a 100644 --- a/kommander/editor/iconvieweditorimpl.cpp +++ b/kommander/editor/iconvieweditorimpl.cpp @@ -34,7 +34,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 05354a84..84e4dabb 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -134,8 +134,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp index 047bc4f8..32c94d95 100644 --- a/kommander/editor/listboxeditorimpl.cpp +++ b/kommander/editor/listboxeditorimpl.cpp @@ -35,7 +35,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, true ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp index 83422997..8021d242 100644 --- a/kommander/editor/listvieweditorimpl.cpp +++ b/kommander/editor/listvieweditorimpl.cpp @@ -40,7 +40,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( false ); itemChoosePixmap->setEnabled( false ); itemDeletePixmap->setEnabled( false ); diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index f9dbac46..fd5059ec 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -129,7 +129,7 @@ MainWindow::MainWindow(bool asClient) docPath(TQTDOCDIR), client(asClient), databaseAutoEdit(false), previewing(false) { m_partManager = new KParts::PartManager(this); - //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); + //connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); init_colors(); inDebugMode = true; //debugging kommander @@ -177,7 +177,7 @@ MainWindow::MainWindow(bool asClient) as -= TQSize(30, 30); resize(TQSize(1200, 1000).boundedTo(as)); - connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); + connect(kapp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); clipboardChanged(); layoutChilds = false; layoutSelected = false; @@ -204,7 +204,7 @@ MainWindow::MainWindow(bool asClient) SpecialInformation::registerSpecials(); backupTimer = new TQTimer(this); - connect(backupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateBackups())); + connect(backupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateBackups())); backupTimer->start(1000*60*5); //fire it every five minutes //createGUI(0); @@ -235,8 +235,8 @@ void MainWindow::setupMDI() PixmapChooser::NoSize)); qworkspace->setPaletteBackgroundColor(TQColor(238, 238, 238)); qworkspace->setScrollBarsEnabled(true); - connect(qworkspace, TQT_SIGNAL(windowActivated(TQWidget *)), - this, TQT_SLOT(activeWindowChanged(TQWidget *))); + connect(qworkspace, TQ_SIGNAL(windowActivated(TQWidget *)), + this, TQ_SLOT(activeWindowChanged(TQWidget *))); lastActiveFormWindow = 0; qworkspace->setAcceptDrops(true); } @@ -294,7 +294,7 @@ void MainWindow::setupWorkspace() QCompletionEdit *edit = new QCompletionEdit(vbox); TQToolTip::add(edit, i18n("Start typing the buffer you want to switch to here (ALT+B)")); TQAccel *a = new TQAccel(this); - a->connectItem(a->insertItem(ALT + Key_B), edit, TQT_SLOT(setFocus())); + a->connectItem(a->insertItem(ALT + Key_B), edit, TQ_SLOT(setFocus())); wspace = new Workspace(vbox, this); wspace->setBufferEdit(edit); dw->setWidget(vbox); @@ -460,11 +460,11 @@ void MainWindow::runForm() TDEProcess* process = new TDEProcess; process->setUseShell(true); (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName()); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStdout(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStderr(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(closeRunningForm(TDEProcess*))); messageLog->clear(MessageLog::All); previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } @@ -613,7 +613,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } lastPressWidget = (TQWidget*)o; if (passiveInteractor) - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); if (currentTool() == CONNECT_TOOL) return true; return !passiveInteractor; @@ -629,7 +629,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) ((FormWindow*)w)->handleMouseRelease((TQMouseEvent*)e, ((FormWindow*)w)->designerWidget(o)); if (passiveInteractor) { selectionChanged(); - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); } return !passiveInteractor; case TQEvent::MouseMove: @@ -803,16 +803,16 @@ void MainWindow::insertFormWindow(FormWindow *fw) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.")); - connect(fw, TQT_SIGNAL(showProperties(TQObject *)), - this, TQT_SLOT(showProperties(TQObject *))); - connect(fw, TQT_SIGNAL(updateProperties(TQObject *)), - this, TQT_SLOT(updateProperties(TQObject *))); - connect(this, TQT_SIGNAL(currentToolChanged()), - fw, TQT_SLOT(currentToolChanged())); - connect(fw, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(selectionChanged())); - connect(fw, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); + connect(fw, TQ_SIGNAL(showProperties(TQObject *)), + this, TQ_SLOT(showProperties(TQObject *))); + connect(fw, TQ_SIGNAL(updateProperties(TQObject *)), + this, TQ_SLOT(updateProperties(TQObject *))); + connect(this, TQ_SIGNAL(currentToolChanged()), + fw, TQ_SLOT(currentToolChanged())); + connect(fw, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(selectionChanged())); + connect(fw, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); fw->show(); fw->currentToolChanged(); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index fff01afd..d10c0c2f 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -92,77 +92,77 @@ int forms = 0; void MainWindow::setupEditActions() { - actionEditUndo = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection()); + actionEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); actionEditUndo->setText(i18n("&Undo: Not Available")); actionEditUndo->setToolTip(i18n("Undoes the last action")); actionEditUndo->setWhatsThis(whatsThisFrom("Edit|Undo")); actionEditUndo->setEnabled(false); - actionEditRedo = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection()); + actionEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); actionEditRedo->setText(i18n("&Redo: Not Available")); actionEditRedo->setToolTip(i18n("Redoes the last undone operation")); actionEditRedo->setWhatsThis(whatsThisFrom("Edit|Redo")); actionEditRedo->setEnabled(false); - actionEditCut = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection()); + actionEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection()); actionEditCut->setToolTip(i18n("Cuts the selected widgets and puts them on the clipboard")); actionEditCut->setWhatsThis(whatsThisFrom("Edit|Cut")); actionEditCut->setEnabled(false); - actionEditCopy = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection()); + actionEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); actionEditCopy->setToolTip(i18n("Copies the selected widgets to the clipboard")); actionEditCopy->setWhatsThis(whatsThisFrom("Edit|Copy")); actionEditCopy->setEnabled(false); - actionEditPaste = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection()); + actionEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection()); actionEditPaste->setToolTip(i18n("Pastes the clipboard's contents")); actionEditPaste->setWhatsThis(whatsThisFrom("Edit|Paste")); actionEditPaste->setEnabled(false); - actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQT_SLOT(editDelete()), + actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete"); actionEditDelete->setToolTip(i18n("Deletes the selected widgets")); actionEditDelete->setWhatsThis(whatsThisFrom("Edit|Delete")); actionEditDelete->setEnabled(false); - actionEditSelectAll = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection()); + actionEditSelectAll = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection()); actionEditSelectAll->setToolTip(i18n("Selects all widgets")); actionEditSelectAll->setWhatsThis(whatsThisFrom("Edit|Select All")); actionEditRaise = new TDEAction(i18n("Bring to Front"), createIconSet("editraise.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editRaise()), actionCollection(), "edit_raise"); + TDEShortcut::null(), this, TQ_SLOT(editRaise()), actionCollection(), "edit_raise"); actionEditRaise->setToolTip(i18n("Raises the selected widgets")); actionEditRaise->setEnabled(false); actionEditLower = new TDEAction(i18n("Send to Back"), createIconSet("editlower.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editLower()), actionCollection(), "edit_lower"); + TDEShortcut::null(), this, TQ_SLOT(editLower()), actionCollection(), "edit_lower"); actionEditLower->setToolTip(i18n("Lowers the selected widgets")); actionEditLower->setWhatsThis(i18n("Lowers the selected widgets")); actionEditLower->setEnabled(false); - actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); + actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQ_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); actionEditFindGlobal->setToolTip(i18n("Search for a text in the whole form.")); actionEditFindGlobal->setWhatsThis(whatsThisFrom("Edit|Find in Form")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQ_SLOT(setEnabled(bool))); - actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), + actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_check_accel"); actionEditAccels->setToolTip(i18n("Checks if the accelerators used in the form are unique")); actionEditAccels->setWhatsThis(whatsThisFrom("Edit|Check Accelerator")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQ_SLOT(setEnabled(bool))); actionEditConnections = new TDEAction(i18n("Connections"), createIconSet("connecttool.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editConnections()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections"); actionEditConnections->setToolTip(i18n("Opens a dialog for editing connections")); actionEditConnections->setWhatsThis(whatsThisFrom("Edit|Connections")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQ_SLOT(setEnabled(bool))); actionEditFormSettings = new TDEAction(i18n("Form Settings..."), TDEShortcut::null(), - this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_form"); + this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_form"); actionEditFormSettings->setToolTip(i18n("Opens a dialog to change the form's settings")); actionEditFormSettings->setWhatsThis(whatsThisFrom("Edit|Form Settings")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQ_SLOT(setEnabled(bool))); TDEToolBar *tb = new TDEToolBar(this, "Edit"); tb->setFullSize(false); @@ -198,50 +198,50 @@ void MainWindow::setupEditActions() void MainWindow::setupLayoutActions() { actionEditAdjustSize = new TDEAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"), - CTRL + Key_J, this, TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); + CTRL + Key_J, this, TQ_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); actionEditAdjustSize->setToolTip(i18n("Adjusts the size of the selected widget")); actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size")); actionEditAdjustSize->setEnabled(false); actionEditHLayout = new TDEAction(i18n("Lay Out Horizontally"), createIconSet("edithlayout.xpm"), - CTRL + Key_H, this, TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); + CTRL + Key_H, this, TQ_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally")); actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally")); actionEditHLayout->setEnabled(false); actionEditVLayout = new TDEAction(i18n("Lay Out Vertically"), createIconSet("editvlayout.xpm"), - CTRL + Key_L, this, TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); + CTRL + Key_L, this, TQ_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically")); actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically")); actionEditVLayout->setEnabled(false); actionEditGridLayout = new TDEAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"), - CTRL + Key_G, this, TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); + CTRL + Key_G, this, TQ_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); actionEditGridLayout->setToolTip(i18n("Lays out the selected widgets in a grid")); actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid")); actionEditGridLayout->setEnabled(false); actionEditSplitHorizontal = new TDEAction(i18n("Lay Out Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutHorizontalSplit()), actionCollection(), "edit_split_h"); actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter")); actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally in Splitter")); actionEditSplitHorizontal->setEnabled(false); actionEditSplitVertical = new TDEAction(i18n("Lay Out Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"), - TDEShortcut::null(), this, TQT_SLOT(editLayoutVerticalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutVerticalSplit()), actionCollection(), "edit_split_v"); actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter")); actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically (in Splitter)")); actionEditSplitVertical->setEnabled(false); actionEditBreakLayout = new TDEAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"), - CTRL + Key_B, this, TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); + CTRL + Key_B, this, TQ_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout")); actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout")); int id = WidgetDatabase::idFromClassName("Spacer"); - TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQT_SLOT(toolSelected()), + TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(id).latin1()); a->setExclusiveGroup("tool"); a->setText(i18n("Add ") + WidgetDatabase::className(id)); @@ -280,21 +280,21 @@ void MainWindow::setupLayoutActions() void MainWindow::setupToolActions() { actionPointerTool = new TDEToggleAction(i18n("Pointer"), "arrow", Key_F2, - this, TQT_SLOT(toolSelected()), actionCollection(), + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(POINTER_TOOL).latin1()); actionPointerTool->setToolTip(i18n("Selects the pointer tool")); actionPointerTool->setWhatsThis(whatsThisFrom("Tools|Pointer")); actionPointerTool->setExclusiveGroup("tool"); actionConnectTool = new TDEToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"), - Key_F3, this, TQT_SLOT(toolSelected()), actionCollection(), + Key_F3, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(CONNECT_TOOL).latin1()); actionConnectTool->setToolTip(i18n("Selects the connection tool")); actionConnectTool->setWhatsThis(whatsThisFrom("Tools|Connect Signals and Slots")); actionConnectTool->setExclusiveGroup("tool"); actionOrderTool = new TDEToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"), - Key_F4, this, TQT_SLOT(toolSelected()), actionCollection(), + Key_F4, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(ORDER_TOOL).latin1()); actionOrderTool->setToolTip(i18n("Selects the tab order tool")); actionOrderTool->setWhatsThis(whatsThisFrom("Tools|Tab Order")); @@ -344,7 +344,7 @@ void MainWindow::setupToolActions() if (WidgetDatabase::group(i) != grp) continue; // only widgets, i.e. not forms and temp stuff TDEToggleAction *a = new TDEToggleAction(WidgetDatabase::className(i), TDEShortcut::null(), - this, TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); a->setExclusiveGroup("tool"); TQString atext = WidgetDatabase::className(i); if (atext[0] == 'Q') @@ -390,7 +390,7 @@ void MainWindow::setupToolActions() continue; TQString name = fi->baseName(); name = name.replace("_", " "); - editMenu->insertItem(name, this, TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count()); + editMenu->insertItem(name, this, TQ_SLOT(editExternalTool(int)), 0, m_editorTools.count()); m_editorTools.append(fi->filePath()); } } @@ -410,54 +410,54 @@ void MainWindow::setupFileActions() fileMenu = new TQPopupMenu(this, "File"); menuBar()->insertItem(i18n("&File"), fileMenu); - TDEAction *a = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + TDEAction *a = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); a->setToolTip(i18n("Creates a new dialog")); a->setWhatsThis(whatsThisFrom("File|New")); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + a = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); a->setToolTip(i18n("Opens an existing dialog")); a->setWhatsThis(whatsThisFrom("File|Open")); a->plug(fileTb); a->plug(fileMenu); - actionRecent = KStdAction::openRecent(this, TQT_SLOT(fileOpenRecent(const KURL&)), actionCollection()); + actionRecent = KStdAction::openRecent(this, TQ_SLOT(fileOpenRecent(const KURL&)), actionCollection()); actionRecent->setToolTip(i18n("Opens recently open file")); actionRecent->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); + a = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); a->setToolTip(i18n("Closes the current dialog")); a->setWhatsThis(whatsThisFrom("File|Close")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + a = KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); a->setToolTip(i18n("Saves the current dialog")); a->setWhatsThis(whatsThisFrom("File|Save")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + a = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); a->setToolTip(i18n("Saves the current dialog with a new filename")); a->setWhatsThis(whatsThisFrom("File|Save As")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); - a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQT_SLOT(fileSaveAll()), + a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQ_SLOT(fileSaveAll()), actionCollection(), "file_close_all"); a->setToolTip(i18n("Saves all open dialogs")); a->setWhatsThis(whatsThisFrom("File|Save All")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection()); + a = KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs")); a->setWhatsThis(whatsThisFrom("File|Exit")); a->plug(fileMenu); @@ -470,10 +470,10 @@ void MainWindow::setupRunActions() menuBar()->insertItem(i18n("&Run"), menu); TDEAction* a = new TDEAction(i18n("Run Dialog"), "system-run", CTRL + Key_R, - this, TQT_SLOT(runForm()), actionCollection(), "run"); + this, TQ_SLOT(runForm()), actionCollection(), "run"); a->setToolTip(i18n("Executes dialog")); a->setWhatsThis(whatsThisFrom("Run|Run dialog")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(menu); } @@ -485,39 +485,39 @@ void MainWindow::setupWindowActions() { windowActionsSetup = true; - TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace, TQT_SLOT(tile()), + TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace, TQ_SLOT(tile()), actionCollection(), "window_tile"); actionWindowTile->setToolTip(i18n("Tiles the windows so that they are all visible")); actionWindowTile->setWhatsThis(whatsThisFrom("Window|Tile")); - TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQT_SLOT(cascade()), + TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(cascade()), actionCollection(), "window_cascade"); actionWindowCascade->setToolTip(i18n("Cascades the windows so that all their title bars are visible")); actionWindowCascade->setWhatsThis(whatsThisFrom("Window|Cascade")); - TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQT_SLOT(closeActiveWindow()), + TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(closeActiveWindow()), actionCollection(), "window_close"); actionWindowClose->setToolTip(i18n("Closes the active window")); actionWindowClose->setWhatsThis(whatsThisFrom("Window|Close")); TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), qworkspace, - TQT_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); + TQ_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); actionWindowCloseAll->setToolTip(i18n("Closes all form windows")); actionWindowCloseAll->setWhatsThis(whatsThisFrom("Window|Close All")); TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, qworkspace, - TQT_SLOT(activateNextWindow()), actionCollection(), "window_next"); + TQ_SLOT(activateNextWindow()), actionCollection(), "window_next"); actionWindowNext->setToolTip(i18n("Activates the next window")); actionWindowNext->setWhatsThis(whatsThisFrom("Window|Next")); TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, qworkspace, - TQT_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); + TQ_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); actionWindowPrevious->setToolTip(i18n("Activates the previous window")); actionWindowPrevious->setWhatsThis(whatsThisFrom("Window|Previous")); windowMenu = new TDEPopupMenu(this, "Window"); menuBar()->insertItem(i18n("&Window"), windowMenu); - connect(windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(setupWindowActions())); + connect(windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(setupWindowActions())); actionWindowClose->plug(windowMenu); actionWindowCloseAll->plug(windowMenu); @@ -554,7 +554,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem(itemText, this, TQT_SLOT(windowsMenuActivated(int))); + int id = windowMenu->insertItem(itemText, this, TQ_SLOT(windowsMenuActivated(int))); windowMenu->setItemParameter(id, i); windowMenu->setItemChecked(id, qworkspace->activeWindow() == windows.at(i)); } @@ -564,21 +564,21 @@ void MainWindow::setupWindowActions() void MainWindow::setupSettingsActions() { TDEPopupMenu *settings = new TDEPopupMenu(this, "Settings"); - TDEAction* a = KStdAction::keyBindings(this, TQT_SLOT(editShortcuts()), actionCollection()); + TDEAction* a = KStdAction::keyBindings(this, TQ_SLOT(editShortcuts()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change shortcuts")); a->plug(settings); - a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQT_SLOT(editPlugins()), + a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQ_SLOT(editPlugins()), actionCollection(), "configure_plugins"); a->setToolTip(i18n("Opens a dialog to configure plugins")); a->plug(settings); - a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQT_SLOT(configureEditor()), + a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQ_SLOT(configureEditor()), actionCollection(), "configure_editor"); a->setToolTip(i18n("Configure various aspects of this editor.")); a->plug(settings); - a = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); + a = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change preferences")); a->setWhatsThis(whatsThisFrom("Edit|Preferences")); a->plug(settings); @@ -780,7 +780,7 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText(i18n("NewTemplate")); - connect(dia.buttonCreate, TQT_SIGNAL(clicked()), this, TQT_SLOT(createNewTemplate())); + connect(dia.buttonCreate, TQ_SIGNAL(clicked()), this, TQ_SLOT(createNewTemplate())); dia.exec(); } @@ -1090,7 +1090,7 @@ void MainWindow::editPreferences() statusBar()->message(i18n("Edit preferences...")); Preferences *dia = new Preferences(this, 0, true); prefDia = dia; - connect(dia->helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(dia->helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); dia->buttonColor->setEditor(StyledButton::ColorEditor); dia->buttonPixmap->setEditor(StyledButton::PixmapEditor); dia->checkBoxShowGrid->setChecked(sGrid); @@ -1111,7 +1111,7 @@ void MainWindow::editPreferences() dia->checkBoxSplash->setChecked(splashScreen); dia->editDocPath->setText(docPath); dia->checkAutoEdit->setChecked(!databaseAutoEdit); - connect(dia->buttonDocPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseDocPath())); + connect(dia->buttonDocPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseDocPath())); if (dia->exec() == TQDialog::Accepted) { @@ -1165,8 +1165,8 @@ void MainWindow::editExternalTool(int id) { TDEProcess* process = new TDEProcess; (*process) << "kmdr-executor" << m_editorTools[id]; - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editToolExited(TDEProcess*))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(editToolOutput(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editToolExited(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(editToolOutput(TDEProcess*, char*, int))); m_toolOutput = '\0'; process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index e6d13a21..cf8bdd25 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -31,19 +31,19 @@ MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name) { m_popupMenu = new TDEPopupMenu(this); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine())); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQT_SLOT(copyContent())); - m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveToFile())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQ_SLOT(copyLine())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQ_SLOT(copyContent())); + m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveToFile())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clearContent())); + m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clearContent())); for (int i = 0; i < m_listCount; i++) { m_lists[i] = new TDEListBox(this); addTab(m_lists[i], m_listNames[i]); m_seenEOL[i] = false; - connect(m_lists[i], TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + connect(m_lists[i], TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); } } diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 2dab19a1..158f5d9e 100644 --- a/kommander/editor/multilineeditorimpl.cpp +++ b/kommander/editor/multilineeditorimpl.cpp @@ -31,7 +31,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : MultiLineEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); mlined = (TQMultiLineEdit*)editWidget; // #### complete list of properties here preview->setAlignment( mlined->alignment() ); diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 51d80432..17e37001 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -138,7 +138,7 @@ void CustomFormItem::insert() NewForm::NewForm(TQWidget *parent, const TQString &templatePath) : NewFormBase(parent, 0, true) { - connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); TQIconViewItem *cur = 0; FormItem *fi = new FormItem(templateView, i18n("Dialog")); diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index e7880b19..eb93c28d 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -63,7 +63,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/kommander/editor/paletteeditorimpl.cpp b/kommander/editor/paletteeditorimpl.cpp index bf68fe16..dd12de19 100644 --- a/kommander/editor/paletteeditorimpl.cpp +++ b/kommander/editor/paletteeditorimpl.cpp @@ -33,7 +33,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index c3440c3f..71fe357c 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -985,7 +985,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T #endif else { PixmapFunction dia( parent, 0, true ); - TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 7f7d30d6..4b0c58e4 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -401,8 +401,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), - listview, TQT_SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, i18n("Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, i18n("Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -594,18 +594,18 @@ TQLineEdit *PropertyTextItem::lined() } else { button = new TQPushButton( i18n("..."), box ); button->setFixedWidth( 20 ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( false ); } - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, TQT_SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - TQT_SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -764,10 +764,10 @@ TQLineEdit *PropertyDoubleItem::lined() lin = new TQLineEdit( listview->viewport() ); lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -846,8 +846,8 @@ TQDateEdit *PropertyDateItem::lined() for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -917,8 +917,8 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -992,8 +992,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1070,8 +1070,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( i18n("False" ) ); comb->insertItem( i18n("True" ) ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1167,8 +1167,8 @@ TQSpinBox *PropertyIntItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1252,8 +1252,8 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { TQObjectList *ol = comb->queryList( "TQLineEdit" ); @@ -1548,8 +1548,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() { @@ -1637,8 +1637,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1758,8 +1758,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2156,8 +2156,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2305,8 +2305,8 @@ TQComboBox *PropertyCursorItem::combo() cur.setMask( cur ); comb->insertItem( cur, i18n("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2397,16 +2397,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( i18n("Property" ) ); addColumn( i18n("Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( toggleSort() ) ); - connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -2941,7 +2941,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return true; } } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; @@ -3280,8 +3280,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( true ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } void EventList::setup() diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 66c9663f..76c3e00a 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -19,8 +19,8 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index 4b96ee49..c35ce642 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -38,7 +38,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( true ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 282fd49e..137934d9 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -28,7 +28,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); diff --git a/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp index 850e7eb2..7782fff3 100644 --- a/kommander/editor/timestamp.cpp +++ b/kommander/editor/timestamp.cpp @@ -28,7 +28,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( false ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 4b07bb37..f4b7eaac 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -1016,7 +1016,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } else if (className == "Spacer") @@ -1159,7 +1159,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page 1")); wiz->addPage(dw, i18n("Page 2")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp index 3dbdec9b..f362a360 100644 --- a/kommander/editor/wizardeditorimpl.cpp +++ b/kommander/editor/wizardeditorimpl.cpp @@ -34,7 +34,7 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); } diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index 5ca2da26..59ed882c 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -136,7 +136,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -154,7 +154,7 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -355,12 +355,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) setPalette( p ); addColumn( i18n("Files" ) ); setAllColumnsShowFocus( true ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( true ); @@ -395,19 +395,19 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); - connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -728,8 +728,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), - this, TQT_SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index ecd9bfac..f27ab90f 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) TDELocale::setMainCatalogue("kommander"); TDEApplication app; - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); if (!args->count()) { KMessageBox::sorry(0, i18n("Error: no dialog given. Use --stdin option to read dialog from standard input.\n")); diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index 1d4fb709..66649ab3 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -66,7 +66,7 @@ bool KommanderPart::openFile() delete m_instance; m_instance = new Instance(0L); m_instance->build(m_url); - TQTimer::singleShot(0, this, TQT_SLOT(slotRun())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRun())); emit setStatusBarText( m_url.prettyURL() ); return true; diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index dd196043..2f34f712 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -35,7 +35,7 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) toolBar->insertButton("document-open", Add, true, i18n("Add") ); toolBar->insertButton("no", Remove, true, i18n("Remove") ); toolBar->insertButton("reload", Refresh, true, i18n("Refresh") ); - connect( toolBar, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(toolButton(int)) ); + connect( toolBar, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(toolButton(int)) ); m_list = new TDEListBox( this ); setCentralWidget(m_list); diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index bf08888a..47db3bd0 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -429,9 +429,9 @@ static ParseNode f_widgetExists(Parser* p, const ParameterList& params) static ParseNode f_connect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); @@ -445,9 +445,9 @@ static ParseNode f_connect(Parser* p, const ParameterList& params) static ParseNode f_disconnect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp index ec360d69..033ea770 100644 --- a/kommander/widget/invokeclass.cpp +++ b/kommander/widget/invokeclass.cpp @@ -24,8 +24,8 @@ void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringLis { TQString invokeName = slot; invokeName = invokeName.mid(invokeName.find('(')); - invokeName.prepend(TQString::number(TQSIGNAL_CODE) + "invoke"); - TQString slotName = TQString::number(TQSLOT_CODE) + slot; + invokeName.prepend(TQString::number(TQ_SIGNAL_CODE) + "invoke"); + TQString slotName = TQString::number(TQ_SLOT_CODE) + slot; connect(this, invokeName.ascii(), object, slotName.ascii()); if (args.count() == 0) diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp index 845cc905..c44ea4a6 100644 --- a/kommander/widget/kmdrmainwindow.cpp +++ b/kommander/widget/kmdrmainwindow.cpp @@ -21,7 +21,7 @@ KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f) : TDEMainWindow(parent, name, f) { - TQTimer::singleShot(10, this, TQT_SIGNAL(initialize())); + TQTimer::singleShot(10, this, TQ_SIGNAL(initialize())); } diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp index 5b56ec8d..943589c7 100644 --- a/kommander/widget/myprocess.cpp +++ b/kommander/widget/myprocess.cpp @@ -85,9 +85,9 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) mProcess = new TDEProcess; (*mProcess) << shellName.latin1(); - connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); if(!mProcess->start(TDEProcess::NotifyOnExit, TDEProcess::All)) { diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index 0b72f3dc..07fb7ed8 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -39,7 +39,7 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); TQObject *parent = this; while (parent->parent() != 0) @@ -48,7 +48,7 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) if (parent->inherits("TQDialog")) break; } - connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); + connect(this, TQ_SIGNAL(clicked()), parent, TQ_SLOT(reject())); } CloseButton::~CloseButton() @@ -105,10 +105,10 @@ void CloseButton::startProcess() KShellProcess *process = new KShellProcess("/bin/sh"); *process << at; - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(endProcess(TDEProcess *))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(endProcess(TDEProcess *))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); if (!process->start(TDEProcess::Block, TDEProcess::Stdout)) diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp index e347cdbe..1bb99c2b 100644 --- a/kommander/widgets/combobox.cpp +++ b/kommander/widgets/combobox.cpp @@ -44,7 +44,7 @@ ComboBox::ComboBox(TQWidget *a_parent, const char *a_name) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(emitWidgetTextChanged(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(emitWidgetTextChanged(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(popupList, "popupList(TQString widget)", i18n("Make the ComboBox expose it's list without mousing around."), 1); diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index 15043c15..9ab99d1f 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -56,7 +56,7 @@ ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); setBlockGUI(Button); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(EB_isOn, "isOn(TQString widget)", i18n("For use only when button is togle type."), 1); @@ -120,7 +120,7 @@ void ExecButton::startProcess() TDEApplication::setOverrideCursor(TQCursor(TQt::WaitCursor)); MyProcess* process = new MyProcess(this); process->setBlocking(m_blockGUI == GUI); - connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); + connect(process, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); m_output = process->run(at); if (m_blockGUI == GUI) { diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index 9be2fd88..f562662c 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -54,7 +54,7 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection())); + connect(m_selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(makeSelection())); setSelectionType(Open); setSelectionOpenMultiple(false); diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp index 48c49f48..dd4a955d 100644 --- a/kommander/widgets/konsole.cpp +++ b/kommander/widgets/konsole.cpp @@ -87,8 +87,8 @@ void Konsole::execute() mSeenEOL = false; mProcess = new MyProcess(this); mProcess->setBlocking(false); - connect(mProcess, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); - connect(mProcess, TQT_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQT_SLOT(processReceivedStdout(MyProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); + connect(mProcess, TQ_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQ_SLOT(processReceivedStdout(MyProcess*, char*, int))); setCursor(TQCursor(TQt::WaitCursor)); mProcess->run(at); } diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp index 08c8b21f..f75526d9 100644 --- a/kommander/widgets/lineedit.cpp +++ b/kommander/widgets/lineedit.cpp @@ -38,8 +38,8 @@ LineEdit::LineEdit(TQWidget *a_parent, const char *a_name) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged(const TQString &)), this, - TQT_SIGNAL(widgetTextChanged(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), this, + TQ_SIGNAL(widgetTextChanged(const TQString &))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(LE_clearModified, "clearModified(TQString widget)", i18n("Clear widget modified status."), 1); diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index e4d26ecd..b24e5956 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -55,7 +55,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name) setHidden(true); m_menu = new TDEPopupMenu(this); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuItemActivated(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(INSERTMENUITEM, "insertMenuItem(TQString widget, TQString text, TQString executeWidget, int index, TQString icon)", i18n("Insert an item into the popup menu. The executeWidget's execute method will be run when this item is selected. Returns the id of the inserted item. Use -1 for index to insert to the end. The icon is optional."), 4, 5); diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index 4c62b167..33127372 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -84,15 +84,15 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextBold = new TQToolButton(m_formatGroup, "textBold"); m_buttonTextBold->setPixmap(TQPixmap((const char **)bold_xpm)); m_buttonTextBold->setToggleButton(true); - connect(m_buttonTextBold, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textBold(bool))); + connect(m_buttonTextBold, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textBold(bool))); m_buttonTextItalic = new TQToolButton(m_formatGroup, "textItalic"); m_buttonTextItalic->setPixmap(TQPixmap((const char **)italic_xpm)); m_buttonTextItalic->setToggleButton(true); - connect(m_buttonTextItalic, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textItalic(bool))); + connect(m_buttonTextItalic, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textItalic(bool))); m_buttonTextUnder = new TQToolButton(m_formatGroup, "textUnder"); m_buttonTextUnder->setPixmap(TQPixmap((const char **)under_xpm)); m_buttonTextUnder->setToggleButton(true); - connect(m_buttonTextUnder, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textUnder(bool))); + connect(m_buttonTextUnder, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textUnder(bool))); m_buttonTextLeft = new TQToolButton(m_alignGroup, "textLeft"); m_buttonTextLeft->setPixmap(TQPixmap((const char **)left_xpm)); @@ -104,11 +104,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextRight->setPixmap(TQPixmap((const char **)right_xpm)); m_buttonTextRight->setToggleButton(true); - connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int))); - connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &))); - connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int))); + connect(m_alignGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(textAlign(int))); + connect(m_textedit, TQ_SIGNAL(currentFontChanged(const TQFont &)), this, TQ_SLOT(fontChanged(const TQFont &))); + connect(m_textedit, TQ_SIGNAL(currentAlignmentChanged(int)), this, TQ_SLOT(alignmentChanged(int))); - connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(m_textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); } diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp index 292ac541..66c8770b 100644 --- a/kommander/widgets/subdialog.cpp +++ b/kommander/widgets/subdialog.cpp @@ -39,7 +39,7 @@ SubDialog::SubDialog(TQWidget *a_parent, const char *a_name) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(showDialog())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(showDialog())); } @@ -103,7 +103,7 @@ void SubDialog::showDialog() if(!m_dialog) { kdWarning() << "Creation of sub dialog failed .." << endl; - connect(m_dialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished())); + connect(m_dialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFinished())); m_dialog->exec(); } diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index be607aa4..ad5f06d9 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -50,7 +50,7 @@ KommanderWidget(this) setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TE_setModified, "setModified(TQString widget, bool Modified)", i18n("Set widget modified status."), 1); diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp index c5f1f6ce..ea39706c 100644 --- a/kommander/widgets/timer.cpp +++ b/kommander/widgets/timer.cpp @@ -57,7 +57,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name) mTimer = new TQTimer(this); setInterval(5000); setSingleShot(false); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(SetInterval, "setInterval(TQString widget, int interval)", i18n("Set the timer timeout interval in ms."), 2); @@ -148,7 +148,7 @@ void Timer::timeout() void Timer::execute() { if (mSingleShot) - TQTimer::singleShot(mInterval, this, TQT_SLOT(timeout())); + TQTimer::singleShot(mInterval, this, TQ_SLOT(timeout())); else mTimer->start(mInterval); } diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp index fd2c0703..0ae537de 100644 --- a/kommander/widgets/wizard.cpp +++ b/kommander/widgets/wizard.cpp @@ -41,7 +41,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(runHelp())); + connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(runHelp())); } Wizard::~Wizard() diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index bdc8affd..aaeca1fd 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -65,7 +65,7 @@ KXsldbg::KXsldbg() if (help_menu) { help_menu->insertItem(SmallIconSet("contents"), i18n("&XSLDbg Handbook"), this, - TQT_SLOT(showXSLDbgHelp()), 0, -1, 1); + TQ_SLOT(showXSLDbgHelp()), 0, -1, 1); } } } @@ -102,14 +102,14 @@ bool KXsldbg::closeURL() void KXsldbg::setupActions() { - TDEAction *act = KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - connect(act, TQT_SIGNAL(activated()), this, TQT_SLOT(quit())); + TDEAction *act = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + connect(act, TQ_SIGNAL(activated()), this, TQ_SLOT(quit())); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KXsldbg::saveProperties(TDEConfig* /*config*/) @@ -159,8 +159,8 @@ void KXsldbg::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/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index 31f50267..d83b6be4 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -102,149 +102,149 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, docDictionary.setAutoDelete(true); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); // set our XML-UI resource file setXMLFile("kxsldbg_part.rc"); (void) new TDEAction( i18n("Configure Editor..."), "configure", 0, - this, TQT_SLOT(configureEditorCmd_activated()), + this, TQ_SLOT(configureEditorCmd_activated()), actionCollection(), "configureEditorCmd" ); (void) new TDEAction( i18n("Configure..."), "configure", Key_C, - this, TQT_SLOT(configureCmd_activated()), + this, TQ_SLOT(configureCmd_activated()), actionCollection(), "configureCmd" ); (void) new TDEAction( i18n("Inspect..."), "edit-find", Key_I, - this, TQT_SLOT(inspectorCmd_activated()), + this, TQ_SLOT(inspectorCmd_activated()), actionCollection(), "inspectCmd" ); // Motions commands (void) new TDEAction( i18n("Run"), "system-run", Key_F5, - this, TQT_SLOT(runCmd_activated()), + this, TQ_SLOT(runCmd_activated()), actionCollection(), "runCmd" ); (void) new TDEAction( i18n("Continue"), "1downarrow", Key_F4, - this, TQT_SLOT(continueCmd_activated()), + this, TQ_SLOT(continueCmd_activated()), actionCollection(), "continueCmd" ); (void) new TDEAction( i18n("Step"), "step", Key_F8, - this, TQT_SLOT(stepCmd_activated()), + this, TQ_SLOT(stepCmd_activated()), actionCollection(), "stepCmd" ); (void) new TDEAction( i18n("Next"), "next", Key_F10, - this, TQT_SLOT(nextCmd_activated()), + this, TQ_SLOT(nextCmd_activated()), actionCollection(), "nextCmd" ); (void) new TDEAction( i18n("Step Up"), "xsldbg_stepup", Key_F6, - this, TQT_SLOT(stepupCmd_activated()), + this, TQ_SLOT(stepupCmd_activated()), actionCollection(), "stepupCmd" ); (void) new TDEAction( i18n("Step Down"), "xsldbg_stepdown", Key_F7, - this, TQT_SLOT(stepCmd_activated()), + this, TQ_SLOT(stepCmd_activated()), actionCollection(), "stepdownCmd" ); // Breakpoint commands (void) new TDEAction( i18n("Break"), "xsldbg_break", Key_F2, - this, TQT_SLOT(breakCmd_activated()), + this, TQ_SLOT(breakCmd_activated()), actionCollection(), "breakCmd" ); (void) new TDEAction( i18n("Enable/Disable"), "xsldbg_enable", Key_F3, - this, TQT_SLOT(enableCmd_activated()), + this, TQ_SLOT(enableCmd_activated()), actionCollection(), "enableCmd" ); (void) new TDEAction( i18n("Delete"), "xsldbg_delete", Key_Delete, - this, TQT_SLOT(deleteCmd_activated()), + this, TQ_SLOT(deleteCmd_activated()), actionCollection(), "deleteCmd" ); (void) new TDEAction( i18n("&Source"), "xsldbg_source", Key_S, - this, TQT_SLOT(sourceCmd_activated()), + this, TQ_SLOT(sourceCmd_activated()), actionCollection(), "sourceCmd" ); (void) new TDEAction( i18n("&Data"), "xsldbg_data", Key_D, - this, TQT_SLOT(dataCmd_activated()), + this, TQ_SLOT(dataCmd_activated()), actionCollection(), "dataCmd" ); (void) new TDEAction( i18n("&Output"), "xsldbg_output", Key_O, - this, TQT_SLOT(outputCmd_activated()), + this, TQ_SLOT(outputCmd_activated()), actionCollection(), "outputCmd" ); (void) new TDEAction( i18n("Reload Current File From Disk"), "xsldbg_refresh", CTRL + Key_F5, - this, TQT_SLOT(refreshCmd_activated()), + this, TQ_SLOT(refreshCmd_activated()), actionCollection(), "refreshCmd" ); /* tracing and walking */ (void) new TDEAction( i18n("Walk Through Stylesheet..."), Key_W, - this, TQT_SLOT(walkCmd_activated()), + this, TQ_SLOT(walkCmd_activated()), actionCollection(), "walkCmd" ); (void) new TDEAction( i18n("Stop Wal&king Through Stylesheet"), Key_K, - this, TQT_SLOT(walkStopCmd_activated()), + this, TQ_SLOT(walkStopCmd_activated()), actionCollection(), "walkStopCmd" ); (void) new TDEAction( i18n("Tr&ace Execution of Stylesheet"), Key_A, - this, TQT_SLOT(traceCmd_activated()), + this, TQ_SLOT(traceCmd_activated()), actionCollection(), "traceCmd" ); (void) new TDEAction( i18n("Stop Tracing of Stylesheet"), Key_K, - this, TQT_SLOT(traceStopCmd_activated()), + this, TQ_SLOT(traceStopCmd_activated()), actionCollection(), "traceStopCmd" ); (void) new TDEAction( i18n("&Evaluate Expression..."), Key_E, - this, TQT_SLOT(evaluateCmd_activated()), + this, TQ_SLOT(evaluateCmd_activated()), actionCollection(), "evaluateCmd" ); (void) new TDEAction( i18n("Goto &XPath..."), Key_X, - this, TQT_SLOT(gotoXPathCmd_activated()), + this, TQ_SLOT(gotoXPathCmd_activated()), actionCollection(), "gotoXPathCmd" ); (void) new TDEAction( i18n("Lookup SystemID..."), 0, - this, TQT_SLOT(slotLookupSystemID()), + this, TQ_SLOT(slotLookupSystemID()), actionCollection(), "lookupSystemID" ); (void) new TDEAction( i18n("Lookup PublicID..."), 0, - this, TQT_SLOT(slotLookupPublicID()), + this, TQ_SLOT(slotLookupPublicID()), actionCollection(), "lookupPublicID" ); (void) new TDEAction( i18n("Quit"), 0, CTRL + Key_Q, - this, TQT_SLOT(quit()), + this, TQ_SLOT(quit()), actionCollection(), "file_quit" ); /* (void) new TDEAction( i18n("Exit KXsldbg"), "xsldbg_output", CTRL + Key_Q, - this, TQT_SLOT(exitCmd_activated()), + this, TQ_SLOT(exitCmd_activated()), actionCollection(), "exitCmd" ); */ - connect( xPathBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotGotoXPath() ) ); - connect( evaluateBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEvaluate() ) ); + connect( xPathBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotGotoXPath() ) ); + connect( evaluateBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotEvaluate() ) ); /* - connect( searchBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSearch() ) ); + connect( searchBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSearch() ) ); */ /* We must have a valid debugger and inspector */ createInspector(); @@ -312,7 +312,7 @@ bool KXsldbgPart::fetchURL(const KURL &url) if (docPtr->kateView()){ mainView->addWidget(docPtr->kateView()); Kate::View *v = Kate::view((docPtr->kateView())); - connect(v, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(v, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); } } @@ -470,13 +470,13 @@ void KXsldbgPart::createInspector() debugger = new XsldbgDebugger(); TQ_CHECK_PTR( debugger ); if ( debugger != 0L ) { - connect(debugger, TQT_SIGNAL( debuggerReady()), - this, TQT_SLOT(debuggerStarted())); + connect(debugger, TQ_SIGNAL( debuggerReady()), + this, TQ_SLOT(debuggerStarted())); if (outputview){ connect(debugger, - TQT_SIGNAL( showMessage(TQString /* msg*/)), + TQ_SIGNAL( showMessage(TQString /* msg*/)), outputview, - TQT_SLOT(slotProcShowMessage(TQString /* msg*/))); + TQ_SLOT(slotProcShowMessage(TQString /* msg*/))); } inspector = new XsldbgInspector( debugger ); TQ_CHECK_PTR( inspector ); @@ -484,31 +484,31 @@ void KXsldbgPart::createInspector() if (inspector != 0L){ /*process line number and/or file name changed */ connect(debugger, - TQT_SIGNAL(lineNoChanged + TQ_SIGNAL(lineNoChanged (TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ), this, - TQT_SLOT(lineNoChanged + TQ_SLOT(lineNoChanged ( TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ) ); connect(debugger, - TQT_SIGNAL(breakpointItem(TQString /* fileName*/, + TQ_SIGNAL(breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */)), this, - TQT_SLOT( breakpointItem(TQString /* fileName*/, + TQ_SLOT( breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */))); - connect(debugger, TQT_SIGNAL(resolveItem(TQString /*URI*/)), - this, TQT_SLOT(slotProcResolveItem(TQString /*URI*/))); + connect(debugger, TQ_SIGNAL(resolveItem(TQString /*URI*/)), + this, TQ_SLOT(slotProcResolveItem(TQString /*URI*/))); } } } diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index e4fafe5d..1b7580ca 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -18,8 +18,8 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); - connect(kDoc, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(lockDoc())); - connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); + connect(kDoc, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(lockDoc())); + connect(kDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(unlockDoc())); if (kDoc){ kView = kDoc->createView(parent, "QXsldbgDocView"); KURL cleanUrl; diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp index 453b4f60..e7716a0b 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp @@ -30,16 +30,16 @@ XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger, : XsldbgBreakpoints(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(breakpointItem(TQString /* file*/, + connect(debugger, TQ_SIGNAL(breakpointItem(TQString /* file*/, int /*line number */, TQString /*templateName*/, TQString /* modeName*/, bool /* enabled */, int /* id */)), - this, TQT_SLOT(slotProcBreakpointItem(TQString /* file*/, + this, TQ_SLOT(slotProcBreakpointItem(TQString /* file*/, int /*line number */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */))); - connect( breakpointListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect( breakpointListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp index 9a500b6c..85a2b012 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp @@ -27,10 +27,10 @@ XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(callStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */)), - this, TQT_SLOT(slotProcCallStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */))); - connect( callStackListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(callStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */)), + this, TQ_SLOT(slotProcCallStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */))); + connect( callStackListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp index ade07c6e..18fa6f29 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp @@ -78,10 +78,10 @@ XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger, : XsldbgConfig(parent, name) { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), - this, TQT_SLOT(slotProcParameterItem(TQString /* name*/, TQString /* value */))); - connect(debugger, TQT_SIGNAL(fileDetailsChanged()), - this, TQT_SLOT(slotReloadFileNames())); + connect(debugger, TQ_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), + this, TQ_SLOT(slotProcParameterItem(TQString /* name*/, TQString /* value */))); + connect(debugger, TQ_SIGNAL(fileDetailsChanged()), + this, TQ_SLOT(slotReloadFileNames())); paramIndex= 0; catalogs = false; debug = false; diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp index a9521964..c926eca1 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp @@ -213,7 +213,7 @@ void XsldbgDebugger::slotConfigure() if(inspector == 0L ){ inspector = new XsldbgInspector(this); - connect(inspector, TQT_SIGNAL(closedWindow()), this, TQT_SLOT(slotConfigClosed())); + connect(inspector, TQ_SIGNAL(closedWindow()), this, TQ_SLOT(slotConfigClosed())); } } diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp index 03f21618..576696db 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp @@ -29,15 +29,15 @@ XsldbgEntitiesImpl::XsldbgEntitiesImpl(XsldbgDebugger *debugger, { this->debugger = debugger; connect(debugger, - TQT_SIGNAL(entityItem(TQString /*SystemID*/, + TQ_SIGNAL(entityItem(TQString /*SystemID*/, TQString /*PublicID*/)), this, - TQT_SLOT(slotProcEntityItem(TQString /*SystemID*/, + TQ_SLOT(slotProcEntityItem(TQString /*SystemID*/, TQString /*PublicID*/))); connect( entitiesListView, - TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp index 235c564a..69affd1e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp @@ -28,10 +28,10 @@ XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, : XsldbgGlobalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), - this, TQT_SLOT(slotProcGlobalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */))); - connect( varsListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), + this, TQ_SLOT(slotProcGlobalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */))); + connect( varsListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp index 8b1a2734..7db6ce20 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp +++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp @@ -145,10 +145,10 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, XsldbgInspectorLayout->addMultiCellLayout( Layout1, 1, 1, 0, 1 ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonApply, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( update() ) ); - connect( buttonRefresh, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( refresh() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonApply, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( update() ) ); + connect( buttonRefresh, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( refresh() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); hide(); } diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp index 7f3e857d..5926734e 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp @@ -31,14 +31,14 @@ XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, : XsldbgLocalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, + connect(debugger, TQ_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */, TQString /* select XPath */, int /* is it a local variable */)), - this, TQT_SLOT(slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, + this, TQ_SLOT(slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */, TQString /* select XPath */, int /* is it a local variable */))); - connect(varsListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(varsListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp index f291ab6d..3bad8a51 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp @@ -28,11 +28,11 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, : XsldbgSources(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), - this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); + connect(debugger, TQ_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), + this, TQ_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); - connect( sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect( sourceListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp index 66cb9227..2c0de0e9 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp @@ -27,10 +27,10 @@ XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */)), - this, TQT_SLOT(slotProcTemplateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */))); - connect( templatesListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */)), + this, TQ_SLOT(slotProcTemplateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */))); + connect( templatesListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index 1189b0f3..e8752b41 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -233,28 +233,28 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) TQToolTip::add( closeButton, i18n("Close") ); closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked())); + connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked())); dockbackButton = new KDockButton_Private( this, "DockbackButton" ); TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack())); d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" ); TQToolTip::add( d->toDesktopButton, i18n("Detach") ); d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); + connect( d->toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop())); stayButton->hide(); d->dummy = new TQWidget( this ); @@ -528,7 +528,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP setIcon( pixmap); widget = 0L; - TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); + TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) ); applyToWidget( parent, TQPoint(0,0) ); } @@ -1109,7 +1109,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if ( dockPos == KDockWidget::DockCenter ) { KDockTabGroup* tab = new KDockTabGroup( newDock, "_dock_tab"); - TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*))); + TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*))); newDock->setWidget( tab ); target->applyToWidget( tab ); @@ -1544,15 +1544,15 @@ void KDockWidget::setFormerBrotherDockWidget(KDockWidget *dockWidget) { formerBrotherDockWidget = dockWidget; if( formerBrotherDockWidget ) - TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); } void KDockWidget::loseFormerBrotherDockWidget() { if( formerBrotherDockWidget ) - TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; repaint(); } @@ -1642,8 +1642,8 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) menu = new TQPopupMenu(); #endif - connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) ); - connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) ); + connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) ); + connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) ); childDock = new TQObjectList(); childDock->setAutoDelete( false ); diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp index 55b47449..06a3481a 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp @@ -76,25 +76,25 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) if (((KDockWidget*)child0)->forcedFixedWidth()!=-1) { setForcedFixedWidth(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedWidth()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } else if (((KDockWidget*)child1)->forcedFixedWidth()!=-1) { setForcedFixedWidth(((KDockWidget*)child1),((KDockWidget*)child1)->forcedFixedWidth()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } if (((KDockWidget*)child0)->forcedFixedHeight()!=-1) { setForcedFixedHeight(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedHeight()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } else if (((KDockWidget*)child1)->forcedFixedHeight()!=-1) { setForcedFixedHeight(((KDockWidget*)child1),((KDockWidget*)child1)->forcedFixedHeight()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp index bca89218..dd339c61 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp @@ -43,12 +43,12 @@ KTabBar::KTabBar( TQWidget *parent, const char *name ) setMouseTracking( true ); mEnableCloseButtonTimer = new TQTimer( this ); - connect( mEnableCloseButtonTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( enableCloseButton() ) ); + connect( mEnableCloseButtonTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( enableCloseButton() ) ); mActivateDragSwitchTabTimer = new TQTimer( this ); - connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); + connect( mActivateDragSwitchTabTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQ_SIGNAL(layoutChanged()), TQ_SLOT(onLayoutChange())); } KTabBar::~KTabBar() @@ -200,7 +200,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mEnableCloseButtonTimer->start( TQApplication::doubleClickInterval(), true ); } mHoverCloseButtonTab = t; - connect( mHoverCloseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( closeButtonClicked() ) ); + connect( mHoverCloseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( closeButtonClicked() ) ); return; } } diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp index 00156067..abb0a447 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp @@ -55,16 +55,16 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f ) setTabBar( new KTabBar(this, "tabbar") ); setAcceptDrops( true ); - connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & ))); - connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int ))); - connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int ))); - connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int ))); - connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * ))); - connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int ))); - connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int ))); + connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & ))); + connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int ))); + connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int ))); + connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int ))); + connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * ))); + connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int ))); + connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int ))); #ifndef TQT_NO_WHEELEVENT - connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int ))); + connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int ))); #endif } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index 73542532..54eba787 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp @@ -138,10 +138,10 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" ); m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMaximize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( undockPressed() ) ); m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) ); if ( m_pIconButtonPixmap->isNull() ) @@ -540,8 +540,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) } m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); setGeometry( m_restoredRect ); break; case Normal: @@ -566,8 +566,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) // reset to maximize-captionbar m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); m_pMinimize->setPixmap( *m_pMinButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR + m_pCaption->heightHint(); @@ -795,7 +795,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) linkChildren( pFocPolDict ); - TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::connect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() ) setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); @@ -814,7 +814,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) if ( !m_pClient ) return ; - TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::disconnect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); //reparent to desktop widget , no flags , point , show it TQDict<TQWidget::FocusPolicy>* pFocPolDict; @@ -1234,11 +1234,11 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) { - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); - m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQT_SLOT( minimizePressed() ) ); - m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQ_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() == Normal ) m_pSystemMenu->setItemEnabled( m_pSystemMenu->idAt( 0 ), false ); else if ( state() == Maximized ) @@ -1256,20 +1256,20 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const else { if ( state() != Normal ) - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() != Minimized ) - m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQT_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQ_SLOT( minimizePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); if ( state() == Normal ) - m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); } - m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQT_SLOT( undockPressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQ_SLOT( undockPressed() ) ); m_pSystemMenu->insertSeparator(); - m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQT_SLOT( closePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQ_SLOT( closePressed() ) ); return m_pSystemMenu; } @@ -1301,8 +1301,8 @@ void KMdiChildFrm::switchToMinimizeLayout() // temporary use of minimize button for restore function m_pMinimize->setPixmap( *m_pRestoreButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); // resizing resize( 300, minimumHeight() ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp index 11056c57..76d3b56e 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp @@ -610,7 +610,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * widg = ( TQWidget* ) o; ++it; widg->installEventFilter( this ); - connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) ); + connect( widg, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slot_childDestroyed() ) ); TQWidget::FocusPolicy wfp = widg->focusPolicy(); if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h index c8f5302f..90e5f3ae 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h @@ -94,7 +94,7 @@ class KMdiChildViewPrivate; * flags = KMdi::Hide; * } * // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels - * connect( m_pParent, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(initKeyAccel(TQWidget*)) ); + * connect( m_pParent, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(initKeyAccel(TQWidget*)) ); * * m_pParent->addWindow( pMDICover, flags); * // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses) diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp index 558f11c0..738711e7 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp @@ -220,7 +220,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_overlapButtons.insert( w, btn ); btn->setOn( !isOverlapMode() ); - connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeOverlapMode() ) ); } m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() ); @@ -228,7 +228,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() << " to the tabbar" << endl; - connect( m_tb->tab( tab ), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( tabClicked( int ) ) ); + connect( m_tb->tab( tab ), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( tabClicked( int ) ) ); mTabCnt++; m_inserted = tab; @@ -610,7 +610,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) if ( it.key() ->name() == raise ) { m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising " << it.key()->name() << endl; break; } @@ -618,7 +618,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); } void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix ) @@ -742,7 +742,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) kapp->syncX();*/ m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising" << it.key() ->name() << endl; break; } @@ -750,7 +750,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); cfg->setGroup( grp ); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp index c8a92e34..0f8b5396 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp @@ -20,7 +20,7 @@ KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const ch setHoverCloseButton( true ); #endif - connect( this, TQT_SIGNAL( closeRequest( TQWidget* ) ), this, TQT_SLOT( closeTab( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( closeRequest( TQWidget* ) ), this, TQ_SLOT( closeTab( TQWidget* ) ) ); } KMdiDocumentViewTabWidget::~KMdiDocumentViewTabWidget() diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp index 68983b6f..edabbae4 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp @@ -33,7 +33,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) m_list.insert( w, w->focusPolicy() ); w->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; - connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + connect( w, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); TQObjectList *l = w->queryList( "TQWidget" ); TQObjectListIt it( *l ); TQObject *obj; @@ -43,7 +43,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) m_list.insert( wid, wid->focusPolicy() ); wid->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl; - connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + connect( wid, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); ++it; } delete l; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index 5261525a..d718601b 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -63,9 +63,9 @@ ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShort { if ( m_dw ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); - connect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - connect( m_dw, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); + connect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + connect( m_dw, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotWidgetDestroyed() ) ); setChecked( m_dw->mayBeHide() ); } } @@ -104,8 +104,8 @@ void ToggleToolViewAction::slotToggled( bool t ) void ToggleToolViewAction::slotWidgetDestroyed() { - disconnect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - disconnect( this, TQT_SIGNAL( toggled( bool ) ), 0, 0 ); + disconnect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + disconnect( this, TQ_SIGNAL( toggled( bool ) ), 0, 0 ); unplugAll(); deleteLater(); } @@ -116,8 +116,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c { m_mdiMode = KMdi::ChildframeMode; m_mdiMainFrm = mdiMainFrm; - connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -143,27 +143,27 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c TQStringList modes; modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" ); m_mdiModeAction->setItems( modes ); - connect( m_mdiModeAction, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( changeViewMode( int ) ) ); + connect( m_mdiModeAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( changeViewMode( int ) ) ); } else m_mdiModeAction = 0; - connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), - this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); + connect( m_mdiMainFrm, TQ_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), + this, TQ_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQ_SIGNAL( toggleTop() ), actionCollection(), "tdemdi_activate_top" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQ_SIGNAL( toggleLeft() ), actionCollection(), "tdemdi_activate_left" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQ_SIGNAL( toggleRight() ), actionCollection(), "tdemdi_activate_right" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQ_SIGNAL( toggleBottom() ), actionCollection(), "tdemdi_activate_bottom" ) ); m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQ_SLOT( prevToolViewInDock() ), actionCollection(), "tdemdi_prev_toolview" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ), actionCollection(), "tdemdi_next_toolview" ) ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -225,7 +225,7 @@ void KMDIGUIClient::setupActions() // m_toolBars = builder.toolBars(); // m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString(), 0, - // this, TQT_SLOT(blah()),actionCollection(),"nothing")); + // this, TQ_SLOT(blah()),actionCollection(),"nothing")); TQPtrList<TDEAction> addList; if ( m_toolViewActions.count() < 3 ) @@ -265,7 +265,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) ( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) ); #endif - connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) ); + connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) ); m_toolViewActions.append( a ); m_toolMenu->insert( a ); mtva->d->action = a; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp index 74a4a9ca..779e3388 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp @@ -208,7 +208,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pWindowMenu = new TQPopupMenu( this, "window_menu" ); m_pWindowMenu->setCheckable( true ); - TQObject::connect( m_pWindowMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillWindowMenu() ) ); + TQObject::connect( m_pWindowMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillWindowMenu() ) ); m_pDockMenu = new TQPopupMenu( this, "dock_menu" ); m_pDockMenu->setCheckable( true ); @@ -224,7 +224,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod #else 0, #endif - this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); + this, TQ_SLOT(closeActiveView()), actionCollection(), "window_close"); // the MDI view taskbar createTaskBar(); @@ -255,11 +255,11 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod // drag end timer m_pDragEndTimer = new TQTimer(); - connect( m_pDragEndTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( dragEndTimeOut() ) ); - connect( guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); - connect( guiFactory(), TQT_SIGNAL( clientRemoved( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); + connect( m_pDragEndTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( dragEndTimeOut() ) ); + connect( guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); + connect( guiFactory(), TQ_SIGNAL( clientRemoved( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); } void KMdiMainFrm::verifyToplevelHeight() @@ -277,21 +277,21 @@ void KMdiMainFrm::verifyToplevelHeight() void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) { m_mdiGUIClient = new KMDIPrivate::KMDIGUIClient( this, showModeMenu ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleTop() ), this, TQT_SIGNAL( toggleTop() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleLeft() ), this, TQT_SIGNAL( toggleLeft() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleRight() ), this, TQT_SIGNAL( toggleRight() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleBottom() ), this, TQT_SIGNAL( toggleBottom() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleTop() ), this, TQ_SIGNAL( toggleTop() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleLeft() ), this, TQ_SIGNAL( toggleLeft() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleRight() ), this, TQ_SIGNAL( toggleRight() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleBottom() ), this, TQ_SIGNAL( toggleBottom() ) ); if ( m_mdiMode == KMdi::IDEAlMode ) { if ( m_topContainer ) - connect( this, TQT_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_leftContainer ) - connect( this, TQT_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_rightContainer ) - connect( this, TQT_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_bottomContainer ) - connect( this, TQT_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQ_SLOT( toggle() ) ); } emit mdiModeHasBeenChangedTo( m_mdiMode ); @@ -369,16 +369,16 @@ void KMdiMainFrm::createMdiManager() kdDebug(760) << k_funcinfo << "creating MDI manager" << endl; m_pMdi = new KMdiChildArea( this ); setCentralWidget( m_pMdi ); - TQObject::connect( m_pMdi, TQT_SIGNAL( nowMaximized( bool ) ), - this, TQT_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), - this, TQT_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), - this, TQT_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( popupWindowMenu( TQPoint ) ), - this, TQT_SLOT( popupWindowMenu( TQPoint ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( lastChildFrmClosed() ), - this, TQT_SIGNAL( lastChildFrmClosed() ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( nowMaximized( bool ) ), + this, TQ_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), + this, TQ_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), + this, TQ_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( popupWindowMenu( TQPoint ) ), + this, TQ_SLOT( popupWindowMenu( TQPoint ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( lastChildFrmClosed() ), + this, TQ_SIGNAL( lastChildFrmClosed() ) ); } //============ createTaskBar ==============// @@ -464,14 +464,14 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) d->closeWindowAction->setEnabled(true); // common connections used when under MDI control - TQObject::connect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( activated( KMdiChildView* ) ), this, TQT_SIGNAL( viewActivated( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( deactivated( KMdiChildView* ) ), this, TQT_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( activated( KMdiChildView* ) ), this, TQ_SIGNAL( viewActivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( deactivated( KMdiChildView* ) ), this, TQ_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); if ( index == -1 ) m_pDocumentViews->append( pWnd ); @@ -481,7 +481,7 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) if ( m_pTaskBar ) { KMdiTaskBarButton* but = m_pTaskBar->addWinButton( pWnd ); - TQObject::connect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } // embed the view depending on the current MDI mode @@ -493,8 +493,8 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) m_documentTabWidget->insertTab( pWnd, pixmap, pWnd->tabCaption(), index ); - connect( pWnd, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pWnd, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pWnd, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pWnd, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } else { @@ -742,19 +742,19 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) if ( m_pWinList->count() == 0 ) m_pCurrentWindow = 0L; - TQObject::disconnect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); if ( m_pTaskBar ) { KMdiTaskBarButton * but = m_pTaskBar->getButton( pWnd ); if ( but != 0L ) { - TQObject::disconnect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } m_pTaskBar->removeWinButton( pWnd ); } @@ -995,19 +995,19 @@ TQPopupMenu* KMdiMainFrm::taskBarPopup( KMdiChildView *pWnd, bool /*bIncludeWind m_pTaskBarPopup->clear(); if ( pWnd->isAttached() ) { - m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQT_SLOT( detach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQ_SLOT( detach() ) ); m_pTaskBarPopup->insertSeparator(); if ( pWnd->isMinimized() || pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQT_SLOT( restore() ) ); + m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQ_SLOT( restore() ) ); if ( !pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQT_SLOT( maximize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQ_SLOT( maximize() ) ); if ( !pWnd->isMinimized() ) - m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQT_SLOT( minimize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQ_SLOT( minimize() ) ); } else - m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQT_SLOT( attach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQ_SLOT( attach() ) ); m_pTaskBarPopup->insertSeparator(); - m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQT_SLOT( close() ) ); + m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQ_SLOT( close() ) ); // the window has a view...get the window popup m_pTaskBarPopup->insertSeparator(); m_pTaskBarPopup->insertItem( i18n( "Operations" ), windowPopup( pWnd, false ) ); //alvoid recursion @@ -1639,7 +1639,7 @@ void KMdiMainFrm::switchToTabPageMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1656,7 +1656,7 @@ void KMdiMainFrm::finishTabPageMode() if ( m_mdiMode == KMdi::TabPageMode ) { m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQPtrListIterator<KMdiChildView> it( *m_pDocumentViews ); for ( ; it.current(); ++it ) @@ -1721,7 +1721,7 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() #endif delete m_documentTabWidget; m_documentTabWidget = new KMdiDocumentViewTabWidget( m_pDockbaseAreaOfDocumentViews ); - connect( m_documentTabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); + connect( m_documentTabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); m_pDockbaseAreaOfDocumentViews->setWidget( m_documentTabWidget ); m_documentTabWidget->show(); TQPtrListIterator<KMdiChildView> it4( *m_pDocumentViews ); @@ -1730,11 +1730,11 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() KMdiChildView* pView = it4.current(); m_documentTabWidget->addTab( pView, pView->icon() ? *( pView->icon() ) : TQPixmap(), pView->tabCaption() ); /* - connect(pView,TQT_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), - m_documentTabWidget,TQT_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); + connect(pView,TQ_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), + m_documentTabWidget,TQ_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); */ - connect( pView, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pView, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pView, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pView, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } } @@ -1864,7 +1864,7 @@ void KMdiMainFrm::switchToIDEAlMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1962,40 +1962,40 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_leftContainer->manualDock( mainDock, KDockWidget::DockLeft, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleLeft() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleLeft() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_rightContainer->setWidget( tmpDC = new KMdiDockContainer( m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode ) ); m_rightContainer->setEnableDocking( KDockWidget::DockRight ); m_rightContainer->manualDock( mainDock, KDockWidget::DockRight, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleRight() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleRight() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_topContainer->setWidget( tmpDC = new KMdiDockContainer( m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode ) ); m_topContainer->setEnableDocking( KDockWidget::DockTop ); m_topContainer->manualDock( mainDock, KDockWidget::DockTop, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleTop() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleTop() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_bottomContainer->setWidget( tmpDC = new KMdiDockContainer( m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode ) ); m_bottomContainer->setEnableDocking( KDockWidget::DockBottom ); m_bottomContainer->manualDock( mainDock, KDockWidget::DockBottom, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleBottom() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleBottom() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_leftContainer->setDockSite( KDockWidget::DockCenter ); m_rightContainer->setDockSite( KDockWidget::DockCenter ); @@ -2030,7 +2030,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) { assert( m_pClose ); m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQStringList leftNames; @@ -2438,23 +2438,23 @@ void KMdiMainFrm::setEnableMaximizedChildFrmMode( bool enableMaxChildFrameMode ) if ( !pCurrentChild || !m_pMainMenuBar ) return ; - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( maximizePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( maximizePressed() ) ); m_pMinimize->show(); m_pUndock->show(); m_pRestore->show(); if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) { - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQ_SLOT( closePressed() ), 0, -1, 0 ); } else { m_pMainMenuBar->insertItem( *pCurrentChild->icon(), pCurrentChild->systemMenu(), -1, 0 ); if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( closePressed() ) ); m_pClose->show(); } else @@ -2490,10 +2490,10 @@ void KMdiMainFrm::switchOffMaximizeModeForMenu( KMdiChildFrm* oldChild ) if ( oldChild ) { Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } m_pUndock->hide(); m_pMinimize->hide(); @@ -2512,7 +2512,7 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF if ( newChild ) { if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQ_SLOT( closePressed() ), 0, -1, 0 ); else m_pMainMenuBar->insertItem( *newChild->icon(), newChild->systemMenu(), -1, 0 ); } @@ -2521,18 +2521,18 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF { m_pMainMenuBar->removeItem( m_pMainMenuBar->idAt( 1 ) ); Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } if ( newChild ) { Q_ASSERT( m_pClose ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( closePressed() ) ); } } @@ -2580,7 +2580,7 @@ void KMdiMainFrm::fillWindowMenu() d->closeWindowAction->plug(m_pWindowMenu); - int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQT_SLOT( closeAllViews() ) ); + int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQ_SLOT( closeAllViews() ) ); if ( noViewOpened ) { d->closeWindowAction->setEnabled(false); @@ -2589,7 +2589,7 @@ void KMdiMainFrm::fillWindowMenu() if ( !tabPageMode && !IDEAlMode ) { - int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQT_SLOT( iconifyAllViews() ) ); + int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQ_SLOT( iconifyAllViews() ) ); if ( noViewOpened ) m_pWindowMenu->setItemEnabled( iconifyId, false ); } @@ -2597,10 +2597,10 @@ void KMdiMainFrm::fillWindowMenu() m_pWindowMenu->insertSeparator(); m_pWindowMenu->insertItem( i18n( "&MDI Mode" ), m_pMdiModeMenu ); m_pMdiModeMenu->clear(); - m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQT_SLOT( switchToToplevelMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQT_SLOT( switchToChildframeMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQT_SLOT( switchToTabPageMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQT_SLOT( switchToIDEAlMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQ_SLOT( switchToToplevelMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQ_SLOT( switchToChildframeMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQ_SLOT( switchToTabPageMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQ_SLOT( switchToIDEAlMode() ) ); switch ( m_mdiMode ) { case KMdi::ToplevelMode: @@ -2624,13 +2624,13 @@ void KMdiMainFrm::fillWindowMenu() { int placMenuId = m_pWindowMenu->insertItem( i18n( "&Tile" ), m_pPlacingMenu ); m_pPlacingMenu->clear(); - m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQT_SLOT( cascadeWindows() ) ); - m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQT_SLOT( cascadeMaximized() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQT_SLOT( expandVertical() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQT_SLOT( expandHorizontal() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQT_SLOT( tileAnodine() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQT_SLOT( tilePragma() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQT_SLOT( tileVertically() ) ); + m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQ_SLOT( cascadeWindows() ) ); + m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQ_SLOT( cascadeMaximized() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQ_SLOT( expandVertical() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQ_SLOT( expandHorizontal() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQ_SLOT( tileAnodine() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQ_SLOT( tilePragma() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQ_SLOT( tileVertically() ) ); if ( m_mdiMode == KMdi::ToplevelMode ) { m_pWindowMenu->setItemEnabled( placMenuId, false ); @@ -2692,7 +2692,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( putHere ) { - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( indx + entryCount ), true ); @@ -2700,7 +2700,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( indx ), true ); @@ -2713,7 +2713,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( !inserted ) { // append it - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( windowItemCount + entryCount ), true ); @@ -2721,7 +2721,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( windowItemCount ), true ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp index 7bf4fb3b..1d5c9ab7 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp @@ -171,11 +171,11 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr ) } KMdiTaskBarButton *b = new KMdiTaskBarButton( this, win_ptr ); - TQObject::connect( b, TQT_SIGNAL( clicked() ), win_ptr, TQT_SLOT( setFocus() ) ); - TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) ); + TQObject::connect( b, TQ_SIGNAL( clicked() ), win_ptr, TQ_SLOT( setFocus() ) ); + TQObject::connect( b, TQ_SIGNAL( clicked( KMdiChildView* ) ), this, TQ_SLOT( setActiveButton( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( buttonTextChanged( int ) ), this, TQ_SLOT( layoutTaskBar( int ) ) ); m_pButtonList->append( b ); b->setToggleButton( true ); b->setText( win_ptr->tabCaption() ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp index 1ab3b4b6..25562e34 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp @@ -95,7 +95,7 @@ TQWidget *KMdiToolViewAccessor::wrapperWidget() if ( !d->widgetContainer ) { d->widgetContainer = mdiMainFrm->createDockWidget( "KMdiToolViewAccessor::null", TQPixmap() ); - connect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + connect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); } return d->widgetContainer; } @@ -110,7 +110,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri { Q_ASSERT( !( d->widget ) ); Q_ASSERT( !widgetToWrap->inherits( "KDockWidget" ) ); - disconnect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + disconnect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); delete d->widget; d->widget = widgetToWrap; KDockWidget *tmp = d->widgetContainer; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp index a6e6e6a0..422e1aa9 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp @@ -395,7 +395,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, @@ -410,7 +410,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::~KMultiTabBarButton() { diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp index d8b04b5e..e303b1f6 100644 --- a/lib/ksavealldialog.cpp +++ b/lib/ksavealldialog.cpp @@ -79,9 +79,9 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co ++it; } - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(save()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(saveNone()) ); } KSaveSelectDialog::~KSaveSelectDialog() {} @@ -159,9 +159,9 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent setButtonTip( User1, i18n("Lose all modifications") ); setButtonTip( Close, i18n("Cancels the action") ); - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveAll()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(revert()) ); } KSaveAllDialog::~KSaveAllDialog() diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index c4d65d83..72cdb56d 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -300,10 +300,10 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - 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( slotListResult (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( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; @@ -338,10 +338,10 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), - this, TQT_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotListResult (TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; enter_loop(); @@ -397,11 +397,11 @@ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *w job->setWindow(window); job->setDetails(0); job->setSide(readingOnly); - 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(60*1000, this,TQT_SLOT(slotTimeout())); + TQTimer::singleShot(60*1000, this,TQ_SLOT(slotTimeout())); //kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl; enter_loop(); //kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl; @@ -417,8 +417,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume, false ); // TDEIO::Job * job2 = TDEIO::del(target, false ); //job2->setWindow (window); - //connect( job2, TQT_SIGNAL( result (TDEIO::Job *) ), -// this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + //connect( job2, TQ_SIGNAL( result (TDEIO::Job *) ), +// this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); //enter_loop(); //if (bJobOK) @@ -426,8 +426,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss // kdDebug(24000) << "Copying " << src << " to " << target << endl; // TDEIO::Job *job = TDEIO::copy( src, target, false ); 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; @@ -536,10 +536,10 @@ void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& ud TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; //kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListResult(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListResult(TDEIO::Job *))); } } @@ -603,10 +603,10 @@ void QExtFileInfo::slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntry TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; // kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListResult(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListResult(TDEIO::Job *))); } } diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index c41b8368..395889dd 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -31,7 +31,7 @@ class colorRequester::colorRequesterPrivate{ KLineEdit *edit; colorRequesterPrivate() { edit = 0L; } void setText( const TQString& text ) { edit->setText( text ); } - void connectSignals( TQObject *receiver ) { connect( edit, TQT_SIGNAL( textChanged( const TQString& )),receiver, TQT_SIGNAL( textChanged( const TQString& ))); } + void connectSignals( TQObject *receiver ) { connect( edit, TQ_SIGNAL( textChanged( const TQString& )),receiver, TQ_SIGNAL( textChanged( const TQString& ))); } }; colorRequester::colorRequester(TQWidget *parent, const char* name) : miniEditor(parent,name){ @@ -45,7 +45,7 @@ colorRequester::~colorRequester(){ } void colorRequester::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(textChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void colorRequester::init() @@ -68,11 +68,11 @@ void colorRequester::init() setFocusProxy( widget ); d->connectSignals( this ); - connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() )); - connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) )); + connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openColorDialog() )); + connect( d->edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( setInitialValue(/*const TQString&*/ ) )); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, this, TQT_SLOT( openColorDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( openColorDialog() )); accel->readSettings(); } diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index 1a639106..8191d8c6 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -47,9 +47,9 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, m_centerValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , centerBox); m_rightValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , rightBox); setSpacing(10); - connect(m_leftValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertLeftValue(int))); - connect(m_centerValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertCenterValue(int))); - connect(m_rightValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertRightValue(int))); + connect(m_leftValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertLeftValue(int))); + connect(m_centerValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertCenterValue(int))); + connect(m_rightValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertRightValue(int))); } colorSlider::~colorSlider(){ @@ -59,7 +59,7 @@ colorSlider::~colorSlider(){ } void colorSlider::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void colorSlider::convertLeftValue(int i){ diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index 34cd9e6f..34ea4a23 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -117,7 +117,7 @@ void CSSEditor::appendSub(TQDomNodeList l, myCheckListItem *cli){ unsigned int i; for(i=0;i<l.length();i++) { myCheckListItem *item = new myCheckListItem(cli,l.item(i).toElement().tagName()); - item->connect(this,TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(this,TQ_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") appendSub(l.item(i).childNodes(),item); } @@ -127,7 +127,7 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){ unsigned int i; for(i=0;i<l.length();i++) { myCheckListItem *item = new myCheckListItem(lv,l.item(i).toElement().tagName()); - item->connect(this,TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(this,TQ_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") { TQDomNodeList listSub = l.item(i).childNodes(); appendSub(listSub,item); @@ -184,7 +184,7 @@ void CSSEditor::hidePreviewer(){ void CSSEditor::initialize(){ m_config = kapp->config(); - connect(pbOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShortendForm())); + connect(pbOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShortendForm())); m_config->setGroup("CSSEditor Options"); SHckb->setChecked(m_config->readBoolEntry("Shorthand form enabled",false)); @@ -243,7 +243,7 @@ void CSSEditor::initialize(){ m_ps = new propertySetter(fEditing); fEditingLayout->addWidget(m_ps); - connect(m_ps, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(checkProperty(const TQString&))); + connect(m_ps, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(checkProperty(const TQString&))); TQStringList props; TQString temp; @@ -592,12 +592,12 @@ void CSSEditor::checkProperty(const TQString& v){ } void CSSEditor::Connect(){ - connect(this, TQT_SIGNAL(signalUpdatePreview()), this, TQT_SLOT(updatePreview())); - connect(lvVisual,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvAll,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvAural,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvInteractive,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvPaged,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(this, TQ_SIGNAL(signalUpdatePreview()), this, TQ_SLOT(updatePreview())); + connect(lvVisual,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvAll,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvAural,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvInteractive,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvPaged,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); } void CSSEditor::removeProperty(const TQVariant& v){ diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp index c2be79c0..ef2227cf 100644 --- a/quanta/components/csseditor/csseditor_globals.cpp +++ b/quanta/components/csseditor/csseditor_globals.cpp @@ -19,13 +19,13 @@ #include "csseditor_globals.h" mySpinBox::mySpinBox(TQWidget * parent , const char * name ) : TQSpinBox (parent, name){ - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(checkSuffix( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged( const TQString & ))); } mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * parent, const char * name ) : TQSpinBox( minValue, maxValue, step, parent,name ){ - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(checkSuffix( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged( const TQString & ))); } mySpinBox::~mySpinBox(){} diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index c2f1bb75..c624a696 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -110,34 +110,34 @@ CSSSelector::~CSSSelector(){ void CSSSelector::Connect(){ - connect(cbDTD,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(setDTDTags(const TQString&))); - - connect(pbAddTag,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addTag())); - connect(pbAddClass,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addClass())); - connect(pbAddID,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addID())); - connect(pbAddPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addPseudo())); - - connect(lvTags, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvClasses, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvIDs, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvPseudo, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - - connect(lvTags, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvClasses, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvIDs, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvPseudo, TQT_SIGNAL( selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - - connect(pbRemoveSelectedTag,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedClass,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedID,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - - connect(twSelectors,TQT_SIGNAL(currentChanged ( TQWidget * )), this ,TQT_SLOT(setCurrentListView( TQWidget * ))); - - connect(pbRemoveAllTags,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllClasses,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllIDs,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); + connect(cbDTD,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(setDTDTags(const TQString&))); + + connect(pbAddTag,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addTag())); + connect(pbAddClass,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addClass())); + connect(pbAddID,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addID())); + connect(pbAddPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addPseudo())); + + connect(lvTags, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvClasses, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvIDs, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvPseudo, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + + connect(lvTags, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvClasses, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvIDs, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvPseudo, TQ_SIGNAL( selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + + connect(pbRemoveSelectedTag,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedClass,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedID,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + + connect(twSelectors,TQ_SIGNAL(currentChanged ( TQWidget * )), this ,TQ_SLOT(setCurrentListView( TQWidget * ))); + + connect(pbRemoveAllTags,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllClasses,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllIDs,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); } void CSSSelector::setDTDTags(const TQString& s){ @@ -315,7 +315,7 @@ void CSSSelector::removeSelected(){ void CSSSelector::loadCSSContent(const TQString& s){ stylesheetParser p(s); - connect(&p,TQT_SIGNAL(errorOccurred(const TQString&)), this, TQT_SLOT(setStylesheetProcessing(const TQString&))); + connect(&p,TQ_SIGNAL(errorOccurred(const TQString&)), this, TQ_SLOT(setStylesheetProcessing(const TQString&))); p.parse(); m_orderNumber = p.orderNumber(); diff --git a/quanta/components/csseditor/doubleeditors.cpp b/quanta/components/csseditor/doubleeditors.cpp index e877e2ac..18e18ce4 100644 --- a/quanta/components/csseditor/doubleeditors.cpp +++ b/quanta/components/csseditor/doubleeditors.cpp @@ -58,8 +58,8 @@ void doubleEditorBase::dxValueSlot(const TQString& v){ m_ssbDx->insertItem("pt"); m_ssbDx->insertItem("px"); - connect(m_ssbSx, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_ssbDx, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_ssbSx, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_ssbDx, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(dxValueSlot(const TQString&))); } doubleLengthEditor::~doubleLengthEditor(){ @@ -68,7 +68,7 @@ doubleLengthEditor::~doubleLengthEditor(){ } void doubleLengthEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx){ @@ -79,8 +79,8 @@ void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx) doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ m_cbSx = new TQComboBox(this); m_cbDx = new TQComboBox(this); - connect(m_cbSx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_cbDx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_cbSx, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_cbDx, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(dxValueSlot(const TQString&))); } doubleComboBoxEditor::~doubleComboBoxEditor(){ @@ -89,7 +89,7 @@ doubleComboBoxEditor::~doubleComboBoxEditor(){ } void doubleComboBoxEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ @@ -97,8 +97,8 @@ doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *nam m_sbDx = new mySpinBox(this); m_sbSx->setSuffix("%"); m_sbDx->setSuffix("%"); - connect(m_sbSx,TQT_SIGNAL(valueChanged(const TQString&)),this,TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_sbDx,TQT_SIGNAL(valueChanged(const TQString&)),this,TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_sbSx,TQ_SIGNAL(valueChanged(const TQString&)),this,TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_sbDx,TQ_SIGNAL(valueChanged(const TQString&)),this,TQ_SLOT(dxValueSlot(const TQString&))); } doublePercentageEditor::~doublePercentageEditor(){ @@ -107,7 +107,7 @@ doublePercentageEditor::~doublePercentageEditor(){ } void doublePercentageEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void doublePercentageEditor::setInitialValue(const TQString& a_sx, const TQString& a_dx){ diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 8a64d589..cab7efbb 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -69,17 +69,17 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF pbMoveDown->setIconSet(iconSet); pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect(pbAdd, TQT_SIGNAL(clicked()), this ,TQT_SLOT( addFont() )); - connect( lbAvailable, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbAvailable, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedAvailableFamilyFont( const TQString&) ) ); - connect( lbGeneric, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbGeneric, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedGenericFamilyFont( const TQString&) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( setCurrentSelectedFont( int ) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedFont( const TQString&) ) ); - connect( pbRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeFont() ) ); - connect( pbMoveUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveFontUp() ) ); - connect( pbMoveDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveFontDown() ) ); + connect(pbAdd, TQ_SIGNAL(clicked()), this ,TQ_SLOT( addFont() )); + connect( lbAvailable, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbAvailable, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedAvailableFamilyFont( const TQString&) ) ); + connect( lbGeneric, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbGeneric, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedGenericFamilyFont( const TQString&) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( setCurrentSelectedFont( int ) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedFont( const TQString&) ) ); + connect( pbRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeFont() ) ); + connect( pbMoveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveFontUp() ) ); + connect( pbMoveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveFontDown() ) ); TQWhatsThis::add(lbAvailable,i18n("These are the names of the available fonts on your system")); TQWhatsThis::add(lbGeneric,i18n("These are the names of the generic fonts ")); diff --git a/quanta/components/csseditor/percentageeditor.cpp b/quanta/components/csseditor/percentageeditor.cpp index b02a1615..f6363563 100644 --- a/quanta/components/csseditor/percentageeditor.cpp +++ b/quanta/components/csseditor/percentageeditor.cpp @@ -23,7 +23,7 @@ percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *paren m_sb = new mySpinBox(0,9999,1,this); m_sb->setValue(temp.remove("%").toInt()); m_sb->setSuffix("%"); - connect(m_sb, TQT_SIGNAL(valueChanged ( const TQString & )), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_sb, TQ_SIGNAL(valueChanged ( const TQString & )), this, TQ_SIGNAL(valueChanged(const TQString&))); } percentageEditor::~percentageEditor() @@ -32,7 +32,7 @@ percentageEditor::~percentageEditor() } void percentageEditor::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } #include "percentageeditor.moc" diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index cbaabe5c..c4a46ca7 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -60,8 +60,8 @@ void propertySetter::reset(){ void propertySetter::setComboBox() { m_cb = new TQComboBox(this); - connect(m_cb, TQT_SIGNAL(activated(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); - connect(m_cb, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_cb, TQ_SIGNAL(activated(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); + connect(m_cb, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(m_cb); } @@ -70,14 +70,14 @@ void propertySetter::setSpinBox(const TQString& initialValue, const TQString& mi mySpinBox *editor = new mySpinBox(min.toInt(), max.toInt(), 1, this); editor->setSuffix(s); editor->setValue(initialValue.toInt()); - connect(editor, TQT_SIGNAL(valueChanged(const TQString&)), this ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(editor, TQ_SIGNAL(valueChanged(const TQString&)), this ,TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(editor); } void propertySetter::setLineEdit() { TQLineEdit *editor = new TQLineEdit(this); - connect(editor,TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SIGNAL(valueChanged ( const TQString & ))); + connect(editor,TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SIGNAL(valueChanged ( const TQString & ))); m_list.append(editor); } @@ -85,7 +85,7 @@ void propertySetter::setPredefinedColorListEditor() { TQComboBox *editor = new TQComboBox(this); editor->insertStringList(CSSEditorGlobals::HTMLColors); - connect(editor, TQT_SIGNAL(activated(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(editor, TQ_SIGNAL(activated(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(editor); } @@ -118,7 +118,7 @@ void propertySetter::addButton(){ m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); m_pb->hide(); - connect(m_pb, TQT_SIGNAL(clicked()), this ,TQT_SLOT(Show())); + connect(m_pb, TQ_SIGNAL(clicked()), this ,TQ_SLOT(Show())); } void propertySetter::installMiniEditor(miniEditor *m){ diff --git a/quanta/components/csseditor/specialsb.cpp b/quanta/components/csseditor/specialsb.cpp index 6edf110c..2c725e03 100644 --- a/quanta/components/csseditor/specialsb.cpp +++ b/quanta/components/csseditor/specialsb.cpp @@ -26,16 +26,16 @@ specialSB::specialSB(TQWidget *parent, const char *name, bool useLineEdit ) : mi { m_lineEdit = new KLineEdit(this); m_sb = 0L; - connect(m_lineEdit, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(lineEditValueSlot ( const TQString & ))); + connect(m_lineEdit, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(lineEditValueSlot ( const TQString & ))); } else { m_sb=new mySpinBox(this); - connect(m_sb, TQT_SIGNAL(valueChanged ( const TQString & )), this, TQT_SLOT(sbValueSlot(const TQString&))); + connect(m_sb, TQ_SIGNAL(valueChanged ( const TQString & )), this, TQ_SLOT(sbValueSlot(const TQString&))); m_lineEdit = 0L; } m_cb = new TQComboBox(this); - connect(m_cb, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(cbValueSlot(const TQString&))); + connect(m_cb, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(cbValueSlot(const TQString&))); } specialSB::~specialSB(){ @@ -45,7 +45,7 @@ specialSB::~specialSB(){ } void specialSB::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p,TQ_SIGNAL(valueChanged(const TQString&))); } diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index d40812ed..c523115a 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -40,7 +40,7 @@ #include "csseditor.h" StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 678ba827..4aa738d7 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -73,19 +73,19 @@ URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name setButtonIcon("document-open"); setToolTip(i18n("Open the URI selector")); - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFileDialog())); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFileDialog())); } void URIEditor::connectToPropertySetter(propertySetter* p){ - connect(this,TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this,TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void URIEditor::setMode(const mode& m) { m_Mode = m ; if( m_Mode == Single ) - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(selectedURI(const TQString&))); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(selectedURI(const TQString&))); else{ - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(selectedURIs(const TQStringList&))); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(selectedURIs(const TQStringList&))); } } @@ -156,12 +156,12 @@ fontEditor::fontEditor(TQWidget *parent, const char* name) : TLPEditor(parent,na setLabelText(i18n("Font family:")); setButtonIcon("fonts"); setToolTip(i18n("Open font family chooser")); - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFontChooser())); - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SIGNAL( valueChanged( const TQString& ) ) ); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFontChooser())); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SIGNAL( valueChanged( const TQString& ) ) ); } void fontEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void fontEditor::openFontChooser(){ diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index e979c417..4035ed2f 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -47,30 +47,30 @@ CVSService::CVSService(TDEActionCollection *ac) { m_menu = new TDEPopupMenu(); - TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit"); + TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQ_SLOT(slotCommit()), ac, "vcs_commit"); action->plug(m_menu); - action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update"); + action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQ_SLOT(slotUpdate()), ac, "vcs_update"); action->plug(m_menu); TDEPopupMenu *updateToMenu = new TDEPopupMenu(m_menu); m_menu->insertItem(SmallIconSet("vcs_update"), i18n("Update &To"), updateToMenu); - action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); + action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQ_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); action->plug(updateToMenu); - action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); + action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQ_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); action->plug(updateToMenu); - action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert"); + action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQ_SLOT(slotRevert()), ac, "vcs_revert"); action->plug(m_menu); m_menu->insertSeparator(); - action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add"); + action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQ_SLOT(slotAdd()), ac, "vcs_add"); action->plug(m_menu); - action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove"); + action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQ_SLOT(slotRemove()), ac, "vcs_remove"); action->plug(m_menu); - action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac); + action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQ_SLOT(slotAddToCVSIgnore()), ac); action->plug(m_menu); - action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac); + action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQ_SLOT(slotRemoveFromCVSIgnore()), ac); action->plug(m_menu); m_menu->insertSeparator(); - action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac); + action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQ_SLOT(slotBrowseLog()), ac); action->plug(m_menu); m_cvsJob = 0L; @@ -79,7 +79,7 @@ CVSService::CVSService(TDEActionCollection *ac) m_commitDlg = new CVSCommitDlgS(); m_updateToDlg = new CVSUpdateToDlgS(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } CVSService::~CVSService() diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 637f76a4..1e02305f 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -64,7 +64,7 @@ BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) setAllColumnsShowFocus(true); // Jump to bt - connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int))); } diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp index 055512da..630fbf8b 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.cpp +++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp @@ -40,11 +40,11 @@ ConditionalBreakpointDialog::ConditionalBreakpointDialog(const TQString& express buttonClearClass->setPixmap(SmallIcon("clear_left")); buttonClearFunction->setPixmap(SmallIcon("clear_left")); - connect(comboExpression, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotExpressionChanged())); + connect(comboExpression, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotExpressionChanged())); - connect(buttonClearFile, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFile())); - connect(buttonClearClass, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearClass())); - connect(buttonClearFunction, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFunction())); + connect(buttonClearFile, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFile())); + connect(buttonClearClass, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearClass())); + connect(buttonClearFunction, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFunction())); slotExpressionChanged(); } diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 7730960d..03fb82aa 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -48,11 +48,11 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_socket) { // m_socket->setBufferSize(-1); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KNetwork::KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); - connect(m_socket, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSocketDestroyed())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KNetwork::KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSocketDestroyed())); m_socket->connect(); emit active(false); kdDebug(24002) << k_funcinfo << ", proxy:" << server << ", " << service << endl; @@ -65,8 +65,8 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt m_server = new KNetwork::TDEServerSocket(service); m_server->setAddressReuseable(true); - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - connect(m_server, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); if(m_server->listen()) { @@ -91,7 +91,7 @@ void DBGpNetwork::sessionEnd() if(m_socket) { m_socket->flush(); - disconnect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); + disconnect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); if (m_socket) m_socket->close(); delete m_socket; @@ -146,7 +146,7 @@ void DBGpNetwork::slotReadyAccept() kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(!m_socket) { - disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) @@ -156,10 +156,10 @@ void DBGpNetwork::slotReadyAccept() m_socket->setAddressReuseable(true); // m_socket->setSocketFlags(KExtendedSocket::inetSocket | KExtendedSocket::inputBufferedSocket); // m_socket->setBufferSize(-1); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); connected(); } else @@ -215,7 +215,7 @@ void DBGpNetwork::slotConnectionClosed() } if(m_server) - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); // Disable all session related actions and enable connection action emit connected(false); diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp index e9bbc249..13b1f46c 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.cpp +++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp @@ -24,7 +24,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion) : DBGpSettingsS(0, "DBGpSettings", false, 0) { textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); - connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool))); + connect(checkLocalProject, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotLocalProjectToggle(bool))); } DBGpSettings::~DBGpSettings() diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 6e2ec6ce..f4204ec2 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -59,10 +59,10 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS setExecutionState(m_defaultExecutionState); emit updateStatus(DebuggerUI::NoSession); - connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&))); - connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool))); - connect(&m_network, TQT_SIGNAL(connected(bool)), this, TQT_SLOT(slotNetworkConnected(bool))); - connect(&m_network, TQT_SIGNAL(networkError(const TQString &, bool)), this, TQT_SLOT(slotNetworkError(const TQString &, bool))); + connect(&m_network, TQ_SIGNAL(command(const TQString&)), this, TQ_SLOT(processCommand(const TQString&))); + connect(&m_network, TQ_SIGNAL(active(bool)), this, TQ_SLOT(slotNetworkActive(bool))); + connect(&m_network, TQ_SIGNAL(connected(bool)), this, TQ_SLOT(slotNetworkConnected(bool))); + connect(&m_network, TQ_SIGNAL(networkError(const TQString &, bool)), this, TQ_SLOT(slotNetworkError(const TQString &, bool))); } diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index 7cb4c097..140ee4b7 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -67,12 +67,12 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam setAllColumnsShowFocus(true); m_breakpointPopup = new TDEPopupMenu(this); - m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected())); + m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected())); - connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); // Jump to bp - connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int))); } diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index ff41b764..b672617c 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = NULL; @@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU // recreate UI m_debuggerui = new DebuggerUI(this, "debuggerui"); - connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + connect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); // Load saved breakpoints if(Project::ref()->debuggerPersistentBreakpoints()) @@ -212,65 +212,65 @@ void DebuggerManager::initActions() return; //Debugger, breakpoint - newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); + newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQ_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location")); - newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); + newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQ_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); newaction->setToolTip(i18n("Clears all breakpoints")); - newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); - newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); // Execution - newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request"); + newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQ_SLOT(slotDebugRequest()), ac, "debug_request"); newaction->setToolTip(i18n("Initiate HTTP Request to the server with debugging activated")); - newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace"); + newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQ_SLOT(slotDebugTrace()), ac, "debug_trace"); newaction->setToolTip(i18n("Traces through the script. If a script is currently not being debugged, it will start in trace mode when started")); - newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run"); + newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQ_SLOT(slotDebugRun()), ac, "debug_run"); newaction->setToolTip(i18n("Runs the script. If a script is currently not being debugged, it will start in run mode when started")); - newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover"); + newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQ_SLOT(slotDebugStepOver()), ac, "debug_stepover"); newaction->setToolTip(i18n("Executes the next line of execution, but does not step into functions or includes")); - newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); + newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQ_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); newaction->setToolTip(i18n("Executes the next line of execution and steps into it if it is a function call or inclusion of a file")); - newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip"); + newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQ_SLOT(slotDebugSkip()), ac, "debug_skip"); newaction->setToolTip(i18n("Skips the next command of execution and makes the next command the current one")); - newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout"); + newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQ_SLOT(slotDebugStepOut()), ac, "debug_stepout"); newaction->setToolTip(i18n("Executes the rest of the commands in the current function/file and pauses when it is done (when it reaches a higher level in the backtrace)")); - newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause"); + newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQ_SLOT(slotDebugPause()), ac, "debug_pause"); newaction->setToolTip(i18n("Pauses the scripts if it is running or tracing. If a script is currently not being debugged, it will start in paused mode when started")); - newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill"); + newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQ_SLOT(slotDebugKill()), ac, "debug_kill"); newaction->setToolTip(i18n("Kills the currently running script")); - newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect"); + newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQ_SLOT(slotDebugStartSession()), ac, "debug_connect"); newaction->setToolTip(i18n("Starts the debugger internally (Makes debugging possible)")); - newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); + newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQ_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); newaction->setToolTip(i18n("Stops the debugger internally (debugging not longer possible)")); // Variables - newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatch"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_set"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); + newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQ_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); newaction->setToolTip(i18n("Opens the profiler output file")); enableAction("*", false); @@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager() if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = 0L; @@ -642,20 +642,20 @@ void DebuggerManager::setMark(const TQString& filename, long line, bool set, int void DebuggerManager::connectBreakpointSignals(Document* qdoc) { - connect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)), - this, TQT_SLOT(slotBreakpointMarked(Document*, int))); + connect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)), + this, TQ_SLOT(slotBreakpointMarked(Document*, int))); - connect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)), - this, TQT_SLOT(slotBreakpointUnmarked(Document*, int))); + connect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)), + this, TQ_SLOT(slotBreakpointUnmarked(Document*, int))); } void DebuggerManager::disconnectBreakpointSignals(Document* qdoc) { - disconnect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)), - this, TQT_SLOT(slotBreakpointMarked(Document*, int))); + disconnect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)), + this, TQ_SLOT(slotBreakpointMarked(Document*, int))); - disconnect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)), - this, TQT_SLOT(slotBreakpointUnmarked(Document*, int))); + disconnect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)), + this, TQ_SLOT(slotBreakpointUnmarked(Document*, int))); } // Show a status message and optionally put it on the log diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index 9f512460..1fcdc7da 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -64,14 +64,14 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name) m_preview->view()->setIcon(UserIcon("debug_run")); m_preview->view()->setCaption(i18n("Debug Output")); m_previewTVA = quantaApp->addToolWindow(m_preview->view(), quantaApp->prevDockPosition(m_preview->view(), KDockWidget::DockBottom), quantaApp->getMainDockWidget()); - connect(m_preview, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); + connect(m_preview, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); // Show debugger toolbar quantaApp->toolBar("debugger_toolbar")->show(); - connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); + connect(m_variablesListView, TQ_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQ_SLOT(slotRemoveVariable(DebuggerVariable* ))); - connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); + connect(m_debuggerBreakpointView, TQ_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQ_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); showMenu(); } diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 14d46941..086ff878 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -98,10 +98,10 @@ void QuantaDebuggerGubed::startSession() { m_socket = new KNetwork::KStreamSocket(m_serverHost, m_serverPort); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); m_socket->connect(); debuggerInterface()->enableAction("debug_connect", true); @@ -119,7 +119,7 @@ void QuantaDebuggerGubed::startSession() m_server = new KNetwork::TDEServerSocket(m_listenPort); m_server->setAddressReuseable(true); - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); if(m_server->listen()) { @@ -280,7 +280,7 @@ void QuantaDebuggerGubed::slotReadyAccept() { // Perhaps this shouldnt be disconnected - instead check if connections are available at disconnect? - disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) @@ -288,10 +288,10 @@ void QuantaDebuggerGubed::slotReadyAccept() kdDebug(24002) << k_funcinfo << ", ready" << endl; m_socket->enableRead(true); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); connected(); emit updateStatus(DebuggerUI::Connected); @@ -339,7 +339,7 @@ void QuantaDebuggerGubed::slotConnectionClosed() } if(m_server) - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); // Disable all session related actions and enable connection action debuggerInterface()->enableAction("*", false); diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp index 7f6f4027..343b55f3 100644 --- a/quanta/components/debugger/pathmapperdialog.cpp +++ b/quanta/components/debugger/pathmapperdialog.cpp @@ -32,9 +32,9 @@ PathMapperDialog::PathMapperDialog(const TQString& path, const PathMapperDialog: if(m_direction == LocalToServer) ledTranslationExists->hide(); - connect(listHistory, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(lineLocalPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged())); - connect(lineServerPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged())); + connect(listHistory, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect(lineLocalPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged())); + connect(lineServerPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged())); } PathMapperDialog::~PathMapperDialog() diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 9624416f..8fc97aaf 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -60,16 +60,16 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name) setSorting(-1); // No sorting m_variablePopup = new TDEPopupMenu(this); - m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch); + m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected()), 0, removeWatch); if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue)) - m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQT_SLOT(slotVariableSetValue()), 0, setValue); + m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQ_SLOT(slotVariableSetValue()), 0, setValue); - m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQT_SLOT(slotVariableDump()), 0, dumpValue); + m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQ_SLOT(slotVariableDump()), 0, dumpValue); - m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue); + m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQ_SLOT(slotVariableCopyToClipboard()), 0, copyValue); - connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); } diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp index 92ecf122..6992d78e 100644 --- a/quanta/components/framewizard/framewizard.cpp +++ b/quanta/components/framewizard/framewizard.cpp @@ -33,14 +33,14 @@ m_hasSelected(false),m_saved(false) { m_hasSelected = false; m_currSA=vfe->internalTree()->root()->label(); - connect(this, TQT_SIGNAL(launchDraw()), this, TQT_SLOT(draw())); - connect(vfe, TQT_SIGNAL(areaSelected(const TQString &)), this, TQT_SLOT(catchSelectedArea(const TQString &))); + connect(this, TQ_SIGNAL(launchDraw()), this, TQ_SLOT(draw())); + connect(vfe, TQ_SIGNAL(areaSelected(const TQString &)), this, TQ_SLOT(catchSelectedArea(const TQString &))); - connect(pbHorizontal, TQT_SIGNAL(clicked()), this, TQT_SLOT(split())); - connect(pbVertical, TQT_SIGNAL(clicked()), this, TQT_SLOT(split())); - connect(pbEditFrame, TQT_SIGNAL(clicked()), this, TQT_SLOT(showFrameEditorDlg())); - connect(pbReset, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset())); - connect(pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect(pbHorizontal, TQ_SIGNAL(clicked()), this, TQ_SLOT(split())); + connect(pbVertical, TQ_SIGNAL(clicked()), this, TQ_SLOT(split())); + connect(pbEditFrame, TQ_SIGNAL(clicked()), this, TQ_SLOT(showFrameEditorDlg())); + connect(pbReset, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset())); + connect(pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove())); } FrameWizard::~FrameWizard(){ diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index 7fc11420..3f74574f 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -307,8 +307,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ sa->view()->setGeometry(n->atts()->geometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); - connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); - connect(sa, TQT_SIGNAL(selected(const TQString &)),this, TQT_SIGNAL(areaSelected(const TQString &))); + connect(sa, TQ_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQ_SLOT(setGeometry(TQRect))); + connect(sa, TQ_SIGNAL(selected(const TQString &)),this, TQ_SIGNAL(areaSelected(const TQString &))); } } diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index 258f7783..96c5ccf8 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -52,21 +52,21 @@ TableEditor::TableEditor(TQWidget* parent, const char* name) : TableEditorS(parent, name) { m_popup = new TDEPopupMenu(); - m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell())); - m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQT_SLOT(slotEditRow())); - // m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQT_SLOT(slotEditCol())); + m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQ_SLOT(slotEditCell())); + m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQ_SLOT(slotEditRow())); + // m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQ_SLOT(slotEditCol())); m_mergeSeparatorId = m_popup->insertSeparator(); - m_mergeCellsId = m_popup->insertItem(i18n("Merge Cells"), this, TQT_SLOT(slotMergeCells())); - m_unmergeCellsId = m_popup->insertItem(i18n("Break Merging"), this, TQT_SLOT(slotUnmergeCells())); + m_mergeCellsId = m_popup->insertItem(i18n("Merge Cells"), this, TQ_SLOT(slotMergeCells())); + m_unmergeCellsId = m_popup->insertItem(i18n("Break Merging"), this, TQ_SLOT(slotUnmergeCells())); m_popup->insertSeparator(); - m_popup->insertItem(i18n("&Insert Row"), this, TQT_SLOT(slotInsertRow())); - m_popup->insertItem(i18n("Insert Co&lumn"), this, TQT_SLOT(slotInsertCol())); - m_popup->insertItem(i18n("Remove Row"), this, TQT_SLOT(slotRemoveRow())); - m_popup->insertItem(i18n("Remove Column"), this, TQT_SLOT(slotRemoveCol())); + m_popup->insertItem(i18n("&Insert Row"), this, TQ_SLOT(slotInsertRow())); + m_popup->insertItem(i18n("Insert Co&lumn"), this, TQ_SLOT(slotInsertCol())); + m_popup->insertItem(i18n("Remove Row"), this, TQ_SLOT(slotRemoveRow())); + m_popup->insertItem(i18n("Remove Column"), this, TQ_SLOT(slotRemoveCol())); m_popup->insertSeparator(); - m_popup->insertItem(i18n("Edit &Table Properties"), this, TQT_SLOT(slotEditTable())); - m_editChildId = m_popup->insertItem(i18n("Edit Child Table"), this, TQT_SLOT(slotEditChildTable())); + m_popup->insertItem(i18n("Edit &Table Properties"), this, TQ_SLOT(slotEditTable())); + m_editChildId = m_popup->insertItem(i18n("Edit Child Table"), this, TQ_SLOT(slotEditChildTable())); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); @@ -90,27 +90,27 @@ TableEditor::TableEditor(TQWidget* parent, const char* name) m_createNodes = true; newNum += 7; - connect(headerColSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(headerRowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(rowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(colSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(footerRowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(footerColSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(tableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(pushButton7, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTable())); - connect(pushButton7_2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableBody())); - connect(pushButton7_3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableHeader())); - connect(pushButton7_4, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableFooter())); - connect(headerTableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(footerTableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(slotTabChanged(TQWidget*))); - connect(buttonHelp, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelpInvoked())); - connect(tableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); - connect(headerTableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); - connect(footerTableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); + connect(headerColSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(headerRowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(rowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(colSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(footerRowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(footerColSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(tableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(pushButton7, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTable())); + connect(pushButton7_2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableBody())); + connect(pushButton7_3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableHeader())); + connect(pushButton7_4, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableFooter())); + connect(headerTableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(footerTableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(slotTabChanged(TQWidget*))); + connect(buttonHelp, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelpInvoked())); + connect(tableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); + connect(headerTableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); + connect(footerTableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); } TableEditor::~TableEditor() diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index 0b704529..ba10c9bb 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -48,7 +48,7 @@ TQWidget* TableItem::createEditor() const Editor->setVScrollBarMode(TQScrollView::AlwaysOff); Editor->setBold(m_header); Editor->setText(text()); - TQObject::connect(Editor, TQT_SIGNAL(textChanged()), table(), TQT_SLOT(doValueChanged())); + TQObject::connect(Editor, TQ_SIGNAL(textChanged()), table(), TQ_SLOT(doValueChanged())); return Editor; } diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index a1a53eab..b93e9bcd 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -63,18 +63,18 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, currentAction = 0L; m_toolbarItem = 0L; - connect(actionTreeView, TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), - TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); - connect(actionTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut &)), - TQT_SLOT(slotShortcutCaptured(const TDEShortcut &))); - connect(scriptPath, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&))); - connect(this, TQT_SIGNAL(addToolbar()), m_mainWindow, TQT_SLOT(slotAddToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(TDEAction*))); - connect(this, TQT_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQT_SLOT(slotConfigureToolbars(const TQString&))); + connect(actionTreeView, TQ_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), + TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); + connect(actionTreeView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(shortcutKeyButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut &)), + TQ_SLOT(slotShortcutCaptured(const TDEShortcut &))); + connect(scriptPath, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&))); + connect(this, TQ_SIGNAL(addToolbar()), m_mainWindow, TQ_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQ_SLOT(slotDeleteAction(TDEAction*))); + connect(this, TQ_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQ_SLOT(slotConfigureToolbars(const TQString&))); //fill up the tree view with the toolbars and actions actionTreeView->setSorting(-1); allActionsItem = new TDEListViewItem(actionTreeView, i18n("All")); @@ -148,9 +148,9 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, allActionsItem->sortChildItems(0, true); treeMenu = new TDEPopupMenu(actionTreeView); - treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQT_SLOT(slotAddToolbar())); - treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); + treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQ_SLOT(slotAddToolbar())); + treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQ_SLOT(slotEditToolbar())); globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" ); } @@ -193,7 +193,7 @@ void ActionConfigDialog::slotRemoveToolbar() if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; - connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); + connect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), TQ_SLOT(slotToolbarRemoved(const TQString&))); emit removeToolbar(s.lower()); } } @@ -204,7 +204,7 @@ void ActionConfigDialog::slotToolbarRemoved(const TQString &/*name*/) actionTreeView->setCurrentItem(allActionsItem); delete m_toolbarItem; m_toolbarItem = 0L; - disconnect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), this, TQT_SLOT(slotToolbarRemoved(const TQString&))); + disconnect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), this, TQ_SLOT(slotToolbarRemoved(const TQString&))); } void ActionConfigDialog::slotEditToolbar() diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index b5c53356..a7d5a55b 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -63,8 +63,8 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) destURL.adjustPath(1); TDEIO::CopyJob *job = TDEIO::copy(urlToCopy, destURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); TQString path = destURL.path(); if (path != "." && path != "..") @@ -117,8 +117,8 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) } TDEIO::CopyJob *job = TDEIO::copy(sourceList, targetDirURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } return m_destList; diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 720c3d8a..6f8f2b6c 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -56,7 +56,7 @@ void DirtyDlg::slotOk() TDEProcess *proc = new TDEProcess(); *proc << "kompare" << m_src.path() << m_dest.path(); proc->start(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotCompareDone(TDEProcess*))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotCompareDone(TDEProcess*))); enableButton(KDialogBase::Ok, false); enableButton(KDialogBase::Cancel, false); } else @@ -88,8 +88,8 @@ void DirtyDlg::slotCompareDone(TDEProcess* proc) //TODO: Replace with TDEIO::NetAccess::file_move, when KDE 3.1 support //is dropped TDEIO::FileCopyJob *job = TDEIO::file_move(m_dest, m_src, m_permissions, true, false,false ); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 1293d8b4..2f5938f1 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -47,9 +47,9 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } @@ -69,9 +69,9 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 85d3065b..8d3aa45c 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -98,7 +98,7 @@ void AbbreviationDlg::slotNewGroup() if (qConfig.abbreviations.contains(groupName)) { KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists")); - TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); + TQTimer::singleShot(0, this, TQ_SLOT(slotNewGroup())); } else { groupCombo->insertItem(groupName); diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5688b920 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -26,7 +26,7 @@ FileMasks::FileMasks(TQWidget *parent, const char *name) :FileMasksS(parent,name) { - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(setToDefault())); } FileMasks::~FileMasks(){ diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index b9f90264..378c0c22 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -31,13 +31,13 @@ SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) :SpecialCharDialogS( parent, name, modal, fl ) { - connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(filterChars(const TQString&)) ); - connect ( CharsListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - TQT_SLOT(insertCode()) ); - connect (buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(insertCode())); - connect (buttonChar, TQT_SIGNAL(clicked()), TQT_SLOT(insertChar())); - connect (buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancel())); + connect ( FilterLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(filterChars(const TQString&)) ); + connect ( CharsListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + TQ_SLOT(insertCode()) ); + connect (buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(insertCode())); + connect (buttonChar, TQ_SIGNAL(clicked()), TQ_SLOT(insertChar())); + connect (buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancel())); filterChars(""); } diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 5b735fcf..c12f2136 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -78,8 +78,8 @@ ColorCombo::ColorCombo( TQWidget *parent, const char *name ) addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } ColorCombo::~ColorCombo() diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index eeb6bfc2..413add61 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -42,7 +42,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) adjustSize(); resize(sizeHint()); - connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); + connect(listbox,TQ_SIGNAL(doubleClicked( TQListBoxItem * )), TQ_SLOT(slotOk())); } ListDlg::~ListDlg(){ diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 7db3c307..b788bb3a 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -118,8 +118,8 @@ void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect( this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(slotAccept()) ); - connect( this, TQT_SIGNAL(cancelButtonPressed()), TQT_SLOT(reject()) ); + connect( this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(slotAccept()) ); + connect( this, TQ_SIGNAL(cancelButtonPressed()), TQ_SLOT(reject()) ); if (!a_dtdTag) //the tag is invalid, let's create a default one { diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index a169d745..02e61726 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -45,9 +45,9 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) initDialog(); - connect( buttonImgSource, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( buttonRecalcImgSize, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecalcImgSize()) ); - connect( lineImgSource, TQT_SIGNAL( returnPressed()), this, TQT_SLOT(slotLineFileSelect()) ); + connect( buttonImgSource, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( buttonRecalcImgSize, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecalcImgSize()) ); + connect( lineImgSource, TQ_SIGNAL( returnPressed()), this, TQ_SLOT(slotLineFileSelect()) ); } TagImgDlg::~TagImgDlg() diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index ff91277d..925d79c0 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -40,9 +40,9 @@ TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) setCaption(name); setModal(true); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); - connect( buttonAddressSelect, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAddress()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); + connect( buttonAddressSelect, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAddress()) ); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); lineEmail->setFocus(); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index bea9a81f..b95fe0e9 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -23,7 +23,7 @@ TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); - connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); + connect( miscWidget->elementName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotMiscTagChanged(const TQString & ) ) ); setMainWidget(miscWidget); miscWidget->addClosingTag->setChecked(addClosingTag); miscWidget->elementName->setText(element); diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..f070eeaf 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -33,8 +33,8 @@ TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) groupBox->insert(radioOrdered); groupBox->insert(radioUnordered); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } TagQuickListDlg::~TagQuickListDlg(){ diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 58b3044e..892f6dc9 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -50,7 +50,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_yourAnnotations->setLineWidth(2); addTab(m_yourAnnotations, i18n("For You")); - connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); + connect(m_yourAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); m_allAnnotations = new TDEListView(this); m_allAnnotations->addColumn("1", -1); @@ -59,14 +59,14 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_allAnnotations->header()->hide(); m_allAnnotations->setSorting(1); m_allAnnotations->setLineWidth(2); - connect(m_allAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); + connect(m_allAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); addTab(m_allAnnotations, i18n("All Files")); - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(tabChanged(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(tabChanged(TQWidget*))); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateNextFile())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateNextFile())); m_yourAnnotationsNum = 0; } diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index e1b5fc6a..3912fdf6 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -44,14 +44,14 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) setFocusPolicy( TQWidget::NoFocus ); m_popupMenu = new TDEPopupMenu(this); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); - m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; - m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ; + connect(this, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQ_SLOT(copyContent()) ) ; + m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveContent()) ) ; m_popupMenu->insertSeparator(); - m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ; + m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clear()) ) ; - connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListBoxItem*)), TQ_SLOT(clickItem(TQListBoxItem*)) ); } MessageOutput::~MessageOutput() diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index cfca7279..f789f911 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -79,10 +79,10 @@ Parser::Parser() m_parsingNeeded = true; m_parseIncludedFiles = true; m_saParser = new SAParser(); - connect(m_saParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(m_saParser, TQT_SIGNAL(cleanGroups()), TQT_SLOT(cleanGroups())); + connect(m_saParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(m_saParser, TQ_SIGNAL(cleanGroups()), TQ_SLOT(cleanGroups())); ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); } Parser::~Parser() @@ -567,7 +567,7 @@ Node *Parser::parse(Document *w, bool force) emit nodeTreeChanged(); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); return m_node; } @@ -1244,7 +1244,7 @@ Node *Parser::rebuild(Document *w) m_saParser->init(m_node, w); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); emit nodeTreeChanged(); m_parsingNeeded = false; return m_node; @@ -1297,7 +1297,7 @@ void Parser::clearGroups() ParserCommon::includedFilesDTD.clear(); delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); m_parseIncludedFiles = true; } @@ -1345,7 +1345,7 @@ void Parser::cleanGroups() { delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); parseIncludedFiles(); } } diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp index 000ba002..1b665ebf 100644 --- a/quanta/parsers/sagroupparser.cpp +++ b/quanta/parsers/sagroupparser.cpp @@ -46,7 +46,7 @@ SAGroupParser::SAGroupParser(SAParser *parent, Document *write, Node *startNode, m_write = write; m_count = 0; m_parseForGroupTimer = new TQTimer(this); - connect(m_parseForGroupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseForScriptGroup())); + connect(m_parseForGroupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseForScriptGroup())); } void SAGroupParser::slotParseForScriptGroup() diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 691c2d2e..fcf9b17d 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -44,9 +44,9 @@ SAParser::SAParser() m_parsingEnabled = true; m_synchronous = true; m_parseOneLineTimer = new TQTimer(this); - connect(m_parseOneLineTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseOneLine())); + connect(m_parseOneLineTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseOneLine())); m_parseInDetailTimer = new TQTimer(this); - connect(m_parseInDetailTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseNodeInDetail())); + connect(m_parseInDetailTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseNodeInDetail())); } SAParser::~SAParser() @@ -396,9 +396,9 @@ bool SAParser::slotParseOneLine() } } SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, g_endNode, m_synchronous, parsingLastNode, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } @@ -818,9 +818,9 @@ Node *SAParser::parsingDone() if (!m_synchronous) { SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, 0L, m_synchronous, true /*last node*/, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 1c5c572d..6c74b132 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -38,8 +38,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char addColumn(""); setSorting(-1); part = currentpart; - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *))); m_nodedict.setAutoDelete(true); title = ""; titleItem = new TQListViewItem(static_cast<TQListView *>(this), title, ""); diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index 18cf44da..ce078a8c 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -230,20 +230,20 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cancel->setIconSet(SmallIconSet("button_cancel")); //connect buttons - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(cssRulesAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newCSSRule())); - connect(cssRulesEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editCSSRule())); - connect (cssRulesDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentCSSRule())); - connect(metaItemsAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newMetaItem())); - connect(metaItemsDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentMetaItem())); - connect(title, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(titleChanged(const TQString &))); - connect(metaItems, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(metaChanged(TQListViewItem * ))); - connect(cssRules, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(CSSChanged(TQListViewItem * ))); - connect(cssStylesheet, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(linkChanged( const TQString& ))); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); + connect(cssRulesAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newCSSRule())); + connect(cssRulesEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editCSSRule())); + connect (cssRulesDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentCSSRule())); + connect(metaItemsAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newMetaItem())); + connect(metaItemsDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentMetaItem())); + connect(title, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(titleChanged(const TQString &))); + connect(metaItems, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(metaChanged(TQListViewItem * ))); + connect(cssRules, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(CSSChanged(TQListViewItem * ))); + connect(cssStylesheet, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(linkChanged( const TQString& ))); } htmlDocumentProperties::~htmlDocumentProperties() diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index ad300f88..fc0460ad 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -104,12 +104,12 @@ KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument // With the mix of Leo Savernik's caret Mode and the current editing // functions, it will be kind of VERY messy setCaretMode(true); - connect(this, TQT_SIGNAL(caretPositionChanged(const DOM::Node &, long)), - this, TQT_SLOT(slotNewCursorPos(const DOM::Node &, long))); + connect(this, TQ_SIGNAL(caretPositionChanged(const DOM::Node &, long)), + this, TQ_SLOT(slotNewCursorPos(const DOM::Node &, long))); setCaretDisplayPolicyNonFocused(TDEHTMLPart::CaretVisible); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), - this, TQT_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + this, TQ_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); view()->setMouseTracking(true); view()->installEventFilter(this); @@ -186,7 +186,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) kdDebug(25001) << "KafkaWidget::insertText() - added text - 1" << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); return; } } @@ -263,7 +263,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) } //document().updateRendering(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } void KafkaWidget::slotDelayedSetCaretPosition() @@ -467,7 +467,7 @@ void KafkaWidget::keyReturn(bool specialPressed) kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; //emit domNodeNewCursorPos(m_currentNode, d->m_cursorOffset); @@ -478,7 +478,7 @@ void KafkaWidget::keyReturn(bool specialPressed) << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) @@ -1533,7 +1533,7 @@ void KafkaWidget::keyBackspace() emit domNodeModified(temp, m_modifs); if(boolTmp) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } } @@ -1599,7 +1599,7 @@ void KafkaWidget::keyBackspace() { m_currentNode = _nodePrev; d->m_cursorOffset += (static_cast<DOM::CharacterData>(_nodePrev)).length(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } _nodePrev.setNodeValue(_nodePrev.nodeValue() + _node.nodeValue()); emit domNodeModified(_nodePrev, m_modifs); @@ -1620,7 +1620,7 @@ void KafkaWidget::keyBackspace() m_currentNode = m_currentNode.previousSibling(); d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } else if(!m_currentNode.nextSibling().isNull()) { @@ -2090,7 +2090,7 @@ void KafkaWidget::setCurrentNode(DOM::Node node, int offset) d->m_cursorOffset = offset; makeCursorVisible(); if(!m_currentNode.isNull() && m_currentNode.nodeName().string() != "#document") - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); //setCaretPosition(m_currentNode, (long)d->m_cursorOffset); } @@ -2141,7 +2141,7 @@ void KafkaWidget::putCursorAtFirstAvailableLocation() } m_currentNode = node; d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); #ifdef LIGHT_DEBUG @@ -2238,7 +2238,7 @@ void KafkaWidget::removeSelection() setCurrentNode(m_currentNode, domNodeCursorOffset); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); NodeSelection* cursorPos = new NodeSelection(); cursorPos->setCursorNode(cursorNode); diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 8cb3c05c..483454ee 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -116,17 +116,17 @@ TQString ab = i18n("Ident all"); file.close(); } - connect(m_kafkaPart, TQT_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); - - connect(m_kafkaPart, TQT_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), - this, TQT_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); + + connect(m_kafkaPart, TQ_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), + this, TQ_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); } diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 92f9b761..2de57fbf 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -53,11 +53,11 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable if (m_enableViewSource) { m_contextMenu = new TDEPopupMenu(parentWidget); - m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource())); + m_contextMenu->insertItem(i18n("View &Document Source"), this, TQ_SLOT(slotViewSource())); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQ_SLOT(popupMenu(const TQString&, const TQPoint&))); } - connect(browserExtension(), TQT_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQT_SLOT(openURL(const KURL&))); + connect(browserExtension(), TQ_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQ_SLOT(openURL(const KURL&))); // setCharset( konqConfig.readEntry("DefaultEncoding") ); // setEncoding( konqConfig.readEntry("DefaultEncoding") ); diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index fcfd9427..71b6fe1d 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -73,7 +73,7 @@ void QuantaPlugin::setPluginName(const TQString &a_name) m_name = a_name; if (!m_action) { - m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); + m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQ_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); } m_action->setText(a_name); } @@ -184,8 +184,8 @@ bool QuantaPlugin::run() } addWidget(); setRunning(true); - connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + connect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); emit pluginStarted(); @@ -287,8 +287,8 @@ bool QuantaPlugin::unload(bool remove) if(!isLoaded()) return false; - disconnect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + disconnect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); delete (KParts::ReadOnlyPart*) m_part; m_part = 0; diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp index 57488d2f..f4f509d7 100644 --- a/quanta/plugins/quantapluginconfig.cpp +++ b/quanta/plugins/quantapluginconfig.cpp @@ -47,8 +47,8 @@ QuantaPluginConfig::QuantaPluginConfig(TQWidget *a_parent, const char *a_name) m_pluginConfigWidget->outputWindow->insertStringList(windows); m_pluginConfigWidget->iconButton->setStrictIconSize(false); - connect(m_pluginConfigWidget->pluginName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); - connect(m_pluginConfigWidget->locationButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectLocation())); + connect(m_pluginConfigWidget->pluginName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(nameChanged(const TQString &))); + connect(m_pluginConfigWidget->locationButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectLocation())); setMainWidget(m_pluginConfigWidget); } diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index ba5294f2..a3ec85bb 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -52,14 +52,14 @@ QuantaPluginEditor::QuantaPluginEditor(TQWidget *a_parent, const char *a_name) m_pluginEditorWidget->pluginList->setAllColumnsShowFocus(true); m_pluginEditorWidget->pluginList->setColumnAlignment(2, TQt::AlignHCenter); - connect(this, TQT_SIGNAL(pluginsChanged()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->refreshButton, TQT_SIGNAL(clicked()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addPlugin())); - connect(m_pluginEditorWidget->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removePlugin())); - connect(m_pluginEditorWidget->addSearchPathButton, TQT_SIGNAL(clicked()), TQT_SLOT(addSearchPath())); - connect(m_pluginEditorWidget->configureButton, TQT_SIGNAL(clicked()), TQT_SLOT(configurePlugin())); - connect(m_pluginEditorWidget->pluginList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(pluginsChanged()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->refreshButton, TQ_SIGNAL(clicked()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addPlugin())); + connect(m_pluginEditorWidget->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removePlugin())); + connect(m_pluginEditorWidget->addSearchPathButton, TQ_SIGNAL(clicked()), TQ_SLOT(addSearchPath())); + connect(m_pluginEditorWidget->configureButton, TQ_SIGNAL(clicked()), TQ_SLOT(configurePlugin())); + connect(m_pluginEditorWidget->pluginList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); } QuantaPluginEditor::~QuantaPluginEditor() diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index ce838550..d963f3a1 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -42,7 +42,7 @@ QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent) { m_parent = parent; (void) new TDEAction( i18n( "Configure &Plugins..." ), 0, 0, - this, TQT_SLOT( slotPluginsEdit() ), + this, TQ_SLOT( slotPluginsEdit() ), ((TDEMainWindow*)parent)->actionCollection(), "configure_plugins" ); m_pluginMenu = 0L; // m_plugins.setAutoDelete(true); diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 107ba14a..48e13beb 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -72,7 +72,7 @@ Project::Project(TDEMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); - connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_mainWindow = parent; d->m_uploadDialog = 0L; keepPasswd = true; @@ -131,8 +131,8 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !destination.isEmpty() ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), d, - TQT_SLOT(slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), d, + TQ_SLOT(slotDeleteCopytoDlg(CopyTo*))); url = dlg->copy( nameURL, destination ); } else // Copy canceled, addition aborted @@ -307,10 +307,10 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) (!destination.isEmpty()) ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), d, - TQT_SLOT (slotDeleteCopytoDlg(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), d, + TQ_SLOT (slotDeleteCopytoDlg(CopyTo *))); //if ( rdir.right(1) == "/" ) rdir.remove( rdir.length()-1,1); dirURL = dlg->copy(dirURL, destination); return; @@ -477,10 +477,10 @@ void Project::slotOptions() optionsPage.lineEmail->setText( d->email ); // Signals to handle debugger settings - connect(optionsPage.buttonDebuggerOptions, TQT_SIGNAL(clicked()), - d, TQT_SLOT(slotDebuggerOptions())); - connect(optionsPage.comboDebuggerClient, TQT_SIGNAL(activated(const TQString &)), - d, TQT_SLOT(slotDebuggerChanged(const TQString &))); + connect(optionsPage.buttonDebuggerOptions, TQ_SIGNAL(clicked()), + d, TQ_SLOT(slotDebuggerOptions())); + connect(optionsPage.comboDebuggerClient, TQ_SIGNAL(activated(const TQString &)), + d, TQ_SLOT(slotDebuggerChanged(const TQString &))); // Debuggers Combo @@ -863,7 +863,7 @@ void Project::slotUpload() if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(KURL(), "", false, false, false, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -878,7 +878,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -1052,8 +1052,8 @@ void Project::slotReloadProjectDocs() { delete d->m_dirWatch; d->m_dirWatch = new KDirWatch(this); - connect(d->m_dirWatch, TQT_SIGNAL(dirty(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); - connect(d->m_dirWatch, TQT_SIGNAL(deleted(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(dirty(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(deleted(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); if (d->baseURL.isLocalFile()) d->m_dirWatch->addDir(d->baseURL.path() + "/doc"); KURL url; diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index b845a40b..1503b951 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -67,21 +67,21 @@ ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) linePrjTmpl->setText("templates"); linePrjToolbar->setText("toolbars"); - connect(comboProtocol, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotProtocolChanged(const TQString &))); - connect( linePrjFile, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotButtonDir())); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeNames(const TQString &))); - connect( linePrjTmpl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonTmpl, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonTmpl())); - connect( linePrjToolbar, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonToolbar, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonToolbar())); + connect(comboProtocol, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotProtocolChanged(const TQString &))); + connect( linePrjFile, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotButtonDir())); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeNames(const TQString &))); + connect( linePrjTmpl, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonTmpl, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonTmpl())); + connect( linePrjToolbar, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonToolbar, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonToolbar())); linePrjTmpl->installEventFilter(this); linePrjToolbar->installEventFilter(this); diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 1f4750b1..6964b030 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -59,13 +59,13 @@ ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) checkInsertWeb->setChecked( true ); - connect( checkInsert, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWeb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWithMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); + connect( checkInsert, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWeb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWithMask, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); - connect(addFiles, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFiles())); - connect(addFolder, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFolder())); - connect(clearList, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClearList())); + connect(addFiles, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFiles())); + connect(addFolder, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFolder())); + connect(clearList, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClearList())); } ProjectNewLocal::~ProjectNewLocal(){ @@ -202,10 +202,10 @@ void ProjectNewLocal::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); list = dlg->copy( list, destination ); return; } else @@ -263,10 +263,10 @@ void ProjectNewLocal::slotAddFolder() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); dirURL = dlg->copy(dirURL, destination); return; } else diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index d1692ab6..7e904fe8 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -49,14 +49,14 @@ ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) listView->removeColumn(1); listView->removeColumn(1); - connect( commandLine, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (enableStart(const TQString&))); - connect( siteUrl, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (setCommandL(const TQString&))); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT (slotStart())); - connect( protocolCombo,TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT (setProtocol(const TQString&))); + connect( commandLine, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (enableStart(const TQString&))); + connect( siteUrl, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (setCommandL(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT (slotStart())); + connect( protocolCombo,TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT (setProtocol(const TQString&))); start = false; KLed1->setState(KLed::Off); @@ -115,12 +115,12 @@ void ProjectNewWeb::slotStart() *proc << *it; } - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess *)), this, - TQT_SLOT( slotGetWgetExited(TDEProcess *))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess *)), this, + TQ_SLOT( slotGetWgetExited(TDEProcess *))); if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 1c8f7179..f1e13c5d 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -83,73 +83,73 @@ ProjectPrivate::~ProjectPrivate() void ProjectPrivate::initActions(TDEActionCollection *ac) { (void) new TDEAction( i18n( "&New Project..." ), "window-new", 0, - this, TQT_SLOT( slotNewProject() ), + this, TQ_SLOT( slotNewProject() ), ac, "project_new" ); (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0, - this, TQT_SLOT( slotOpenProject() ), + this, TQ_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(parent, TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); m_projectRecent->setToolTip(i18n("Open/Open recent project")); - connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); + connect(m_projectRecent, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenProject())); closeprjAction = new TDEAction( i18n( "&Close Project" ), "window-close", 0, - this, TQT_SLOT( slotCloseProject() ), + this, TQ_SLOT( slotCloseProject() ), ac, "project_close" ); openPrjViewAction = new TDESelectAction( i18n( "Open Project &View..." ), 0, ac, "project_view_open" ); - connect(openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotOpenProjectView(const TQString &))); openPrjViewAction->setToolTip(i18n("Open project view")); savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "document-save", 0, - this, TQT_SLOT( slotSaveProjectView() ), + this, TQ_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "document-save-as", 0, - this, TQT_SLOT( slotSaveAsProjectView() ), + this, TQ_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "edit-delete", 0, ac, "project_view_delete" ); - connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotDeleteProjectView(const TQString &))); deletePrjViewAction->setToolTip(i18n("Close project view")); insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0, - this, TQT_SLOT( slotAddFiles() ), + this, TQ_SLOT( slotAddFiles() ), ac, "project_insert_file" ); insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0, - this, TQT_SLOT( slotAddDirectory() ), + this, TQ_SLOT( slotAddDirectory() ), ac, "project_insert_directory" ); rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - parent, TQT_SLOT( slotRescanPrjDir() ), + parent, TQ_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "go-up", Key_F8, - parent, TQT_SLOT( slotUpload() ), + parent, TQ_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - parent, TQT_SLOT( slotOptions() ), + parent, TQ_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = new TDEAction( i18n( "Save as Project Template..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = new TDEAction( i18n( "Save Selection to Project Template File..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); } @@ -1145,27 +1145,27 @@ void ProjectPrivate::slotNewProject() wiz->setNextEnabled ( pnf, false ); wiz->setFinishEnabled( pnf, true ); - connect( png, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnl, TQT_SLOT( setBaseURL(const KURL&))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnw, TQT_SLOT( setBaseURL(const KURL&))); - connect( this,TQT_SIGNAL(setLocalFiles(bool)), - pnl, TQT_SLOT(slotSetFiles(bool))); + connect( png, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnl, TQ_SLOT( setBaseURL(const KURL&))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnw, TQ_SLOT( setBaseURL(const KURL&))); + connect( this,TQ_SIGNAL(setLocalFiles(bool)), + pnl, TQ_SLOT(slotSetFiles(bool))); - connect(wiz, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT (slotSelectProjectType(const TQString &))); - connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); - - connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - parent, TQT_SIGNAL(enableMessageWidget())); - connect( pnw, TQT_SIGNAL(messages(const TQString&)), - parent, TQT_SLOT (slotGetMessages(const TQString&))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setBackEnabled(TQWidget*,bool))); + connect(wiz, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT (slotSelectProjectType(const TQString &))); + connect(wiz, TQ_SIGNAL(helpClicked()), TQ_SLOT(slotNewProjectHelpClicked())); + + connect( pnw, TQ_SIGNAL(enableMessagesWidget()), + parent, TQ_SIGNAL(enableMessageWidget())); + connect( pnw, TQ_SIGNAL(messages(const TQString&)), + parent, TQ_SLOT (slotGetMessages(const TQString&))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setBackEnabled(TQWidget*,bool))); TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); @@ -1204,13 +1204,13 @@ void ProjectPrivate::slotNewProject() void ProjectPrivate::slotCloseProject() { if (!parent->hasProject()) return; - connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + connect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); parent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) { - disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + disconnect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); if (!success) return; emit eventHappened("before_project_close", baseURL.url(), TQString()); if (!uploadProjectFile()) @@ -1446,10 +1446,10 @@ void ProjectPrivate::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), - TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), + TQ_SLOT (slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), parent, + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; } diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index 481ea134..8c949951 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -83,7 +83,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool { if (markOnly) markAsUploaded->setChecked(true); - TQTimer::singleShot(10, this, TQT_SLOT(slotBuildTree())); + TQTimer::singleShot(10, this, TQ_SLOT(slotBuildTree())); currentItem = 0L; } } @@ -149,7 +149,7 @@ void ProjectUpload::initProjectInfo(const TQString& defaultProfile) buttonRemoveProfile->setEnabled(comboProfile->count() > 1); keepPasswords->setChecked(m_project->keepPasswd); uploadInProgress = false; - connect( this, TQT_SIGNAL( uploadNext() ), TQT_SLOT( slotUploadNext() ) ); + connect( this, TQ_SIGNAL( uploadNext() ), TQ_SLOT( slotUploadNext() ) ); setProfileTooltip(); } @@ -456,12 +456,12 @@ void ProjectUpload::upload() emit eventHappened("before_upload", from.url(), to.url()); TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this, - TQT_SLOT( uploadFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), - this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), - this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),this, + TQ_SLOT( uploadFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), + this, TQ_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), + this, TQ_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index e78eb438..89c65e86 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -56,22 +56,22 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, co TDEIO::ListJob *job = TDEIO::listRecursive( baseURL, false ); m_listJobCount = 1; - connect( job, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); - - - connect( buttonSelect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelect())); - connect( buttonDeselect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeselect())); - connect( buttonInvert, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInvert())); - connect( buttonExpand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotExpand())); - connect( buttonCollapse, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCollapse())); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); + + + connect( buttonSelect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelect())); + connect( buttonDeselect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeselect())); + connect( buttonInvert, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInvert())); + connect( buttonExpand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotExpand())); + connect( buttonCollapse, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCollapse())); } RescanPrj::~RescanPrj() @@ -151,10 +151,10 @@ void RescanPrj::addEntries(TDEIO::Job *job,const TDEIO::UDSEntryList &list) TDEIO::ListJob *ljob = TDEIO::listRecursive( (*it)->url(), false ); m_listJobCount++; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); } } diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 6ca6e6ab..49b3d195 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -200,25 +200,25 @@ Document::Document(KTextEditor::Document *doc, //path of the backup copy file of the document m_backupPathValue = TQString(); - connect( m_doc, TQT_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), - this, TQT_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); + connect( m_doc, TQ_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), + this, TQ_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); - connect( m_view, TQT_SIGNAL(completionAborted()), - this, TQT_SLOT( slotCompletionAborted()) ); + connect( m_view, TQ_SIGNAL(completionAborted()), + this, TQ_SLOT( slotCompletionAborted()) ); - connect( m_view, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - this, TQT_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); + connect( m_view, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); - connect( m_view, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), - this, TQT_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); - connect( m_doc, TQT_SIGNAL(textChanged()), TQT_SLOT(slotTextChanged())); + connect( m_view, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), + this, TQ_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); + connect( m_doc, TQ_SIGNAL(textChanged()), TQ_SLOT(slotTextChanged())); - connect(m_view, TQT_SIGNAL(gotFocus(Kate::View*)), TQT_SIGNAL(editorGotFocus())); + connect(m_view, TQ_SIGNAL(gotFocus(Kate::View*)), TQ_SIGNAL(editorGotFocus())); - connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotFileDirty(const TQString&))); + connect(fileWatcher, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotFileDirty(const TQString&))); -// connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(slotMarksChanged())); - connect(m_doc, TQT_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQT_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); +// connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(slotMarksChanged())); + connect(m_doc, TQ_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQ_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); } @@ -725,7 +725,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) /* if (completion.type == "charCompletion") { m_lastCompletionList = getCharacterCompletions(completion.userdata); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } else*/ if (completion.type == "attribute") { @@ -736,7 +736,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) if (tag) { m_lastCompletionList = getAttributeValueCompletions(tag->name(), completion.text); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } } } else @@ -755,7 +755,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) { m_lastLine = line; m_lastCol = col - 1; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedScriptAutoCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedScriptAutoCompletion())); } } } @@ -859,7 +859,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(string[0].unicode()); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -872,7 +872,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(c); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -2367,7 +2367,7 @@ void Document::slotTextChanged() { kdDebug(24000) << "Delayed text changed called." << endl; //delay the handling, otherwise we may get wrong values for (line,column) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedTextChanged())); delayedTextChangedEnabled = false; } } @@ -2378,7 +2378,7 @@ void Document::slotDelayedTextChanged(bool forced) { kdDebug(24000) << "Reparsing delayed!" << endl; parser->setParsingNeeded(true); - TQTimer::singleShot(1000, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDelayedTextChanged())); reparseEnabled = false; delayedTextChangedEnabled = false; return; @@ -2872,8 +2872,8 @@ void Document::open(const KURL &url, const TQString &encoding) m_encoding = encoding; m_codec = TQTextCodec::codecForName(m_encoding.ascii()); } - connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + connect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + connect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); if (!openURL(url)) slotOpeningFailed(TQString()); if (!url.isLocalFile()) @@ -2897,8 +2897,8 @@ void Document::slotOpeningCompleted() m_modifTime = TQFileInfo(u.path()).lastModified(); // kdDebug(24000) << "addFile[Document::open]: " << u.path() << endl; } - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); m_dirty = false; m_view->setFocus(); processDTD(); @@ -2911,8 +2911,8 @@ void Document::slotOpeningFailed(const TQString &errorMessage) Q_UNUSED(errorMessage); //TODO: append the error message to our own error message if (!url().isLocalFile()) tqApp->exit_loop(); - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); emit openingFailed(url()); } diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 737a3a00..bf257a0c 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -59,9 +59,9 @@ const TQString m_rcFilename("description.rc"); DTDs::DTDs(TQObject *parent) :TQObject(parent) { - connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash())); - connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool))); - connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); + connect(this, TQ_SIGNAL(hideSplash()), parent, TQ_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(enableIdleTimer(bool)), parent, TQ_SLOT(slotEnableIdleTimer(bool))); + connect(this, TQ_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQ_SLOT(slotLoadToolbarForDTD(const TQString&))); // kdDebug(24000) << "dtds::dtds" << endl; m_dict = new TQDict<DTDStruct>(119, false); //optimized for max 119 DTD. This should be enough. m_dict->setAutoDelete(true); diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index fc826178..8bd35024 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -93,8 +93,8 @@ KQApplication::KQApplication() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); @@ -164,8 +164,8 @@ int KQUniqueApplication::newInstance() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 11b8efeb..46a098df 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -219,7 +219,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( currentToolbarDTD = TQString(); m_config=kapp->config(); idleTimer = new TQTimer(this); - connect(idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimerExpired())); + connect(idleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimerExpired())); m_idleTimerEnabled = true; qConfig.globalDataDir = TDEGlobal::dirs()->findResourceDir("data",resourceDir + "toolbar/quantalogo.png"); @@ -230,7 +230,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( kdWarning() << i18n("Quanta data files were not found.") << endl; kdWarning() << i18n("You may have forgotten to run \"make install\", or your TDEDIR, TDEDIRS or PATH are not set correctly.") << endl; kdWarning() << "***************************************************************************" << endl; - TQTimer::singleShot(20, kapp, TQT_SLOT(quit())); + TQTimer::singleShot(20, kapp, TQ_SLOT(quit())); return; } qConfig.enableDTDToolbar = true; @@ -243,10 +243,10 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_partManager = new KParts::PartManager(this); // When the manager says the active part changes, // the builder updates (recreates) the GUI - connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), - this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); - connect(this, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQT_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); - connect(tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget *)), this, TQT_SLOT(slotTabDragged(TQWidget*))); + connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), + this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); + connect(this, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQ_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); + connect(tabWidget(), TQ_SIGNAL(initiateDrag(TQWidget *)), this, TQ_SLOT(slotTabDragged(TQWidget*))); m_oldKTextEditor = 0L; m_previewToolView = 0L; @@ -280,9 +280,9 @@ QuantaApp::~QuantaApp() m_newScriptStuff = 0L; delete m_newDTEPStuff; m_newDocStuff = 0L; - // disconnect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *))); - // disconnect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *))); - disconnect(this, TQT_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQT_SLOT(slotLastViewClosed())); + // disconnect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *))); + // disconnect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *))); + disconnect(this, TQ_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQ_SLOT(slotLastViewClosed())); //kdDebug(24000) << "QuantaApp::~QuantaApp" << endl; #ifdef ENABLE_CVSSERVICE delete CVSService::ref(); @@ -1081,7 +1081,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar) } } - connect(dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotNewToolbarConfig())); + connect(dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotNewToolbarConfig())); dlg->exec(); delete dlg; TQPopupMenu *menu = 0L; @@ -1389,8 +1389,8 @@ void QuantaApp::slotShowPreviewWidget(bool show) if (!m_previewToolView) { m_previewToolView= addToolWindow(m_htmlPart->view(), prevDockPosition(m_htmlPart->view(), KDockWidget::DockBottom), getMainDockWidget()); - connect(m_previewToolView->wrapperWidget(), TQT_SIGNAL(iMBeingClosed -()), this, TQT_SLOT(slotPreviewBeingClosed())); + connect(m_previewToolView->wrapperWidget(), TQ_SIGNAL(iMBeingClosed +()), this, TQ_SLOT(slotPreviewBeingClosed())); } m_htmlPart->view()->show(); m_previewToolView->show(); @@ -1819,10 +1819,10 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl toolbarTab->insertTab(tb, tabname, idStr); qInstallMsgHandler( oldHandler ); - connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)), - TQT_SLOT(slotRemoveAction(const TQString&, const TQString&))); - connect(tb, TQT_SIGNAL(editAction(const TQString&)), - TQT_SLOT(slotEditAction(const TQString&))); + connect(tb, TQ_SIGNAL(removeAction(const TQString&, const TQString&)), + TQ_SLOT(slotRemoveAction(const TQString&, const TQString&))); + connect(tb, TQ_SIGNAL(editAction(const TQString&)), + TQ_SLOT(slotEditAction(const TQString&))); return tb; } @@ -3694,7 +3694,7 @@ void QuantaApp::slotDownloadDoc() if (!m_newDocStuff) { m_newDocStuff = new QNewDocStuff("quanta documentation", this); - connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree())); + connect(m_newDocStuff, TQ_SIGNAL(installFinished()), dTab, TQ_SLOT(slotRefreshTree())); } m_newDocStuff->downloadResource(); } @@ -5092,8 +5092,8 @@ void QuantaApp::initTabWidget(bool closeButtonsOnly) { tab->setTabReorderingEnabled(true); tab->setTabPosition(TQTabWidget::Bottom); - connect(tab, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); - connect(tab, TQT_SIGNAL(initiateTabMove(int, int)), this, TQT_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQT_SIGNAL(movedTab(int, int)), this, TQT_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); + connect(tab, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); + connect(tab, TQ_SIGNAL(initiateTabMove(int, int)), this, TQ_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQ_SIGNAL(movedTab(int, int)), this, TQ_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); } } if (!closeButtonsOnly) @@ -5267,10 +5267,10 @@ void QuantaApp::createPreviewPart() m_htmlPart->view()->setIcon(UserIcon("preview")); m_htmlPart->view()->setCaption(i18n("Preview")); slotNewPart(m_htmlPart, false); - connect(m_htmlPart, TQT_SIGNAL(previewHasFocus(bool)), this, TQT_SLOT(slotPreviewHasFocus(bool))); - connect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); - connect(m_htmlPart, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); - connect(m_htmlPart, TQT_SIGNAL(showPreview(bool)), this, TQT_SLOT(slotShowPreviewWidget(bool))); + connect(m_htmlPart, TQ_SIGNAL(previewHasFocus(bool)), this, TQ_SLOT(slotPreviewHasFocus(bool))); + connect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPart, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); + connect(m_htmlPart, TQ_SIGNAL(showPreview(bool)), this, TQ_SLOT(slotShowPreviewWidget(bool))); } @@ -5281,7 +5281,7 @@ void QuantaApp::createDocPart() m_htmlPartDoc->view()->setIcon(SmallIcon("contents")); m_htmlPartDoc->view()->setCaption(i18n("Documentation")); slotNewPart(m_htmlPartDoc, false); - connect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); } void QuantaApp::insertTagActionPoolItem(TQString const& action_item) @@ -5320,14 +5320,14 @@ void QuantaApp::slotTabMoved(int from, int to) KMdiChildView *view = m_pDocumentViews->at(from); m_pDocumentViews->remove(from); m_pDocumentViews->insert(to, view); - connect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + connect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } void QuantaApp::slotTabAboutToMove(int from, int to) { Q_UNUSED(from); Q_UNUSED(to); - disconnect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } TQString QuantaApp::currentURL() const diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 134e34a4..42e72e38 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -123,7 +123,7 @@ QuantaInit::QuantaInit(QuantaApp * quantaApp) : TQObject() { m_quanta = quantaApp; - connect(this, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); } QuantaInit::~QuantaInit() @@ -175,11 +175,11 @@ void QuantaInit::initQuanta() // Initialize debugger m_quanta->m_debugger = new DebuggerManager(m_quanta); - connect(Project::ref(), TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->m_debugger, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(Project::ref(), TQT_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), - m_quanta->m_debugger, TQT_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); - connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(Project::ref(), TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->m_debugger, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(Project::ref(), TQ_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), + m_quanta->m_debugger, TQ_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); + connect(m_quanta->m_debugger, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); //m_quanta->KDockMainWindow::createGUI( TQString(), false /* conserveMemory */ ); m_quanta->createShellGUI(true); @@ -213,7 +213,7 @@ void QuantaInit::initQuanta() if (mdiMode == KMdi::ToplevelMode) { m_quanta->switchToChildframeMode(); - TQTimer::singleShot(0, m_quanta, TQT_SLOT(switchToToplevelMode())); + TQTimer::singleShot(0, m_quanta, TQ_SLOT(switchToToplevelMode())); } // Always hide debugger toolbar at this point @@ -257,19 +257,19 @@ void QuantaInit::initQuanta() toolviewMenu->plug(m_quanta->windowMenu()); TQPopupMenu *toolbarsMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("toolbars_load", m_quanta); - connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotBuildPrjToolbarsMenu())); + connect(toolbarsMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotBuildPrjToolbarsMenu())); TQPopupMenu *contextMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta); - connect(contextMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotContextMenuAboutToShow())); + connect(contextMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotContextMenuAboutToShow())); - connect(m_quanta->m_messageOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_problemOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_messageOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_problemOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_quanta->slotFileNew(); m_quanta->slotNewStatus(); @@ -283,12 +283,12 @@ void QuantaInit::initQuanta() qConfig.backupDirPath = TDEGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); m_quanta->autosaveTimer = new TQTimer(m_quanta); - connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotAutosaveTimer())); + connect(m_quanta->autosaveTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotAutosaveTimer())); m_quanta->autosaveTimer->start(qConfig.autosaveInterval * 60000, false); - connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); - connect(parser, TQT_SIGNAL(rebuildStructureTree(bool)), - m_quanta, TQT_SLOT(slotReloadStructTreeView(bool))); + connect(m_quanta->m_doc, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + connect(parser, TQ_SIGNAL(rebuildStructureTree(bool)), + m_quanta, TQ_SLOT(slotReloadStructTreeView(bool))); // Read list of characters TQFile file(locate("appdata","chars")); @@ -319,7 +319,7 @@ void QuantaInit::initQuanta() ViewManager::ref()->activeDocument()->view()->setFocus(); m_quanta->refreshTimer = new TQTimer(m_quanta); - connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotReparse())); + connect(m_quanta->refreshTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotReparse())); m_quanta->refreshTimer->start( qConfig.refreshFrequency*1000, false ); //update the structure tree every 5 seconds if (qConfig.instantUpdate || qConfig.refreshFrequency == 0) { @@ -337,8 +337,8 @@ void QuantaInit::initToolBars() void QuantaInit::initStatusBar() { m_quanta->statusbarTimer = new TQTimer(m_quanta); - connect(m_quanta->statusbarTimer,TQT_SIGNAL(timeout()), - m_quanta, TQT_SLOT(statusBarTimeout())); + connect(m_quanta->statusbarTimer,TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(statusBarTimeout())); progressBar = new KProgress(m_quanta->statusBar()); progressBar->setTextEnabled(false); @@ -360,111 +360,111 @@ void QuantaInit::initStatusBar() void QuantaInit::initDocument() { m_quanta->m_doc = new QuantaDoc(0L); - connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()), - m_quanta, TQT_SLOT(slotNewStatus())); + connect(m_quanta->m_doc, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); } void QuantaInit::initProject() { Project *m_project = Project::ref(m_quanta); - connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)), - pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *))); - connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)), - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL &))); - connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)), - m_quanta, TQT_SLOT(slotGetUserToolbarFiles(KURL::List *))); - connect(m_project, TQT_SIGNAL(openFiles(const KURL::List &, const TQString&)), - m_quanta, TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&))); - connect(m_project, TQT_SIGNAL(openFile(const KURL &, const TQString&)), - m_quanta, TQT_SLOT(slotFileOpen(const KURL &, const TQString&))); - connect(m_project, TQT_SIGNAL(closeFile(const KURL &)), - m_quanta, TQT_SLOT(slotFileClose(const KURL &))); - connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); - connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll())); - connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(downloadTemplate()), - m_quanta, TQT_SLOT(slotDownloadTemplate())); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQT_SLOT(slotUploadTemplate(const TQString&))); + connect(m_project, TQ_SIGNAL(getTreeStatus(TQStringList *)), + pTab, TQ_SLOT(slotGetTreeStatus(TQStringList *))); + connect(m_project, TQ_SIGNAL(loadToolbarFile(const KURL &)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL &))); + connect(m_project, TQ_SIGNAL(getUserToolbarFiles(KURL::List *)), + m_quanta, TQ_SLOT(slotGetUserToolbarFiles(KURL::List *))); + connect(m_project, TQ_SIGNAL(openFiles(const KURL::List &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL::List &, const TQString&))); + connect(m_project, TQ_SIGNAL(openFile(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL &, const TQString&))); + connect(m_project, TQ_SIGNAL(closeFile(const KURL &)), + m_quanta, TQ_SLOT(slotFileClose(const KURL &))); + connect(m_project, TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + pTab, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(m_project, TQ_SIGNAL(closeFiles()), ViewManager::ref(), TQ_SLOT(closeAll())); + connect(m_project, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(downloadTemplate()), + m_quanta, TQ_SLOT(slotDownloadTemplate())); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQ_SLOT(slotUploadTemplate(const TQString&))); // inform project if something was renamed - connect(pTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(m_quanta->fTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(tTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - - connect(pTab, TQT_SIGNAL(insertToProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(pTab, TQT_SIGNAL(removeFromProject(const KURL&)), - m_project, TQT_SLOT(slotRemove(const KURL&))); - connect(pTab, TQT_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), - m_project, TQT_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); - connect(pTab, TQT_SIGNAL(rescanProjectDir()), m_project, TQT_SLOT(slotRescanPrjDir())); - connect(pTab, TQT_SIGNAL(showProjectOptions()), m_project, TQT_SLOT(slotOptions())); - connect(pTab, TQT_SIGNAL(uploadProject()), m_project, TQT_SLOT(slotUpload())); - - connect(m_quanta->dTab, TQT_SIGNAL(reloadProjectDocs()), m_project, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQT_SLOT(slotAddProjectDoc(const KURL&))); - - connect(m_project, TQT_SIGNAL(enableMessageWidget()), - m_quanta, TQT_SLOT(slotShowMessagesView())); - - connect(m_project, TQT_SIGNAL(messages(const TQString&)), - m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&))); - - connect(m_project, TQT_SIGNAL(newStatus()), - m_quanta, TQT_SLOT(slotNewStatus())); - - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - pTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->fTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->annotationOutput(), TQT_SLOT(updateAnnotations())); - - connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)), - m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&))); - connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)), - m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int))); - connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), - m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); - - connect(m_project, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); - - connect(m_project, TQT_SIGNAL(statusMsg(const TQString &)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(pTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(m_quanta->fTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(tTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + + connect(pTab, TQ_SIGNAL(insertToProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(pTab, TQ_SIGNAL(removeFromProject(const KURL&)), + m_project, TQ_SLOT(slotRemove(const KURL&))); + connect(pTab, TQ_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), + m_project, TQ_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); + connect(pTab, TQ_SIGNAL(rescanProjectDir()), m_project, TQ_SLOT(slotRescanPrjDir())); + connect(pTab, TQ_SIGNAL(showProjectOptions()), m_project, TQ_SLOT(slotOptions())); + connect(pTab, TQ_SIGNAL(uploadProject()), m_project, TQ_SLOT(slotUpload())); + + connect(m_quanta->dTab, TQ_SIGNAL(reloadProjectDocs()), m_project, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQ_SLOT(slotAddProjectDoc(const KURL&))); + + connect(m_project, TQ_SIGNAL(enableMessageWidget()), + m_quanta, TQ_SLOT(slotShowMessagesView())); + + connect(m_project, TQ_SIGNAL(messages(const TQString&)), + m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&))); + + connect(m_project, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); + + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + TemplatesTreeView::ref(), TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + pTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->fTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->annotationOutput(), TQ_SLOT(updateAnnotations())); + + connect(pTab, TQ_SIGNAL(changeFileDescription(const KURL&, const TQString&)), + m_project, TQ_SLOT(slotFileDescChanged(const KURL&, const TQString&))); + connect(pTab, TQ_SIGNAL(changeUploadStatus(const KURL&, int)), + m_project, TQ_SLOT(slotUploadStatusChanged(const KURL&, int))); + connect(pTab, TQ_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), + m_project, TQ_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); + + connect(m_project, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + + connect(m_project, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); } void QuantaInit::initView() { ViewManager *m_viewManager = ViewManager::ref(m_quanta); - connect(m_quanta, TQT_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(m_quanta, TQT_SIGNAL(lastChildViewClosed()), m_viewManager, TQT_SLOT(slotLastViewClosed())); -// connect(m_quanta, TQT_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewDeactivated(KMdiChildView*))); + connect(m_quanta, TQ_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(m_quanta, TQ_SIGNAL(lastChildViewClosed()), m_viewManager, TQ_SLOT(slotLastViewClosed())); +// connect(m_quanta, TQ_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewDeactivated(KMdiChildView*))); KafkaDocument *m_kafkaDocument = KafkaDocument::ref(0, 0, "KafkaPart"); m_kafkaDocument->getKafkaWidget()->view()->setMinimumHeight(50); m_kafkaDocument->readConfig(quantaApp->config()); loadVPLConfig(); ToolbarTabWidget *toolBarTab = ToolbarTabWidget::ref(quantaApp); - connect(toolBarTab, TQT_SIGNAL(iconTextModeChanged()), quantaApp, TQT_SLOT(slotRefreshActiveWindow())); + connect(toolBarTab, TQ_SIGNAL(iconTextModeChanged()), quantaApp, TQ_SLOT(slotRefreshActiveWindow())); //set the toolview and close button style before the GUI is created m_config->setGroup("General Options"); @@ -487,8 +487,8 @@ void QuantaInit::initView() m_quanta->m_messageOutput = new MessageOutput(m_quanta, "Messages"); m_quanta->m_messageOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_messageOutput->showMessage(i18n("Message Window...")); - connect(m_quanta, TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(m_quanta, TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); + connect(m_quanta, TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(m_quanta, TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); m_quanta->m_problemOutput = new MessageOutput(m_quanta, "Problems"); m_quanta->m_problemOutput->setFocusPolicy(TQWidget::NoFocus); @@ -498,59 +498,59 @@ void QuantaInit::initView() m_quanta->createPreviewPart(); m_quanta->createDocPart(); - connect(m_quanta, TQT_SIGNAL(reloadAllTrees()), - m_quanta->fTab, TQT_SLOT(slotReloadAllTrees())); - - connect(pTab, TQT_SIGNAL(loadToolbarFile (const KURL&)), - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(viewActivated(const KURL&)), - pTab, TQT_SLOT(slotViewActivated(const KURL&))); - - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - pTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - tTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->scriptTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->fTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - - connect(tTab, TQT_SIGNAL(insertFile (const KURL &)), - m_quanta, TQT_SLOT(slotInsertFile(const KURL &))); - - connect(m_quanta->scriptTab, TQT_SIGNAL(openFileInPreview(const KURL &)), - m_quanta, TQT_SLOT(slotOpenFileInPreview(const KURL &))); - connect(m_quanta->scriptTab, TQT_SIGNAL(showPreviewWidget(bool)), - m_quanta, TQT_SLOT(slotShowPreviewWidget(bool))); - connect(m_quanta->scriptTab, TQT_SIGNAL(assignActionToScript(const KURL &, const TQString&)), - m_quanta, TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); - connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), m_quanta, TQT_SLOT(slotDownloadScript())); - connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), m_quanta, TQT_SLOT(slotUploadScript(const TQString&))); - connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), m_quanta, TQT_SLOT(slotDownloadDoc())); - - connect(m_quanta->m_htmlPart, TQT_SIGNAL(onURL(const TQString&)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString&))); - connect(m_quanta->m_htmlPartDoc, TQT_SIGNAL(onURL(const TQString&)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString&))); - - connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), m_quanta, TQT_SLOT(setCursorPosition(int,int))); - connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQT_SLOT( selectArea(int,int,int,int))); - connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), m_quanta, TQT_SLOT(slotSelectTagArea(Node*))); - connect(sTab, TQT_SIGNAL(needReparse()), m_quanta, TQT_SLOT(slotForceReparse())); - connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); - connect(sTab, TQT_SIGNAL(openFile(const KURL &)), - m_quanta, TQT_SLOT (slotFileOpen(const KURL &))); - connect(sTab, TQT_SIGNAL(openImage (const KURL&)), - m_quanta, TQT_SLOT(slotImageOpen(const KURL&))); - connect(sTab, TQT_SIGNAL(showProblemMessage(const TQString&)), - m_quanta->m_problemOutput, TQT_SLOT(showMessage(const TQString&))); - connect(sTab, TQT_SIGNAL(clearProblemOutput()), - m_quanta->m_problemOutput, TQT_SLOT(clear())); - connect(parser, TQT_SIGNAL(nodeTreeChanged()), sTab, TQT_SLOT(slotNodeTreeChanged())); - - connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), m_quanta, TQT_SLOT(openDoc(const TQString&))); - - connect(m_viewManager, TQT_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQT_SLOT(slotDragInsert(TQDropEvent *))); + connect(m_quanta, TQ_SIGNAL(reloadAllTrees()), + m_quanta->fTab, TQ_SLOT(slotReloadAllTrees())); + + connect(pTab, TQ_SIGNAL(loadToolbarFile (const KURL&)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(viewActivated(const KURL&)), + pTab, TQ_SLOT(slotViewActivated(const KURL&))); + + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + pTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + tTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->scriptTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->fTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + + connect(tTab, TQ_SIGNAL(insertFile (const KURL &)), + m_quanta, TQ_SLOT(slotInsertFile(const KURL &))); + + connect(m_quanta->scriptTab, TQ_SIGNAL(openFileInPreview(const KURL &)), + m_quanta, TQ_SLOT(slotOpenFileInPreview(const KURL &))); + connect(m_quanta->scriptTab, TQ_SIGNAL(showPreviewWidget(bool)), + m_quanta, TQ_SLOT(slotShowPreviewWidget(bool))); + connect(m_quanta->scriptTab, TQ_SIGNAL(assignActionToScript(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); + connect(m_quanta->scriptTab, TQ_SIGNAL(downloadScript()), m_quanta, TQ_SLOT(slotDownloadScript())); + connect(m_quanta->scriptTab, TQ_SIGNAL(uploadScript(const TQString&)), m_quanta, TQ_SLOT(slotUploadScript(const TQString&))); + connect(m_quanta->dTab, TQ_SIGNAL(downloadDoc()), m_quanta, TQ_SLOT(slotDownloadDoc())); + + connect(m_quanta->m_htmlPart, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + connect(m_quanta->m_htmlPartDoc, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + + connect(sTab, TQ_SIGNAL(newCursorPosition(int,int)), m_quanta, TQ_SLOT(setCursorPosition(int,int))); + connect(sTab, TQ_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQ_SLOT( selectArea(int,int,int,int))); + connect(sTab, TQ_SIGNAL(selectTagArea(Node*)), m_quanta, TQ_SLOT(slotSelectTagArea(Node*))); + connect(sTab, TQ_SIGNAL(needReparse()), m_quanta, TQ_SLOT(slotForceReparse())); + connect(sTab, TQ_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQ_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); + connect(sTab, TQ_SIGNAL(openFile(const KURL &)), + m_quanta, TQ_SLOT (slotFileOpen(const KURL &))); + connect(sTab, TQ_SIGNAL(openImage (const KURL&)), + m_quanta, TQ_SLOT(slotImageOpen(const KURL&))); + connect(sTab, TQ_SIGNAL(showProblemMessage(const TQString&)), + m_quanta->m_problemOutput, TQ_SLOT(showMessage(const TQString&))); + connect(sTab, TQ_SIGNAL(clearProblemOutput()), + m_quanta->m_problemOutput, TQ_SLOT(clear())); + connect(parser, TQ_SIGNAL(nodeTreeChanged()), sTab, TQ_SLOT(slotNodeTreeChanged())); + + connect(m_quanta->dTab, TQ_SIGNAL(openURL(const TQString&)), m_quanta, TQ_SLOT(openDoc(const TQString&))); + + connect(m_viewManager, TQ_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQ_SLOT(slotDragInsert(TQDropEvent *))); qConfig.windowLayout = "Default"; } @@ -710,74 +710,74 @@ void QuantaInit::loadInitialProject(const TQString& url) void QuantaInit::initActions() { TDEActionCollection *ac = m_quanta->actionCollection(); - new TDEAction(i18n("Annotate..."), 0, m_quanta, TQT_SLOT(slotAnnotate()),ac, "annotate"); + new TDEAction(i18n("Annotate..."), 0, m_quanta, TQ_SLOT(slotAnnotate()),ac, "annotate"); m_quanta->editTagAction = new TDEAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E, - m_quanta, TQT_SLOT( slotEditCurrentTag() ), + m_quanta, TQ_SLOT( slotEditCurrentTag() ), ac, "edit_current_tag" ); m_quanta->selectTagAreaAction = new TDEAction( i18n( "&Select Current Tag Area" ), 0, - m_quanta, TQT_SLOT( slotSelectTagArea() ), + m_quanta, TQ_SLOT( slotSelectTagArea() ), ac, "select_tag_area" ); new TDEAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J, - m_quanta, TQT_SLOT( slotExpandAbbreviation() ), + m_quanta, TQ_SLOT( slotExpandAbbreviation() ), ac, "expand_abbreviation" ); - new TDEAction(i18n("&Report Bug..."), 0, m_quanta, TQT_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta + new TDEAction(i18n("&Report Bug..."), 0, m_quanta, TQ_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta //Kate actions //Edit menu - KStdAction::undo(m_quanta, TQT_SLOT(slotUndo()), ac); - KStdAction::redo(m_quanta, TQT_SLOT(slotRedo()), ac); - KStdAction::cut(m_quanta, TQT_SLOT(slotCut()), ac); - KStdAction::copy(m_quanta, TQT_SLOT(slotCopy()), ac) ; - KStdAction::pasteText(m_quanta, TQT_SLOT(slotPaste()), ac); + KStdAction::undo(m_quanta, TQ_SLOT(slotUndo()), ac); + KStdAction::redo(m_quanta, TQ_SLOT(slotRedo()), ac); + KStdAction::cut(m_quanta, TQ_SLOT(slotCut()), ac); + KStdAction::copy(m_quanta, TQ_SLOT(slotCopy()), ac) ; + KStdAction::pasteText(m_quanta, TQ_SLOT(slotPaste()), ac); //help (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", m_quanta, - TQT_SLOT(slotHelpTip()), ac, "help_tip"); + TQ_SLOT(slotHelpTip()), ac, "help_tip"); // File actions // - KStdAction::openNew( m_quanta, TQT_SLOT( slotFileNew() ), ac); - KStdAction::open ( m_quanta, TQT_SLOT( slotFileOpen() ), ac, "file_open"); - (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs"); + KStdAction::openNew( m_quanta, TQ_SLOT( slotFileNew() ), ac); + KStdAction::open ( m_quanta, TQ_SLOT( slotFileOpen() ), ac, "file_open"); + (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQ_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs"); - m_quanta->fileRecent = KStdAction::openRecent(m_quanta, TQT_SLOT(slotFileOpenRecent(const KURL&)), + m_quanta->fileRecent = KStdAction::openRecent(m_quanta, TQ_SLOT(slotFileOpenRecent(const KURL&)), ac, "file_open_recent"); m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent")); - connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), m_quanta, TQT_SLOT(slotFileOpen())); + connect(m_quanta->fileRecent, TQ_SIGNAL(activated()), m_quanta, TQ_SLOT(slotFileOpen())); (void) new TDEAction( i18n( "Close All" ), 0, m_quanta, - TQT_SLOT( slotFileCloseAll() ), + TQ_SLOT( slotFileCloseAll() ), ac, "file_close_all" ); - m_quanta->saveAction = KStdAction::save(m_quanta, TQT_SLOT( slotFileSave() ), ac); + m_quanta->saveAction = KStdAction::save(m_quanta, TQ_SLOT( slotFileSave() ), ac); - KStdAction::saveAs( m_quanta, TQT_SLOT( slotFileSaveAs() ), ac ); + KStdAction::saveAs( m_quanta, TQ_SLOT( slotFileSaveAs() ), ac ); m_quanta->saveAllAction = new TDEAction( i18n( "Save All..." ), "save_all", SHIFT+TDEStdAccel::shortcut(TDEStdAccel::Save).keyCodeQt(), - m_quanta, TQT_SLOT( slotFileSaveAll() ), + m_quanta, TQ_SLOT( slotFileSaveAll() ), ac, "file_save_all" ); (void) new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, m_quanta, - TQT_SLOT(slotFileReload()), ac, "file_reload"); + TQ_SLOT(slotFileReload()), ac, "file_reload"); // (void) new TDEAction(i18n("Reload All "), 0, 0, m_quanta, -// TQT_SLOT(slotFileReloadAll()), ac, "file_reload_all"); +// TQ_SLOT(slotFileReloadAll()), ac, "file_reload_all"); (void) new TDEAction( i18n( "Save as Local Template..." ), 0, - m_quanta, TQT_SLOT( slotFileSaveAsLocalTemplate() ), + m_quanta, TQ_SLOT( slotFileSaveAsLocalTemplate() ), ac, "save_local_template" ); (void) new TDEAction( i18n( "Save Selection to Local Template File..." ), 0, - m_quanta, TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ), + m_quanta, TQ_SLOT( slotFileSaveSelectionAsLocalTemplate() ), ac, "save_selection_local_template" ); - KStdAction::quit( m_quanta, TQT_SLOT( slotFileQuit() ), ac ); + KStdAction::quit( m_quanta, TQ_SLOT( slotFileQuit() ), ac ); // Edit actions (void) new TDEAction( i18n( "Find in Files..." ), SmallIcon("filefind"), CTRL+ALT+Key_F, - m_quanta, TQT_SLOT( slotEditFindInFiles() ), + m_quanta, TQ_SLOT( slotEditFindInFiles() ), ac, "find_in_files" ); TDEAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation"); @@ -787,57 +787,57 @@ void QuantaInit::initActions() // Tool actions (void) new TDEAction( i18n( "&Context Help..." ), CTRL+Key_H, - m_quanta, TQT_SLOT( slotContextHelp() ), + m_quanta, TQ_SLOT( slotContextHelp() ), ac, "context_help" ); (void) new TDEAction( i18n( "Tag &Attributes..." ), ALT+Key_Down, - m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ), + m_quanta->m_doc, TQ_SLOT( slotAttribPopup() ), ac, "tag_attributes" ); (void) new TDEAction( i18n( "&Change the DTD..." ), 0, - m_quanta, TQT_SLOT( slotChangeDTD() ), + m_quanta, TQ_SLOT( slotChangeDTD() ), ac, "change_dtd" ); (void) new TDEAction( i18n( "&Edit DTD Settings..." ), 0, - m_quanta, TQT_SLOT( slotEditDTD() ), + m_quanta, TQ_SLOT( slotEditDTD() ), ac, "edit_dtd" ); (void) new TDEAction( i18n( "&Load && Convert DTD..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadDTD() ), + DTDs::ref(), TQ_SLOT( slotLoadDTD() ), ac, "load_dtd" ); (void) new TDEAction( i18n( "Load DTD E&ntities..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadEntities() ), + DTDs::ref(), TQ_SLOT( slotLoadEntities() ), ac, "load_entities" ); (void) new TDEAction( i18n( "Load DTD &Package (DTEP)..." ), 0, - m_quanta, TQT_SLOT( slotLoadDTEP() ), + m_quanta, TQ_SLOT( slotLoadDTEP() ), ac, "load_dtep" ); (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail-send", 0, - m_quanta, TQT_SLOT( slotEmailDTEP() ), + m_quanta, TQ_SLOT( slotEmailDTEP() ), ac, "send_dtep" ); (void) new TDEAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0, - m_quanta, TQT_SLOT( slotDownloadDTEP() ), + m_quanta, TQ_SLOT( slotDownloadDTEP() ), ac, "download_dtep" ); (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0, - m_quanta, TQT_SLOT( slotUploadDTEP() ), + m_quanta, TQ_SLOT( slotUploadDTEP() ), ac, "upload_dtep" ); /* (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), 0, - m_quanta, TQT_SLOT( slotUploadDTEP() ), + m_quanta, TQ_SLOT( slotUploadDTEP() ), ac, "send_dtep" ); */ (void) new TDEAction( i18n( "&Document Properties" ), 0, - m_quanta, TQT_SLOT( slotDocumentProperties() ), + m_quanta, TQ_SLOT( slotDocumentProperties() ), ac, "tools_document_properties" ); (void) new TDEAction ( i18n ("F&ormat XML Code"), 0, - m_quanta, TQT_SLOT( slotCodeFormatting() ), + m_quanta, TQ_SLOT( slotCodeFormatting() ), ac, "tools_code_formatting"); (void) new TDEAction( i18n( "&Convert Tag && Attribute Case..."), 0, - m_quanta, TQT_SLOT(slotConvertCase()), + m_quanta, TQ_SLOT(slotConvertCase()), ac, "tools_change_case"); // View actions @@ -845,19 +845,19 @@ void QuantaInit::initActions() m_quanta->showSourceAction = new TDEToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9, - m_quanta, TQT_SLOT( slotShowSourceEditor()), + m_quanta, TQ_SLOT( slotShowSourceEditor()), ac, "show_quanta_editor"); m_quanta->showSourceAction->setExclusiveGroup("view"); m_quanta->showVPLAction = new TDEToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9, - m_quanta, TQT_SLOT( slotShowVPLOnly() ), + m_quanta, TQ_SLOT( slotShowVPLOnly() ), ac, "show_kafka_view"); m_quanta->showVPLAction->setExclusiveGroup("view"); m_quanta->showVPLSourceAction = new TDEToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9, - m_quanta, TQT_SLOT( slotShowVPLAndSourceEditor() ), + m_quanta, TQ_SLOT( slotShowVPLAndSourceEditor() ), ac, "show_kafka_and_quanta"); m_quanta->showVPLSourceAction->setExclusiveGroup("view"); /**kafkaSelectAction = new TDESelectAction(i18n("Main &View"), 0, ac,"show_kafka"); @@ -866,73 +866,73 @@ void QuantaInit::initActions() list2.append(i18n("&VPL Editor (experimental)")); list2.append(i18n("&Both Editors")); kafkaSelectAction->setItems(list2); - connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), m_quanta, TQT_SLOT(slotShowKafkaPartl(int)));*/ + connect(kafkaSelectAction, TQ_SIGNAL(activated(int)), m_quanta, TQ_SLOT(slotShowKafkaPartl(int)));*/ (void) new TDEAction( i18n( "&Reload Preview" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload).keyCodeQt(), - m_quanta, TQT_SLOT(slotRepaintPreview()), + m_quanta, TQ_SLOT(slotRepaintPreview()), ac, "reload" ); (void) new TDEAction( i18n( "&Previous File" ), "1leftarrow", TDEStdAccel::back(), - m_quanta, TQT_SLOT( slotBack() ), + m_quanta, TQ_SLOT( slotBack() ), ac, "previous_file" ); (void) new TDEAction( i18n( "&Next File" ), "1rightarrow", TDEStdAccel::forward(), - m_quanta, TQT_SLOT( slotForward() ), + m_quanta, TQ_SLOT( slotForward() ), ac, "next_file" ); // Options actions // (void) new TDEAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0, - m_quanta, TQT_SLOT( slotOptionsConfigureActions() ), + m_quanta, TQ_SLOT( slotOptionsConfigureActions() ), ac, "configure_actions" ); - KStdAction::showMenubar(m_quanta, TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); - KStdAction::keyBindings(m_quanta, TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); - KStdAction::configureToolbars(m_quanta, TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); - KStdAction::preferences(m_quanta, TQT_SLOT( slotOptions() ), ac, "general_options"); - new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQT_SLOT(slotPreviewOptions()), ac, "preview_options"); + KStdAction::showMenubar(m_quanta, TQ_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); + KStdAction::keyBindings(m_quanta, TQ_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); + KStdAction::configureToolbars(m_quanta, TQ_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); + KStdAction::preferences(m_quanta, TQ_SLOT( slotOptions() ), ac, "general_options"); + new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQ_SLOT(slotPreviewOptions()), ac, "preview_options"); // Toolbars actions m_quanta->projectToolbarFiles = new TDERecentFilesAction(i18n("Load &Project Toolbar"),0, - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&)), ac, "toolbars_load_project"); - new TDEAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global"); - new TDEAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadToolbar()), ac, "toolbars_load_user"); - new TDEAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local"); - new TDEAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project"); - new TDEAction(i18n("&New User Toolbar..."), 0, m_quanta, TQT_SLOT(slotAddToolbar()), ac, "toolbars_add"); - new TDEAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRemoveToolbar()), ac, "toolbars_remove"); - new TDEAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRenameToolbar()), ac, "toolbars_rename"); - new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, m_quanta, TQT_SLOT(slotSendToolbar()), ac, "toolbars_send"); - new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotUploadToolbar()), ac, "toolbars_upload" ); - new TDEAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotDownloadToolbar()), ac, "toolbars_download" ); + new TDEAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global"); + new TDEAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadToolbar()), ac, "toolbars_load_user"); + new TDEAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local"); + new TDEAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project"); + new TDEAction(i18n("&New User Toolbar..."), 0, m_quanta, TQ_SLOT(slotAddToolbar()), ac, "toolbars_add"); + new TDEAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRemoveToolbar()), ac, "toolbars_remove"); + new TDEAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRenameToolbar()), ac, "toolbars_rename"); + new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, m_quanta, TQ_SLOT(slotSendToolbar()), ac, "toolbars_send"); + new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotUploadToolbar()), ac, "toolbars_upload" ); + new TDEAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotDownloadToolbar()), ac, "toolbars_download" ); TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, ac, "smart_tag_insertion"); - connect(toggle, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotSmartTagInsertion())); + connect(toggle, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotSmartTagInsertion())); m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, ac, "view_dtd_toolbar"); - connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotToggleDTDToolbar(bool))); + connect(m_quanta->showDTDToolbar, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotToggleDTDToolbar(bool))); m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar")); new TDEAction(i18n("Complete Text"), CTRL+Key_Space, - m_quanta, TQT_SLOT(slotShowCompletion()), ac,"show_completion"); + m_quanta, TQ_SLOT(slotShowCompletion()), ac,"show_completion"); new TDEAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space, - m_quanta, TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); + m_quanta, TQ_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); - KStdAction::back(m_quanta, TQT_SLOT( slotBack() ), ac, "w_back"); - KStdAction::forward(m_quanta, TQT_SLOT( slotForward() ), ac, "w_forward"); + KStdAction::back(m_quanta, TQ_SLOT( slotBack() ), ac, "w_back"); + KStdAction::forward(m_quanta, TQ_SLOT( slotForward() ), ac, "w_forward"); - new TDEAction(i18n("Open File: none"), 0, m_quanta, TQT_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor"); - new TDEAction(i18n("Upload..."), 0, m_quanta, TQT_SLOT(slotUploadFile()), ac, "upload_file"); - new TDEAction(i18n("Delete File"), 0, m_quanta, TQT_SLOT(slotDeleteFile()), ac, "delete_file"); + new TDEAction(i18n("Open File: none"), 0, m_quanta, TQ_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor"); + new TDEAction(i18n("Upload..."), 0, m_quanta, TQ_SLOT(slotUploadFile()), ac, "upload_file"); + new TDEAction(i18n("Delete File"), 0, m_quanta, TQ_SLOT(slotDeleteFile()), ac, "delete_file"); TQString ss = i18n("Upload Opened Project Files..."); -/* new TDEAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQT_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */ +/* new TDEAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQ_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */ TQString error; int el, ec; @@ -993,16 +993,16 @@ void QuantaInit::initActions() // create the preview action m_quanta->showPreviewAction = new TDEToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6, - m_quanta, TQT_SLOT( slotToggleShowPreview() ), + m_quanta, TQ_SLOT( slotToggleShowPreview() ), ac, "show_preview" ); TDEAction *act = new TDEAction( i18n( "Preview Without Frames" ), "", 0, - m_quanta, TQT_SLOT(slotShowNoFramesPreview()), + m_quanta, TQ_SLOT(slotShowNoFramesPreview()), ac, "show_preview_no_frames" ); act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12, - m_quanta, TQT_SLOT( slotViewInKFM() ), + m_quanta, TQ_SLOT( slotViewInKFM() ), ac, "view_with_konqueror" ); act->plug(m_quanta->showPreviewAction->popupMenu()); @@ -1024,62 +1024,62 @@ void QuantaInit::initActions() act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with L&ynx" ), "terminal", 0, - m_quanta, TQT_SLOT( slotViewInLynx() ), + m_quanta, TQ_SLOT( slotViewInLynx() ), ac, "view_with_lynx" ); act->plug(m_quanta->showPreviewAction->popupMenu()); (void) new TDEAction( i18n( "Table Editor..." ), "quick_table", 0, - m_quanta, TQT_SLOT( slotTagEditTable() ), + m_quanta, TQ_SLOT( slotTagEditTable() ), ac, "tag_edit_table" ); (void) new TDEAction( i18n( "Quick List..." ), "quick_list", 0, - m_quanta, TQT_SLOT( slotTagQuickList() ), + m_quanta, TQ_SLOT( slotTagQuickList() ), ac, "tag_quick_list" ); (void) new TDEAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C, - m_quanta, TQT_SLOT( slotTagColor() ), + m_quanta, TQ_SLOT( slotTagColor() ), ac, "tag_color" ); (void) new TDEAction( i18n( "Email..." ), "tag_mail", 0, - m_quanta, TQT_SLOT( slotTagMail() ), + m_quanta, TQ_SLOT( slotTagMail() ), ac, "tag_mail" ); (void) new TDEAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T, - m_quanta, TQT_SLOT( slotTagMisc() ), + m_quanta, TQ_SLOT( slotTagMisc() ), ac, "tag_misc" ); (void) new TDEAction( i18n( "Frame Wizard..." ), "frame", 0, - m_quanta, TQT_SLOT( slotFrameWizard() ), + m_quanta, TQ_SLOT( slotFrameWizard() ), ac, "tag_frame_wizard" ); (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "edit-paste", 0, - m_quanta, TQT_SLOT( slotPasteHTMLQuoted() ), + m_quanta, TQ_SLOT( slotPasteHTMLQuoted() ), ac, "edit_paste_html_quoted" ); (void) new TDEAction( i18n( "Paste &URL Encoded" ), "edit-paste", 0, - m_quanta, TQT_SLOT( slotPasteURLEncoded() ), + m_quanta, TQ_SLOT( slotPasteURLEncoded() ), ac, "edit_paste_url_encoded" ); (void) new TDEAction( i18n( "Insert CSS..." ),"css", 0, - m_quanta, TQT_SLOT( slotInsertCSS() ), + m_quanta, TQ_SLOT( slotInsertCSS() ), ac, "insert_css" ); // special-character combo TDEAction* char_action = new TDEAction( i18n( "Insert Special Character" ), "charset", 0, ac, "insert_char" ); - connect( char_action, TQT_SIGNAL(activated()), - m_quanta, TQT_SLOT(slotInsertChar()) ); + connect( char_action, TQ_SIGNAL(activated()), + m_quanta, TQ_SLOT(slotInsertChar()) ); - connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta->doc(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(ViewManager::ref(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(m_quanta)); m_bookmarks->createActions(ac); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); } /** Initialize the plugin architecture. */ @@ -1089,10 +1089,10 @@ void QuantaInit::initPlugins() m_quanta->m_pluginInterface = QuantaPluginInterface::ref(m_quanta); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(hideSplash()), - m_quanta, TQT_SLOT(slotHideSplash())); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(statusMsg(const TQString &)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(hideSplash()), + m_quanta, TQ_SLOT(slotHideSplash())); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->m_pluginInterface->readConfig(); if (!m_quanta->m_pluginInterface->pluginAvailable("TDEFileReplace")) @@ -1276,12 +1276,12 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) TDEProcess *execCommand = new TDEProcess(); *(execCommand) << TQStringList::split(" ",cmd); - connect(execCommand, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - m_quanta, TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - m_quanta, TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(processExited(TDEProcess*)), - m_quanta, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(execCommand, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(processExited(TDEProcess*)), + m_quanta, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!execCommand->start(TDEProcess::NotifyOnExit,TDEProcess::All)) { @@ -1291,8 +1291,8 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) { //To avoid lock-ups, start a timer. TQTimer *timer = new TQTimer(m_quanta); - connect(timer, TQT_SIGNAL(timeout()), - m_quanta, TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(slotProcessTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; m_quanta->m_loopStarted = true; @@ -1487,10 +1487,10 @@ void QuantaInit::checkRuntimeDependencies() } else { CVSService::ref(m_quanta->actionCollection())->setAppId(appId); - connect(CVSService::ref(), TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); - connect(CVSService::ref(), TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); - //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)), m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(CVSService::ref(), TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); + connect(CVSService::ref(), TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(CVSService::ref(), TQ_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQ_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); + //connect(CVSService::ref(), TQ_SIGNAL(statusMsg(const TQString &)), m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->fTab->plugCVSMenu(); pTab->plugCVSMenu(); } diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 354cb464..b77e2341 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -82,7 +82,7 @@ QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } QuantaDoc::~QuantaDoc() @@ -175,10 +175,10 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, { if (encoding.isEmpty()) encoding = quantaApp->defaultEncoding(); - w->disconnect(TQT_SIGNAL(openingFailed(const KURL&))); - connect(w, TQT_SIGNAL(openingFailed(const KURL&)), this, TQT_SLOT(slotOpeningFailed(const KURL&))); - w->disconnect(TQT_SIGNAL(openingCompleted(const KURL&))); - connect(w, TQT_SIGNAL(openingCompleted(const KURL&)), this, TQT_SLOT(slotOpeningCompleted(const KURL&))); + w->disconnect(TQ_SIGNAL(openingFailed(const KURL&))); + connect(w, TQ_SIGNAL(openingFailed(const KURL&)), this, TQ_SLOT(slotOpeningFailed(const KURL&))); + w->disconnect(TQ_SIGNAL(openingCompleted(const KURL&))); + connect(w, TQ_SIGNAL(openingCompleted(const KURL&)), this, TQ_SLOT(slotOpeningCompleted(const KURL&))); w->open(url, encoding); quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol)); } @@ -302,7 +302,7 @@ void QuantaDoc::slotAttribPopup() popUpMenu->setItemEnabled( menuId , false ); } } - connect( popUpMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( popUpMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); attribMenu->insertItem(*it, popUpMenu); } @@ -367,7 +367,7 @@ void QuantaDoc::slotInsertAttrib( int id ) delete attribMenu; attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } } diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 8003ce62..8e867d9a 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -86,8 +86,8 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti { setMDICaption(caption); //Connect the VPL update timers - connect(&m_sourceUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(sourceUpdateTimerTimeout())); - connect(&m_VPLUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(VPLUpdateTimerTimeout())); + connect(&m_sourceUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(sourceUpdateTimerTimeout())); + connect(&m_VPLUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(VPLUpdateTimerTimeout())); //create the source and VPL holding widgets m_documentArea = new TQWidget(this); @@ -186,18 +186,18 @@ void QuantaView::addDocument(Document *document) if (!document) return; m_document = document; - connect(m_document, TQT_SIGNAL(editorGotFocus()), this, TQT_SLOT(slotSourceGetFocus())); - connect(m_document->view(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SIGNAL(cursorPositionChanged())); + connect(m_document, TQ_SIGNAL(editorGotFocus()), this, TQ_SLOT(slotSourceGetFocus())); + connect(m_document->view(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SIGNAL(cursorPositionChanged())); m_kafkaDocument = KafkaDocument::ref(); - connect(m_kafkaDocument->getKafkaWidget(), TQT_SIGNAL(hasFocus(bool)), - this, TQT_SLOT(slotVPLGetFocus(bool))); - connect(m_kafkaDocument, TQT_SIGNAL(newCursorPosition(int,int)), - this, TQT_SLOT(slotSetCursorPositionInSource(int, int))); - connect(m_kafkaDocument, TQT_SIGNAL(loadingError(Node *)), - this, TQT_SLOT(slotVPLLoadingError(Node *))); + connect(m_kafkaDocument->getKafkaWidget(), TQ_SIGNAL(hasFocus(bool)), + this, TQ_SLOT(slotVPLGetFocus(bool))); + connect(m_kafkaDocument, TQ_SIGNAL(newCursorPosition(int,int)), + this, TQ_SLOT(slotSetCursorPositionInSource(int, int))); + connect(m_kafkaDocument, TQ_SIGNAL(loadingError(Node *)), + this, TQ_SLOT(slotVPLLoadingError(Node *))); m_kafkaReloadingEnabled = true; m_quantaReloadingEnabled = true; @@ -1134,8 +1134,8 @@ bool QuantaView::saveDocument(const KURL& url) { KTextEditor::Document *doc = m_document->doc(); m_eventLoopStarted = false; - connect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - connect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + connect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + connect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); m_saveResult = m_document->saveAs(url); if (m_saveResult) { @@ -1144,8 +1144,8 @@ bool QuantaView::saveDocument(const KURL& url) m_eventLoopStarted = true; internalFileInfo.enter_loop(); } - disconnect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - disconnect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + disconnect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + disconnect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); if (!m_saveResult) //there was an error while saving { if (oldURL.isLocalFile()) diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index c2717de4..2e70966b 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -71,20 +71,20 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, m_lastActiveEditorView = 0L; m_documentationView = 0L; m_tabPopup = new TDEPopupMenu(quantaApp); - m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(slotCloseView())); - m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs())); - m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll())); - m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReloadFile()), 0, RELOAD_ID); - m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID); - m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID); + m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(slotCloseView())); + m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQ_SLOT(slotCloseOtherTabs())); + m_tabPopup->insertItem(i18n("Close &All"), this, TQ_SLOT(closeAll())); + m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReloadFile()), 0, RELOAD_ID); + m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQ_SLOT(slotUploadFile()), 0, UPLOAD_ID); + m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQ_SLOT(slotDeleteFile()), 0, DELETE_ID); m_tabPopup->insertSeparator(); m_fileListPopup = new TDEPopupMenu(quantaApp); - connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow())); - connect(m_fileListPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFileListPopupItemActivated(int))); + connect(m_fileListPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotFileListPopupAboutToShow())); + connect(m_fileListPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFileListPopupItemActivated(int))); m_bookmarks = new QuantaBookmarks(this, QuantaBookmarks::Position, true); m_bookmarksMenu = new TDEPopupMenu(quantaApp); m_bookmarks->setBookmarksMenu(m_bookmarksMenu); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_bookmarksMenuId = m_tabPopup->insertItem(SmallIconSet("bookmark"), i18n("&Bookmarks"), m_bookmarksMenu); m_tabPopup->insertItem(i18n("&Switch To"), m_fileListPopup); m_contextView = 0L; @@ -96,14 +96,14 @@ QuantaView* ViewManager::createView(const TQString &caption) { QuantaView *view = new QuantaView(quantaApp, "", caption); quantaApp->addWindow(view); - connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); - connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus())); - disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); - connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*))); - connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(view, TQ_SIGNAL(cursorPositionChanged()), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(title(const TQString &)), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(dragInsert(TQDropEvent*)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); + connect(view, TQ_SIGNAL(hidePreview()), quantaApp, TQ_SLOT(slotChangePreviewStatus())); + disconnect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); + connect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQ_SLOT(slotCloseRequest(KMdiChildView*))); + connect(view, TQ_SIGNAL(documentClosed(const KURL&)), this, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(view, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); return view; } @@ -125,7 +125,7 @@ void ViewManager::createNewDocument() KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", view, "KTextEditor::Document"); #endif Document *w = new Document(doc, 0L); - connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); + connect(w, TQ_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQ_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); TQString encoding = quantaApp->defaultEncoding(); KTextEditor::EncodingInterface* encodingIf = dynamic_cast<KTextEditor::EncodingInterface*>(doc); if (encodingIf) @@ -134,7 +134,7 @@ void ViewManager::createNewDocument() KTextEditor::View * v = w->view(); //[MB02] connect all kate views for drag and drop - connect(w->view(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); + connect(w->view(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); w->setUntitledUrl( fname ); KTextEditor::PopupMenuInterface* popupIf = dynamic_cast<KTextEditor::PopupMenuInterface*>(w->view()); @@ -143,7 +143,7 @@ void ViewManager::createNewDocument() quantaApp->setFocusProxy(w->view()); w->view()->setFocusPolicy(TQWidget::WheelFocus); - connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus())); + connect( v, TQ_SIGNAL(newStatus()), quantaApp, TQ_SLOT(slotNewStatus())); quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active view->addDocument(w); @@ -186,7 +186,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) if (view == activeView()) ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); if (!createNew) - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); quantaApp->closeWindow(view); if (createNew) { @@ -195,7 +195,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) quantaApp->slotFileNew(); } } else - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); return true; } } @@ -484,8 +484,8 @@ bool ViewManager::closeAll(bool createNew) return false; //save aborted } } - disconnect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); for (childIt = children.begin(); childIt != children.end(); ++childIt) @@ -512,8 +512,8 @@ bool ViewManager::closeAll(bool createNew) } else { //actually this code should be never executed - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); view->activated(); emit filesClosed(false); return false; @@ -527,8 +527,8 @@ bool ViewManager::closeAll(bool createNew) } } } - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); if (createNew) { createNewDocument(); diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 6abdc5b7..e8929f84 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -306,29 +306,29 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) setFocusPolicy(TQWidget::ClickFocus); setShowFolderOpenPixmap(false); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotReturnPressed(TQListViewItem *))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotReturnPressed(TQListViewItem *))); - connect(this, TQT_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), - this, TQT_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); + connect(this, TQ_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), + this, TQ_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), - this, TQT_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), + this, TQ_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(openFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileOpen(const KURL &))); + connect(this, TQ_SIGNAL(openFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileOpen(const KURL &))); - connect(this, TQT_SIGNAL(openImage(const KURL &)), - quantaApp, TQT_SLOT(slotImageOpen(const KURL &))); + connect(this, TQ_SIGNAL(openImage(const KURL &)), + quantaApp, TQ_SLOT(slotImageOpen(const KURL &))); - connect(this, TQT_SIGNAL(closeFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileClose(const KURL &))); + connect(this, TQ_SIGNAL(closeFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileClose(const KURL &))); - connect(this, TQT_SIGNAL(insertTag(const KURL &, DirInfo)), - quantaApp, TQT_SLOT(slotInsertTag(const KURL &, DirInfo))); + connect(this, TQ_SIGNAL(insertTag(const KURL &, DirInfo)), + quantaApp, TQ_SLOT(slotInsertTag(const KURL &, DirInfo))); } @@ -606,7 +606,7 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) for (it = offers.begin(); it != offers.end(); ++it) { TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenWithApplication())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenWithApplication())); action->plug(m_openWithMenu); m_openWithActions.append(action); } @@ -621,13 +621,13 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),TDEIcon::Small), it2.current()->name()); m_pluginIds[id] = it2.current(); } - connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int))); + connect(m_openWithMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenWithActivated(int))); m_openWithMenu->insertSeparator(); } - m_openWithMenu->insertItem(i18n("&Other..."), this, TQT_SLOT(slotOpenWith())); + m_openWithMenu->insertItem(i18n("&Other..."), this, TQ_SLOT(slotOpenWith())); m_openWithMenuId = menu->insertItem(i18n("Open &With"), m_openWithMenu, -1, position); } else - m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()), 0, -1, position); + m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith()), 0, -1, position); } void BaseTreeView::slotInsertTag() @@ -740,7 +740,7 @@ void BaseTreeView::slotProperties() { fileInfoDlg = addFileInfoPage(propDlg); } - connect(propDlg, TQT_SIGNAL( applied() ), this, TQT_SLOT( slotPropertiesApplied()) ); + connect(propDlg, TQ_SIGNAL( applied() ), this, TQ_SLOT( slotPropertiesApplied()) ); propDlg->exec(); } @@ -915,11 +915,11 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil if (!job) return; - connect(job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotJobFinished(TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotJobFinished(TDEIO::Job *) ) ); progressBar->setTotalSteps(100); - connect(job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long)), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long))); + connect(job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long)), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long))); } diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index abe67424..a379b512 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -56,15 +56,15 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) slotRefreshTree(); setFocusPolicy(TQWidget::ClickFocus); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) ); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *)) ); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); m_contextMenu = new TDEPopupMenu(this); - m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQT_SLOT(slotReloadProjectDocs())); - m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQT_SIGNAL(downloadDoc())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQ_SLOT(slotReloadProjectDocs())); + m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQ_SIGNAL(downloadDoc())); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 444bbc0c..1884cc1b 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -87,49 +87,49 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder())); - m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder())); + m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQ_SLOT(slotAddToTop())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); m_folderMenu->insertItem(SmallIcon("application-x-zerosize"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQT_SLOT(slotChangeAlias())); - m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQ_SLOT(slotChangeAlias())); + m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyMenu = new TDEPopupMenu(); - m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()), 0, -1 , 0); + m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder()), 0, -1 , 0); addColumn(i18n("Files Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); // generate top list of directories for (uint i = 0; i < topURLList.count(); i++) diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp index 48fd6b5e..2ccc770c 100644 --- a/quanta/treeviews/newtemplatedirdlg.cpp +++ b/quanta/treeviews/newtemplatedirdlg.cpp @@ -20,8 +20,8 @@ NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name) { setCaption(name); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } NewTemplateDirDlg::~NewTemplateDirDlg() diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index c07a7183..886bd511 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -122,62 +122,62 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_projectDir->root()->setEnabled(false); m_uploadStatusMenu = new TDEPopupMenu(this); - m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQT_SLOT(slotAlwaysUpload())); - m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQT_SLOT(slotNeverUpload())); - m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQT_SLOT(slotConfirmUpload())); - connect(m_uploadStatusMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUploadMenuAboutToShow())); + m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQ_SLOT(slotAlwaysUpload())); + m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQ_SLOT(slotNeverUpload())); + m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQ_SLOT(slotConfirmUpload())); + connect(m_uploadStatusMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUploadMenuAboutToShow())); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQT_SLOT(slotOpen())); - m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQ_SLOT(slotOpen())); + m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQ_SLOT(slotLoadToolbar())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL())); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQ_SLOT(slotUploadSingleURL())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(this); m_folderMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL())); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); - m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQ_SLOT(slotUploadSingleURL())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); + m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQ_SLOT(slotChangeDocumentFolderStatus())); m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_projectMenu = new TDEPopupMenu(this); m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_projectMenu->insertSeparator(); - m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject())); - m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan())); - m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions())); - m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQ_SLOT(slotUploadProject())); + m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQ_SLOT(slotRescan())); + m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQ_SLOT(slotOptions())); + m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_projectMenu->insertSeparator(); m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); restoreLayout(kapp->config(), className()); // the restored size of the first column might be too large for the current content @@ -212,8 +212,8 @@ KFileTreeBranch* ProjectTreeView::newBranch(const KURL& url) setRootIsDecorated(false); } - connect(m_projectDir, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect(m_projectDir, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); addBranch(m_projectDir); m_projectDir->urlList = m_projectFiles; // set list for filter if (!m_projectName.isEmpty()) diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 78dbd78e..de2e3430 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -84,23 +84,23 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) m_localDir->excludeFilterRx.setPattern(excludeString); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQT_SLOT(slotProperties())); - m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQ_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQ_SLOT(slotRun())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript())); - m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQT_SLOT(slotEditInQuanta())); - m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQT_SLOT(slotEditDescription())); + m_fileMenu->insertItem(i18n("&Edit Script"), this, TQ_SLOT(slotEditScript())); + m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQ_SLOT(slotEditInQuanta())); + m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQ_SLOT(slotEditDescription())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQT_SLOT(slotAssignAction())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript())); + m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQ_SLOT(slotAssignAction())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQ_SLOT(slotSendScriptInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQ_SLOT(slotUploadScript())); m_folderMenu = new TDEPopupMenu(this); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQT_SIGNAL(downloadScript())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQ_SIGNAL(downloadScript())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); restoreLayout( kapp->config(), className() ); // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 922ea03a..5f9a9747 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -100,37 +100,37 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & m_fileMenu = new TDEPopupMenu(); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); -// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(); -// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); addColumn(i18n("Upload Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(Project::ref(), TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - this, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(Project::ref(), TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + this, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); restoreLayout(m_config, "UploadTreeView"); // a fixed name only for the tooltip configuration // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index f2b827cc..a03f13a3 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -95,43 +95,43 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) dtdMenu->insertItem(dtdList[i], i, -1); } - connect(dtdMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDTDChanged(int))); + connect(dtdMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDTDChanged(int))); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); emptyAreaMenu = new TDEPopupMenu(this); emptyAreaMenu->insertItem(i18n("Show Groups For"), dtdMenu); - emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQT_SLOT(slotReparseMenuItem())); + emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQ_SLOT(slotReparseMenuItem())); popupMenu = new TDEPopupMenu(this); popupMenu -> insertItem( i18n("Show Groups For"), dtdMenu); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQT_SLOT(slotSelectTag())); - popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQT_SLOT(slotGotoClosingTag())); - openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQT_SLOT(slotOpenFile())); + popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQ_SLOT(slotSelectTag())); + popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQ_SLOT(slotGotoClosingTag())); + openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQ_SLOT(slotOpenFile())); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQT_SLOT(slotOpenSubTree())); - popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQT_SLOT(slotCloseSubTree())); + popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQ_SLOT(slotOpenSubTree())); + popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQ_SLOT(slotCloseSubTree())); popupMenu -> insertSeparator(); #if 0 - popupMenu -> insertItem( i18n("Remove"),this ,TQT_SLOT(slotRemoveTags())); + popupMenu -> insertItem( i18n("Remove"),this ,TQ_SLOT(slotRemoveTags())); popupMenu -> insertSeparator(); #endif - popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQT_SLOT(slotReparseMenuItem())); - followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQT_SLOT(changeFollowCursor())); + popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQ_SLOT(slotReparseMenuItem())); + followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQ_SLOT(changeFollowCursor())); popupMenu -> setItemChecked ( followCursorId, followCursor() ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem *)), TQT_SLOT(slotExpanded(TQListViewItem *))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem *)), TQT_SLOT(slotCollapsed(TQListViewItem *))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem *)), TQ_SLOT(slotExpanded(TQListViewItem *))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem *)), TQ_SLOT(slotCollapsed(TQListViewItem *))); write = 0L; timer = new TQTime(); diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 556a2823..e42754c9 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -133,12 +133,12 @@ void ParentItem::showList(bool show) if (show) { comboBox->show(); - TQObject::connect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::connect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } else { comboBox->hide(); - TQObject::disconnect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::disconnect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } } @@ -156,7 +156,7 @@ AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, con m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); lin2 = new TQLineEdit( m_listView->viewport() ); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -169,7 +169,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -183,7 +183,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -292,7 +292,7 @@ AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanTrue); combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanFalse); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeBoolItem::~AttributeBoolItem() @@ -331,7 +331,7 @@ AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* p urlRequester = new KURLRequester( m_listView->viewport() ); urlRequester->setMode(KFile::File | KFile::ExistingOnly ); urlRequester->hide(); - TQObject::connect( urlRequester, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( urlRequester, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeUrlItem::~AttributeUrlItem() @@ -409,7 +409,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* par combo->setEditable(true); } combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeListItem::~AttributeListItem() @@ -462,7 +462,7 @@ AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* p combo = new KColorCombo( m_listView->viewport() ); combo->setEditable(true); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeColorItem::~AttributeColorItem() @@ -508,7 +508,7 @@ AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* p //combo->setEditable(true); m_se->hide(); - TQObject::connect( m_se->button(), TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( m_se->button(), TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeStyleItem::~AttributeStyleItem() diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 335fafc6..4d74e548 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -106,8 +106,8 @@ DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) curCol = 0; setFocusPolicy(TQWidget::ClickFocus); this->installEventFilter(this); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); } DualEditableTree::~DualEditableTree() @@ -367,8 +367,8 @@ void TagAttributeTree::setCurrentNode(Node *node) } } - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(slotCollapsed(TQListViewItem*))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(slotExpanded(TQListViewItem*))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(slotCollapsed(TQListViewItem*))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(slotExpanded(TQListViewItem*))); } void TagAttributeTree::editorContentChanged() @@ -423,7 +423,7 @@ void TagAttributeTree::slotParentSelected(int index) if (m_parentItem) { m_newNode = m_parentItem->node(index); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCurrentNode())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCurrentNode())); } } @@ -481,9 +481,9 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char widgetLayout->addWidget( deleteAll, 0, 3 ); clearWState( WState_Polished ); - connect(attrTree, TQT_SIGNAL(newNodeSelected(Node *)), this, TQT_SLOT(NodeSelected(Node *))); - connect(deleteTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteNode())); - connect(deleteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSubTree())); + connect(attrTree, TQ_SIGNAL(newNodeSelected(Node *)), this, TQ_SLOT(NodeSelected(Node *))); + connect(deleteTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteNode())); + connect(deleteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSubTree())); } EnhancedTagAttributeTree::~EnhancedTagAttributeTree() diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 2fa9b7e1..463a56e4 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -143,35 +143,35 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) m_fileMenu = new TDEPopupMenu(this); - m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert())); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQ_SLOT(slotInsert())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(this); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir())); - m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQ_SLOT(slotNewDir())); + m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyAreaMenu = new TDEPopupMenu(this); - m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); + m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); addColumn(i18n("Templates"), -1); addColumn(i18n("Group"), -1); @@ -182,11 +182,11 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) localURL.setPath(locateLocal("data", resourceDir + "templates/")); newBranch(localURL); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); setAcceptDrops(true); setSelectionMode(TQListView::Single); @@ -629,7 +629,7 @@ void TemplatesTreeView::slotProperties() } topLayout->addWidget( m_quantaProperties ); - connect( propDlg, TQT_SIGNAL( applied() ), this , TQT_SLOT( slotPropertiesApplied()) ); + connect( propDlg, TQ_SIGNAL( applied() ), this , TQ_SLOT( slotPropertiesApplied()) ); TQString name = url.path() + TMPL; TDEConfig config(name); @@ -862,7 +862,7 @@ void TemplatesTreeView::slotPaste() if ( ! currentKFileTreeViewItem()->isDir() ) url.setFileName(""); // don't paste on files but in dirs TDEIO::Job *job = TDEIO::copy( list, url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); } } @@ -880,11 +880,11 @@ void TemplatesTreeView::slotDelete() if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { TDEIO::Job *job = TDEIO::del(url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); url.setFileName(url.fileName()+ TMPL); if ( TQFileInfo(url.path()).exists() ) { TDEIO::Job *job2 = TDEIO::del(url); - connect( job2, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job2, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); }; } } diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 4761b25f..da77840e 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -39,11 +39,11 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : setFocusPolicy(TQWidget::ClickFocus); - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile())); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectFile())); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQT_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQ_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); } UploadTreeView::~UploadTreeView() diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index a00e9c75..56d5027d 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -56,7 +56,7 @@ void QNewDTEPStuff::installResource() QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); + connect(this, TQ_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQ_SLOT(slotLoadToolbarFile(const KURL&))); } @@ -83,7 +83,7 @@ void QNewToolbarStuff::installResource() QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&))); + connect(this, TQ_SIGNAL(openFile(const KURL&)), parentWidget, TQ_SLOT(slotFileOpen(const KURL&))); } diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index c5d57a56..87e953fb 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -86,33 +86,33 @@ void QuantaBookmarks::init(TDEActionCollection* ac) { m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, TQT_SLOT(toggleBookmark()), + this, TQ_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, - this, TQT_SLOT(clearBookmarks()), + this, TQ_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new TDEAction( i18n("Next Bookmark"), "go-next", ALT + Key_PageDown, - this, TQT_SLOT(goNext()), + this, TQ_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp, - this, TQT_SLOT(goPrevious()), + this, TQ_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); } @@ -234,7 +234,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse if ( next || prev ) menu.insertSeparator( idx ); } - connect(&menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(gotoLineNumber(int))); + connect(&menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(gotoLineNumber(int))); } return insertedItems; } diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 1ea54048..71eb0e41 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -93,15 +93,15 @@ TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bo m_file = 0L; loopStarted = false; #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) - connect(this, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - TQT_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); + connect(this, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQ_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); #else - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActionActivated())); #endif - connect(this, TQT_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQT_SIGNAL(showMessage(const TQString&, bool))); - connect(this, TQT_SIGNAL(clearMessages()), m_parentMainWindow, TQT_SIGNAL(clearMessages())); - connect(this, TQT_SIGNAL(showMessagesView()), m_parentMainWindow, TQT_SLOT(slotShowMessagesView())); - connect(this, TQT_SIGNAL(createNewFile()), m_parentMainWindow, TQT_SLOT(slotFileNew())); + connect(this, TQ_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQ_SIGNAL(showMessage(const TQString&, bool))); + connect(this, TQ_SIGNAL(clearMessages()), m_parentMainWindow, TQ_SIGNAL(clearMessages())); + connect(this, TQ_SIGNAL(showMessagesView()), m_parentMainWindow, TQ_SLOT(slotShowMessagesView())); + connect(this, TQ_SIGNAL(createNewFile()), m_parentMainWindow, TQ_SLOT(slotFileNew())); } TagAction::~TagAction() @@ -434,12 +434,12 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -688,12 +688,12 @@ bool TagAction::slotActionActivated() firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -991,7 +991,7 @@ void TagAction::execute(bool blocking) { //To avoid lock-ups, start a timer. timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; loopStarted = true; diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 2eb9bf68..72c764ea 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -102,17 +102,17 @@ void TagActionSet::initActions(TQWidget* /*parent*/) const char *actionName = "apply_source_indentation"; new TDEAction(i18n("Apply Source Indentation"), 0, this, - TQT_SLOT(slotApplySourceIndentation()), + TQ_SLOT(slotApplySourceIndentation()), ac, actionName); actionName = "copy_div_element"; new TDEAction(i18n("Copy DIV Area"), 0, this, - TQT_SLOT(slotCopyDivElement()), + TQ_SLOT(slotCopyDivElement()), ac, actionName); actionName = "cut_div_element"; new TDEAction(i18n("Cut DIV Area"), 0, this, - TQT_SLOT(slotCutDivElement()), + TQ_SLOT(slotCutDivElement()), ac, actionName); } @@ -299,31 +299,31 @@ void TableTagActionSet::initActions(TQWidget* parent) const char *actionName = "insert_table"; //m_actionNames += actionName; new TDEAction(i18n("Table..."), 0, this, - TQT_SLOT(slotInsertTable()), + TQ_SLOT(slotInsertTable()), ac, actionName); actionName = "insert_row_above"; //m_actionNames += actionName; new TDEAction(i18n("Row Above"), 0, this, - TQT_SLOT(slotInsertRowAbove()), + TQ_SLOT(slotInsertRowAbove()), ac, actionName); actionName = "insert_row_below"; //m_actionNames += actionName; new TDEAction(i18n("Row Below"), 0, this, - TQT_SLOT(slotInsertRowBelow()), + TQ_SLOT(slotInsertRowBelow()), ac, actionName); actionName = "insert_column_left"; //m_actionNames += actionName; new TDEAction(i18n("Column Left"), 0, this, - TQT_SLOT(slotInsertColumnLeft()), + TQ_SLOT(slotInsertColumnLeft()), ac, actionName); actionName = "insert_column_right"; //m_actionNames += actionName; new TDEAction(i18n("Column Right"), 0, this, - TQT_SLOT(slotInsertColumnRight()), + TQ_SLOT(slotInsertColumnRight()), ac, actionName); // Remove___________________________________________________________________________ @@ -331,31 +331,31 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "remove_table"; //m_actionNames += actionName; new TDEAction(i18n("Table"), 0, this, - TQT_SLOT(slotRemoveTable()), + TQ_SLOT(slotRemoveTable()), ac, actionName); actionName = "remove_rows"; //m_actionNames += actionName; new TDEAction(i18n("Row(s)"), 0, this, - TQT_SLOT(slotRemoveRows()), + TQ_SLOT(slotRemoveRows()), ac, actionName); actionName = "remove_columns"; //m_actionNames += actionName; new TDEAction(i18n("Column(s)"), 0, this, - TQT_SLOT(slotRemoveColumns()), + TQ_SLOT(slotRemoveColumns()), ac, actionName); actionName = "remove_cells"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s)"), 0, this, - TQT_SLOT(slotRemoveCells()), + TQ_SLOT(slotRemoveCells()), ac, actionName); actionName = "remove_cells_content"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s) Content"), 0, this, - TQT_SLOT(slotRemoveCellsContent()), + TQ_SLOT(slotRemoveCellsContent()), ac, actionName); // Merge___________________________________________________________________________ @@ -363,7 +363,7 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "merge_selected_cells"; //m_actionNames += actionName; new TDEAction(i18n("Merge Selected Cells"), 0, this, - TQT_SLOT(slotMergeSelectedCells()), + TQ_SLOT(slotMergeSelectedCells()), ac, actionName); } diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 990b4372..e23145e3 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -43,23 +43,23 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags { m_popupMenu = new TDEPopupMenu(this); m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1); - m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction())); + m_popupMenu->insertItem(i18n("New Action..."), parent, TQ_SLOT(slotNewAction())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar())); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQ_SLOT(slotAddToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQ_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQ_SLOT(slotEditToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), - parent, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(renameToolbar(const TQString&)), - parent, TQT_SLOT(slotRenameToolbar(const TQString&))); - connect(this, TQT_SIGNAL(editToolbar(const TQString&)), - parent, TQT_SLOT(slotConfigureToolbars(const TQString&))); - connect(this, TQT_SIGNAL(newAction()), - parent, TQT_SLOT(slotNewAction())); - connect(this, TQT_SIGNAL(addToolbar()), - parent, TQT_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), + parent, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(renameToolbar(const TQString&)), + parent, TQ_SLOT(slotRenameToolbar(const TQString&))); + connect(this, TQ_SIGNAL(editToolbar(const TQString&)), + parent, TQ_SLOT(slotConfigureToolbars(const TQString&))); + connect(this, TQ_SIGNAL(newAction()), + parent, TQ_SLOT(slotNewAction())); + connect(this, TQ_SIGNAL(addToolbar()), + parent, TQ_SLOT(slotAddToolbar())); TDEAcceleratorManager::setNoAccel(this); } @@ -235,8 +235,8 @@ QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_styl m_iconTextMenu->insertItem(i18n("Text Only"), 1); m_iconTextMenu->insertItem(i18n("Text Alongside Icons"), 2); m_iconTextMenu->insertItem(i18n("Text Under Icons"), 3); - connect(m_iconTextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIconTextChanged(int))); - connect(m_iconTextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotIconTextMenuAboutToShow())); + connect(m_iconTextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIconTextChanged(int))); + connect(m_iconTextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotIconTextMenuAboutToShow())); setIconText(ToolbarTabWidget::ref()->iconText(), false); } @@ -306,7 +306,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) m_toolbarTab->tabUnderMouseLabel = m_toolbarTab->label(m_toolbarTab->currentPageIndex()); m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - " + i18n(m_toolbarTab->tabUnderMouseLabel.utf8())); - m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction())); + m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQ_SIGNAL(newAction())); TQObjectList* childrenList = queryList("TDEToolBarButton"); for (uint i = 0; i < childrenList->count(); i++) { @@ -317,18 +317,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); - m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQ_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQ_SLOT(slotEditAction())); break; } } m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQT_SIGNAL(addToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQT_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQ_SIGNAL(addToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQ_SLOT(slotRenameToolbar())); m_popupMenu->insertSeparator(); m_popupMenu->insertItem( i18n("Text Position"), m_iconTextMenu); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQ_SLOT(slotEditToolbar())); } m_popupMenu->popup(p); } |