summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-12-29 16:35:31 +0900
committerMichele Calgaro <[email protected]>2023-12-29 16:35:31 +0900
commit671d0469ada4df2d833d41d065793a06f4d87a65 (patch)
tree08f73c8f83ba7b8bdad08cdec881878a332ab6bf
parent15796910975130bce11a662cbe259913d791942f (diff)
downloadktechlab-671d0469ada4df2d833d41d065793a06f4d87a65.tar.gz
ktechlab-671d0469ada4df2d833d41d065793a06f4d87a65.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--src/canvasitemparts.cpp8
-rw-r--r--src/canvasmanipulator.cpp2
-rw-r--r--src/circuitdocument.cpp16
-rw-r--r--src/circuitview.cpp20
-rw-r--r--src/connector.cpp4
-rw-r--r--src/docmanager.cpp16
-rw-r--r--src/document.cpp8
-rw-r--r--src/electronics/components/piccomponent.cpp18
-rw-r--r--src/electronics/ecnode.cpp4
-rw-r--r--src/electronics/gpsimprocessor.cpp18
-rw-r--r--src/electronics/subcircuits.cpp2
-rw-r--r--src/electronics/switch.cpp2
-rw-r--r--src/flowcodedocument.cpp8
-rw-r--r--src/flowcodeview.cpp10
-rw-r--r--src/flowcontainer.cpp4
-rw-r--r--src/flowparts/flowpart.cpp6
-rw-r--r--src/flowparts/pinmapping.cpp8
-rw-r--r--src/gui/colorcombo.cpp4
-rw-r--r--src/gui/doublespinbox.cpp4
-rw-r--r--src/gui/itemeditor.cpp4
-rw-r--r--src/gui/itemselector.cpp10
-rw-r--r--src/gui/logview.cpp4
-rw-r--r--src/gui/microselectwidget.cpp2
-rw-r--r--src/gui/microsettingsdlg.cpp14
-rw-r--r--src/gui/newfiledlg.cpp4
-rw-r--r--src/gui/orientationwidget.cpp16
-rw-r--r--src/gui/oscilloscope.cpp14
-rw-r--r--src/gui/oscilloscopeview.cpp4
-rw-r--r--src/gui/pieditor.cpp22
-rw-r--r--src/gui/plvitem.cpp2
-rw-r--r--src/gui/probepositioner.cpp4
-rw-r--r--src/gui/projectdlgs.cpp4
-rw-r--r--src/gui/propertieslistview.cpp10
-rw-r--r--src/gui/settingsdlg.cpp24
-rw-r--r--src/gui/symbolviewer.cpp8
-rw-r--r--src/icndocument.cpp4
-rw-r--r--src/icnview.cpp8
-rw-r--r--src/item.cpp14
-rw-r--r--src/itemdocument.cpp20
-rw-r--r--src/itemdocumentdata.cpp6
-rw-r--r--src/itemgroup.cpp2
-rw-r--r--src/iteminterface.cpp30
-rw-r--r--src/itemview.cpp32
-rw-r--r--src/katemdi.cpp16
-rw-r--r--src/ktechlab.cpp118
-rw-r--r--src/languages/externallanguage.cpp14
-rw-r--r--src/languages/flowcode.cpp4
-rw-r--r--src/languages/language.cpp2
-rw-r--r--src/languages/languagemanager.cpp2
-rw-r--r--src/languages/processchain.cpp10
-rw-r--r--src/mechanics/mechanicsdocument.cpp4
-rw-r--r--src/mechanics/mechanicsitem.cpp8
-rw-r--r--src/mechanics/mechanicssimulation.cpp2
-rw-r--r--src/node.cpp10
-rw-r--r--src/nodegroup.cpp12
-rw-r--r--src/picitem.cpp6
-rw-r--r--src/projectmanager.cpp2
-rw-r--r--src/recentfilesaction.cpp10
-rw-r--r--src/resizeoverlay.cpp24
-rw-r--r--src/simulator.cpp2
-rw-r--r--src/textdocument.cpp36
-rw-r--r--src/textview.cpp34
-rw-r--r--src/variablelabel.cpp8
-rw-r--r--src/view.cpp10
-rw-r--r--src/viewcontainer.cpp14
65 files changed, 386 insertions, 386 deletions
diff --git a/src/canvasitemparts.cpp b/src/canvasitemparts.cpp
index 0518890..c8eca6b 100644
--- a/src/canvasitemparts.cpp
+++ b/src/canvasitemparts.cpp
@@ -25,7 +25,7 @@ GuiPart::GuiPart( CNItem *parent, const TQRect & r, TQCanvas * canvas )
b_pointsAdded(false),
m_originalRect(r)
{
- connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveBy(double, double )) );
+ connect( parent, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(slotMoveBy(double, double )) );
setZ( parent->z() + 0.5 );
}
@@ -283,8 +283,8 @@ Button::Button( const TQString & id, CNItem * parent, bool isToggle, const TQRec
m_button = new ToolButton(0l);
m_button->setUsesTextLabel(false);
m_button->setToggleButton(b_isToggle);
- connect( m_button, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotStateChanged()) );
- connect( m_button, TQT_SIGNAL(released()), this, TQT_SLOT(slotStateChanged()) );
+ connect( m_button, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotStateChanged()) );
+ connect( m_button, TQ_SIGNAL(released()), this, TQ_SLOT(slotStateChanged()) );
posChanged();
}
@@ -443,7 +443,7 @@ Slider::Slider( const TQString & id, CNItem * parent, const TQRect & r, TQCanvas
m_slider->setPaletteForegroundColor(TQt::white);
m_slider->setEraseColor(TQt::white);
m_slider->setBackgroundMode( TQt::NoBackground );
- connect( m_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)) );
+ connect( m_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int)) );
posChanged();
}
diff --git a/src/canvasmanipulator.cpp b/src/canvasmanipulator.cpp
index 803ed6d..b501301 100644
--- a/src/canvasmanipulator.cpp
+++ b/src/canvasmanipulator.cpp
@@ -46,7 +46,7 @@ CMManager::CMManager( ItemDocument *itemDocument )
p_lastItemClicked = 0l;
m_drawAction = -1;
m_allowItemScrollTmr = new TQTimer(this);
- connect( m_allowItemScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAllowItemScroll()) );
+ connect( m_allowItemScrollTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAllowItemScroll()) );
TDEGlobal::config()->setGroup("General");
slotSetManualRoute( TDEGlobal::config()->readBoolEntry( "ManualRouting", false ) );
diff --git a/src/circuitdocument.cpp b/src/circuitdocument.cpp
index 31aef66..6f51d2a 100644
--- a/src/circuitdocument.cpp
+++ b/src/circuitdocument.cpp
@@ -49,11 +49,11 @@ CircuitDocument::CircuitDocument( const TQString & caption, KTechlab *ktechlab,
m_cmManager->addManipulatorInfo( CMItemResize::manipulatorInfo() );
m_cmManager->addManipulatorInfo( CMItemDrag::manipulatorInfo() );
- connect( this, TQT_SIGNAL(connectorAdded(Connector*)), this, TQT_SLOT(requestAssignCircuits()) );
- connect( this, TQT_SIGNAL(connectorAdded(Connector*)), this, TQT_SLOT(connectorAdded(Connector*)) );
+ connect( this, TQ_SIGNAL(connectorAdded(Connector*)), this, TQ_SLOT(requestAssignCircuits()) );
+ connect( this, TQ_SIGNAL(connectorAdded(Connector*)), this, TQ_SLOT(connectorAdded(Connector*)) );
m_updateCircuitsTmr = new TQTimer();
- connect( m_updateCircuitsTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(assignCircuits()) );
+ connect( m_updateCircuitsTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(assignCircuits()) );
requestStateSave();
}
@@ -267,8 +267,8 @@ void CircuitDocument::connectorAdded( Connector * connector )
{
if (connector)
{
- connect( connector, TQT_SIGNAL(numWiresChanged(unsigned )), this, TQT_SLOT(requestAssignCircuits()) );
- connect( connector, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(requestAssignCircuits()) );
+ connect( connector, TQ_SIGNAL(numWiresChanged(unsigned )), this, TQ_SLOT(requestAssignCircuits()) );
+ connect( connector, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(requestAssignCircuits()) );
}
}
@@ -288,9 +288,9 @@ void CircuitDocument::componentAdded( Item * item )
requestAssignCircuits();
- connect( component, TQT_SIGNAL(elementCreated(Element*)), this, TQT_SLOT(requestAssignCircuits()) );
- connect( component, TQT_SIGNAL(elementDestroyed(Element*)), this, TQT_SLOT(requestAssignCircuits()) );
- connect( component, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(componentRemoved(Item*)) );
+ connect( component, TQ_SIGNAL(elementCreated(Element*)), this, TQ_SLOT(requestAssignCircuits()) );
+ connect( component, TQ_SIGNAL(elementDestroyed(Element*)), this, TQ_SLOT(requestAssignCircuits()) );
+ connect( component, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(componentRemoved(Item*)) );
// We don't attach the component to the Simulator just yet, as the
// Component's vtable is not yet fully constructed, and so Simulator can't
diff --git a/src/circuitview.cpp b/src/circuitview.cpp
index 07a6408..f87e8d1 100644
--- a/src/circuitview.cpp
+++ b/src/circuitview.cpp
@@ -27,24 +27,24 @@ CircuitView::CircuitView( CircuitDocument * circuitDocument, ViewContainer *view
{
TDEActionCollection * ac = actionCollection();
- new TDEAction( "Dump linear equations", TQt::CTRL|TQt::Key_D, circuitDocument, TQT_SLOT(displayEquations()), ac, "dump_les" );
+ new TDEAction( "Dump linear equations", TQt::CTRL|TQt::Key_D, circuitDocument, TQ_SLOT(displayEquations()), ac, "dump_les" );
//BEGIN Item Control Actions
TDERadioAction * ra;
- ra = new TDERadioAction( i18n("0 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation0()), ac, "edit_orientation_0" );
+ ra = new TDERadioAction( i18n("0 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation0()), ac, "edit_orientation_0" );
ra->setExclusiveGroup("orientation");
ra->setChecked(true);
- ra = new TDERadioAction( i18n("90 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation90()), ac, "edit_orientation_90" );
+ ra = new TDERadioAction( i18n("90 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation90()), ac, "edit_orientation_90" );
ra->setExclusiveGroup("orientation");
- ra = new TDERadioAction( i18n("180 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation180()), ac, "edit_orientation_180" );
+ ra = new TDERadioAction( i18n("180 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation180()), ac, "edit_orientation_180" );
ra->setExclusiveGroup("orientation");
- ra =new TDERadioAction( i18n("270 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation270()), ac, "edit_orientation_270" );
+ ra =new TDERadioAction( i18n("270 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation270()), ac, "edit_orientation_270" );
ra->setExclusiveGroup("orientation");
- new TDEAction( i18n("Create Subcircuit"), "", 0, circuitDocument, TQT_SLOT(createSubcircuit()), ac, "circuit_create_subcircuit" );
- new TDEAction( i18n("Rotate Clockwise"), "object-rotate-right", "]", circuitDocument, TQT_SLOT(rotateClockwise()), ac, "edit_rotate_cw" );
- new TDEAction( i18n("Rotate Counter-Clockwise"), "object-rotate-left", "[", circuitDocument, TQT_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" );
- new TDEAction( i18n("Flip"), "", 0, circuitDocument, TQT_SLOT(itemFlip()), ac, "edit_flip" );
+ new TDEAction( i18n("Create Subcircuit"), "", 0, circuitDocument, TQ_SLOT(createSubcircuit()), ac, "circuit_create_subcircuit" );
+ new TDEAction( i18n("Rotate Clockwise"), "object-rotate-right", "]", circuitDocument, TQ_SLOT(rotateClockwise()), ac, "edit_rotate_cw" );
+ new TDEAction( i18n("Rotate Counter-Clockwise"), "object-rotate-left", "[", circuitDocument, TQ_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" );
+ new TDEAction( i18n("Flip"), "", 0, circuitDocument, TQ_SLOT(itemFlip()), ac, "edit_flip" );
//END Item Control Actions
setXMLFile( "ktechlabcircuitui.rc", true );
@@ -65,7 +65,7 @@ CircuitView::CircuitView( CircuitDocument * circuitDocument, ViewContainer *view
m_pViewIface = new CircuitViewIface(this);
m_statusBar->insertItem( "", ViewStatusBar::SimulationState );
- connect( Simulator::self(), TQT_SIGNAL(simulatingStateChanged(bool )), this, TQT_SLOT(slotUpdateRunningStatus(bool )) );
+ connect( Simulator::self(), TQ_SIGNAL(simulatingStateChanged(bool )), this, TQ_SLOT(slotUpdateRunningStatus(bool )) );
slotUpdateRunningStatus( Simulator::self()->isSimulating() );
}
diff --git a/src/connector.cpp b/src/connector.cpp
index 182a809..4be6b95 100644
--- a/src/connector.cpp
+++ b/src/connector.cpp
@@ -87,8 +87,8 @@ Connector::Connector( Node * startNode, Node * endNode, ICNDocument *icnDocument
ECNode * endECNode = dynamic_cast<ECNode*>(endNode);
if ( startECNode && endECNode )
{
- connect( startECNode, TQT_SIGNAL(numPinsChanged(unsigned)), this, TQT_SLOT(syncWiresWithNodes()) );
- connect( endECNode, TQT_SIGNAL(numPinsChanged(unsigned)), this, TQT_SLOT(syncWiresWithNodes()) );
+ connect( startECNode, TQ_SIGNAL(numPinsChanged(unsigned)), this, TQ_SLOT(syncWiresWithNodes()) );
+ connect( endECNode, TQ_SIGNAL(numPinsChanged(unsigned)), this, TQ_SLOT(syncWiresWithNodes()) );
syncWiresWithNodes();
}
}
diff --git a/src/docmanager.cpp b/src/docmanager.cpp
index 71a5bea..f6f101d 100644
--- a/src/docmanager.cpp
+++ b/src/docmanager.cpp
@@ -260,12 +260,12 @@ void DocManager::handleNewDocument( Document *document, ViewArea *viewArea )
m_documentList.append(document);
document->setDCOPID(m_nextDocumentID++);
- connect( document, TQT_SIGNAL(modifiedStateChanged()), p_ktechlab, TQT_SLOT(slotDocModifiedChanged()) );
- connect( document, TQT_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQT_SLOT(slotDocModifiedChanged()) );
- connect( document, TQT_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQT_SLOT(addRecentFile(const KURL&)) );
- connect( document, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(documentDestroyed(TQObject* )) );
- connect( document, TQT_SIGNAL(viewFocused(View* )), this, TQT_SLOT(slotViewFocused(View* )) );
- connect( document, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(slotViewUnfocused()) );
+ connect( document, TQ_SIGNAL(modifiedStateChanged()), p_ktechlab, TQ_SLOT(slotDocModifiedChanged()) );
+ connect( document, TQ_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQ_SLOT(slotDocModifiedChanged()) );
+ connect( document, TQ_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQ_SLOT(addRecentFile(const KURL&)) );
+ connect( document, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(documentDestroyed(TQObject* )) );
+ connect( document, TQ_SIGNAL(viewFocused(View* )), this, TQ_SLOT(slotViewFocused(View* )) );
+ connect( document, TQ_SIGNAL(viewUnfocused()), this, TQ_SLOT(slotViewUnfocused()) );
createNewView( document, viewArea );
}
@@ -332,7 +332,7 @@ void DocManager::slotViewFocused( View *view )
Document *document = view->document();
- connect( document, TQT_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQT_SLOT(slotDocUndoRedoChanged()) );
+ connect( document, TQ_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQ_SLOT(slotDocUndoRedoChanged()) );
p_connectedDocument = document;
if ( document->type() == Document::dt_circuit ||
@@ -359,7 +359,7 @@ void DocManager::slotViewUnfocused()
if (p_connectedDocument)
{
- disconnect( p_connectedDocument, TQT_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQT_SLOT(slotDocUndoRedoChanged()) );
+ disconnect( p_connectedDocument, TQ_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQ_SLOT(slotDocUndoRedoChanged()) );
p_connectedDocument = 0l;
}
diff --git a/src/document.cpp b/src/document.cpp
index ac18843..cad15f5 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -33,7 +33,7 @@ Document::Document( const TQString &caption, KTechlab *ktechlab, const char *nam
m_bDeleted(false)
{
if (p_ktechlab)
- connect( p_ktechlab, TQT_SIGNAL(configurationChanged()), this, TQT_SLOT(slotUpdateConfiguration()) );
+ connect( p_ktechlab, TQ_SIGNAL(configurationChanged()), this, TQ_SLOT(slotUpdateConfiguration()) );
}
@@ -56,9 +56,9 @@ void Document::handleNewView( View *view )
m_viewList.append(view);
view->setDCOPID(m_nextViewID++);
view->setCaption(m_caption);
- connect( view, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(slotViewDestroyed(TQObject* )) );
- connect( view, TQT_SIGNAL(viewFocused(View* )), this, TQT_SLOT(slotViewFocused(View* )) );
- connect( view, TQT_SIGNAL(viewUnfocused()), this, TQT_SIGNAL(viewUnfocused()) );
+ connect( view, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(slotViewDestroyed(TQObject* )) );
+ connect( view, TQ_SIGNAL(viewFocused(View* )), this, TQ_SLOT(slotViewFocused(View* )) );
+ connect( view, TQ_SIGNAL(viewUnfocused()), this, TQ_SIGNAL(viewUnfocused()) );
view->show();
view->setFocused();
}
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index 57ff164..6c45df1 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -90,14 +90,14 @@ PICComponent::PICComponent( ICNDocument *icnDocument, bool newItem, const char *
addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", TDEIcon::Small ) );
if ( icnDocument->ktechlab() )
- connect( icnDocument->ktechlab(), TQT_SIGNAL(recentFileAdded(const KURL &)), this, TQT_SLOT(slotUpdateFileList()) );
+ connect( icnDocument->ktechlab(), TQ_SIGNAL(recentFileAdded(const KURL &)), this, TQ_SLOT(slotUpdateFileList()) );
- connect( ProjectManager::self(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotUpdateFileList()) );
- connect( ProjectManager::self(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotUpdateFileList()) );
- connect( ProjectManager::self(), TQT_SIGNAL(projectCreated()), this, TQT_SLOT(slotUpdateFileList()) );
- connect( ProjectManager::self(), TQT_SIGNAL(subprojectCreated()), this, TQT_SLOT(slotUpdateFileList()) );
- connect( ProjectManager::self(), TQT_SIGNAL(filesAdded()), this, TQT_SLOT(slotUpdateFileList()) );
- connect( ProjectManager::self(), TQT_SIGNAL(filesRemoved()), this, TQT_SLOT(slotUpdateFileList()) );
+ connect( ProjectManager::self(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotUpdateFileList()) );
+ connect( ProjectManager::self(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotUpdateFileList()) );
+ connect( ProjectManager::self(), TQ_SIGNAL(projectCreated()), this, TQ_SLOT(slotUpdateFileList()) );
+ connect( ProjectManager::self(), TQ_SIGNAL(subprojectCreated()), this, TQ_SLOT(slotUpdateFileList()) );
+ connect( ProjectManager::self(), TQ_SIGNAL(filesAdded()), this, TQ_SLOT(slotUpdateFileList()) );
+ connect( ProjectManager::self(), TQ_SIGNAL(filesRemoved()), this, TQ_SLOT(slotUpdateFileList()) );
createProperty( "program", Variant::Type::FileName );
property("program")->setCaption( i18n("Program") );
@@ -366,7 +366,7 @@ TQString PICComponent::createSymbolFile()
m_bLoadingProgram = true;
slotUpdateBtns();
- return GpsimProcessor::generateSymbolFile( dataString("program"), this, TQT_SLOT(slotCODCreationSucceeded()), TQT_SLOT(slotCODCreationFailed()) );
+ return GpsimProcessor::generateSymbolFile( dataString("program"), this, TQ_SLOT(slotCODCreationSucceeded()), TQ_SLOT(slotCODCreationFailed()) );
}
@@ -383,7 +383,7 @@ void PICComponent::slotCODCreationSucceeded()
property("lastPackage")->setValue( microInfo->id() );
initPackage( microInfo );
- connect( m_pGpsim, TQT_SIGNAL(runningStatusChanged(bool )), this, TQT_SLOT(slotUpdateBtns()) );
+ connect( m_pGpsim, TQ_SIGNAL(runningStatusChanged(bool )), this, TQ_SLOT(slotUpdateBtns()) );
attachPICComponentPins();
}
diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp
index 77633a2..28af164 100644
--- a/src/electronics/ecnode.cpp
+++ b/src/electronics/ecnode.cpp
@@ -138,8 +138,8 @@ void ECNode::setParentItem( CNItem * parentItem )
if ( Component * component = dynamic_cast<Component*>(parentItem) )
{
- connect( component, TQT_SIGNAL(elementDestroyed(Element* )), this, TQT_SLOT(removeElement(Element* )) );
- connect( component, TQT_SIGNAL(switchDestroyed( Switch* )), this, TQT_SLOT(removeSwitch( Switch* )) );
+ connect( component, TQ_SIGNAL(elementDestroyed(Element* )), this, TQ_SLOT(removeElement(Element* )) );
+ connect( component, TQ_SIGNAL(switchDestroyed( Switch* )), this, TQ_SLOT(removeSwitch( Switch* )) );
}
}
diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
index 38e9c89..4d6229d 100644
--- a/src/electronics/gpsimprocessor.cpp
+++ b/src/electronics/gpsimprocessor.cpp
@@ -366,9 +366,9 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
if (receiver)
{
if (successMember)
- connect( pc, TQT_SIGNAL(successful()), receiver, successMember );
+ connect( pc, TQ_SIGNAL(successful()), receiver, successMember );
if (failMember)
- connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
+ connect( pc, TQ_SIGNAL(failed()), receiver, failMember );
}
return TQString(hexFile).replace( ".hex", ".cod" );
@@ -386,9 +386,9 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
if (receiver)
{
if (successMember)
- connect( pc, TQT_SIGNAL(successful()), receiver, successMember );
+ connect( pc, TQ_SIGNAL(successful()), receiver, successMember );
if (failMember)
- connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
+ connect( pc, TQ_SIGNAL(failed()), receiver, failMember );
}
return TQString(fileName).replace(".asm",".cod");
@@ -406,9 +406,9 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
if (receiver)
{
if (successMember)
- connect( pc, TQT_SIGNAL(successful()), receiver, successMember );
+ connect( pc, TQ_SIGNAL(successful()), receiver, successMember );
if (failMember)
- connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
+ connect( pc, TQ_SIGNAL(failed()), receiver, failMember );
}
return TQString(fileName).replace(".c",".cod");
@@ -432,9 +432,9 @@ void GpsimProcessor::compileMicrobe( const TQString &filename, TQObject *receive
if (receiver)
{
if (successMember)
- connect( pc, TQT_SIGNAL(successful()), receiver, successMember );
+ connect( pc, TQ_SIGNAL(successful()), receiver, successMember );
if (failMember)
- connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
+ connect( pc, TQ_SIGNAL(failed()), receiver, failMember );
}
}
//END class GpsimProcessor
@@ -452,7 +452,7 @@ GpsimDebugger::GpsimDebugger( Type type, GpsimProcessor * gpsim )
m_stackLevelLowerBreak = -1;
m_addressSize = 0;
- connect( m_pGpsim, TQT_SIGNAL(runningStatusChanged(bool )), this, TQT_SLOT(gpsimRunningStatusChanged(bool )) );
+ connect( m_pGpsim, TQ_SIGNAL(runningStatusChanged(bool )), this, TQ_SLOT(gpsimRunningStatusChanged(bool )) );
if ( type == HLLDebugger )
{
diff --git a/src/electronics/subcircuits.cpp b/src/electronics/subcircuits.cpp
index fcb8dec..2e4db84 100644
--- a/src/electronics/subcircuits.cpp
+++ b/src/electronics/subcircuits.cpp
@@ -26,7 +26,7 @@
Subcircuits::Subcircuits()
: TQObject()
{
- connect( ComponentSelector::self(), TQT_SIGNAL(itemRemoved(const TQString& )), this, TQT_SLOT(slotItemRemoved(const TQString& )) );
+ connect( ComponentSelector::self(), TQ_SIGNAL(itemRemoved(const TQString& )), this, TQ_SLOT(slotItemRemoved(const TQString& )) );
}
diff --git a/src/electronics/switch.cpp b/src/electronics/switch.cpp
index 581b5b1..eb5d672 100644
--- a/src/electronics/switch.cpp
+++ b/src/electronics/switch.cpp
@@ -33,7 +33,7 @@ Switch::Switch( Component * parent, Pin * p1, Pin * p2, State state )
m_pP2 = p2;
m_pComponent = parent;
m_pStopBouncingTimer = new TQTimer( this );
- connect( m_pStopBouncingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(stopBouncing()) );
+ connect( m_pStopBouncingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(stopBouncing()) );
// Force update
m_state = (state == Open) ? Closed : Open;
diff --git a/src/flowcodedocument.cpp b/src/flowcodedocument.cpp
index 7bdc695..5d01cba 100644
--- a/src/flowcodedocument.cpp
+++ b/src/flowcodedocument.cpp
@@ -93,7 +93,7 @@ void FlowCodeDocument::setPicType( const TQString &id )
}
m_microSettings = new MicroSettings(m_microInfo);
- connect( m_microSettings, TQT_SIGNAL(pinMappingsChanged()), this, TQT_SIGNAL(pinMappingsChanged()) );
+ connect( m_microSettings, TQ_SIGNAL(pinMappingsChanged()), this, TQ_SIGNAL(pinMappingsChanged()) );
//TODO restore pic settings from temporary location if appropriate
delete m_picItem;
@@ -191,7 +191,7 @@ void FlowCodeDocument::convertToMicrobe()
}
ProcessOptions o( dlg->info() );
- o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) );
+ o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) );
o.p_flowCodeDocument = this;
o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_Microbe );
LanguageManager::self()->compile(o);
@@ -213,7 +213,7 @@ void FlowCodeDocument::convertToAssembly()
}
ProcessOptions o( dlg->info() );
- o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) );
+ o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) );
o.p_flowCodeDocument = this;
o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_AssemblyAbsolute );
LanguageManager::self()->compile(o);
@@ -235,7 +235,7 @@ void FlowCodeDocument::convertToHex()
}
ProcessOptions o( dlg->info() );
- o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) );
+ o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) );
o.p_flowCodeDocument = this;
o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_Program );
LanguageManager::self()->compile(o);
diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp
index 3690117..0e330e2 100644
--- a/src/flowcodeview.cpp
+++ b/src/flowcodeview.cpp
@@ -34,16 +34,16 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer *
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", TDEIcon::Small ), i18n("Assembly"), FlowCodeDocument::AssemblyOutput );
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", TDEIcon::Small ), i18n("Hex"), FlowCodeDocument::HexOutput );
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", TDEIcon::Small ), i18n("PIC (upload)"), FlowCodeDocument::PICOutput );
- connect( m, TQT_SIGNAL(activated(int)), flowCodeDocument, TQT_SLOT(slotConvertTo(int)) );
+ connect( m, TQ_SIGNAL(activated(int)), flowCodeDocument, TQ_SLOT(slotConvertTo(int)) );
//END Convert To * Actions
-// new TDEAction( i18n("Convert to Microbe"), "convert_to_microbe", TQt::Key_F7, flowCodeDocument, TQT_SLOT(convertToMicrobe()), ac, "tools_to_microbe" );
-// new TDEAction( i18n("Convert to Assembly"), "convert_to_assembly", TQt::Key_F8, flowCodeDocument, TQT_SLOT(convertToAssembly()), ac, "tools_to_assembly" );
-// new TDEAction( i18n("Convert to Hex"), "convert_to_hex", TQt::Key_F9, flowCodeDocument, TQT_SLOT(convertToHex()), ac, "tools_to_hex" );
-// new TDEAction( i18n("Upload PIC Program"), "convert_to_pic", 0, flowCodeDocument, TQT_SLOT(convertToPIC()), ac, "tools_to_pic" );
+// new TDEAction( i18n("Convert to Microbe"), "convert_to_microbe", TQt::Key_F7, flowCodeDocument, TQ_SLOT(convertToMicrobe()), ac, "tools_to_microbe" );
+// new TDEAction( i18n("Convert to Assembly"), "convert_to_assembly", TQt::Key_F8, flowCodeDocument, TQ_SLOT(convertToAssembly()), ac, "tools_to_assembly" );
+// new TDEAction( i18n("Convert to Hex"), "convert_to_hex", TQt::Key_F9, flowCodeDocument, TQ_SLOT(convertToHex()), ac, "tools_to_hex" );
+// new TDEAction( i18n("Upload PIC Program"), "convert_to_pic", 0, flowCodeDocument, TQ_SLOT(convertToPIC()), ac, "tools_to_pic" );
diff --git a/src/flowcontainer.cpp b/src/flowcontainer.cpp
index 194b1f0..f264286 100644
--- a/src/flowcontainer.cpp
+++ b/src/flowcontainer.cpp
@@ -153,7 +153,7 @@ void FlowContainer::childAdded( Item *child )
FlowPart::childAdded(child);
- connect( this, TQT_SIGNAL(movedBy(double, double )), child, TQT_SLOT(moveBy(double, double )) );
+ connect( this, TQ_SIGNAL(movedBy(double, double )), child, TQ_SLOT(moveBy(double, double )) );
child->setZ( ICNDocument::Z::Item + child->level() );
updateContainedVisibility();
@@ -167,7 +167,7 @@ void FlowContainer::childRemoved( Item *child )
if (!b_expanded)
child->setVisible(true);
- disconnect( this, TQT_SIGNAL(movedBy(double, double )), child, TQT_SLOT(moveBy(double, double )) );
+ disconnect( this, TQ_SIGNAL(movedBy(double, double )), child, TQ_SLOT(moveBy(double, double )) );
}
diff --git a/src/flowparts/flowpart.cpp b/src/flowparts/flowpart.cpp
index d19ce45..e0f5f71 100644
--- a/src/flowparts/flowpart.cpp
+++ b/src/flowparts/flowpart.cpp
@@ -74,8 +74,8 @@ FlowPart::FlowPart( ICNDocument *icnDocument, bool newItem, const TQString &id )
m_stdOutput = 0l;
m_altOutput = 0l;
- connect( m_pFlowCodeDocument, TQT_SIGNAL(picTypeChanged()), this, TQT_SLOT(slotUpdateFlowPartVariables()) );
- connect( m_pFlowCodeDocument, TQT_SIGNAL(pinMappingsChanged()), this, TQT_SLOT(slotUpdateFlowPartVariables()) );
+ connect( m_pFlowCodeDocument, TQ_SIGNAL(picTypeChanged()), this, TQ_SLOT(slotUpdateFlowPartVariables()) );
+ connect( m_pFlowCodeDocument, TQ_SIGNAL(pinMappingsChanged()), this, TQ_SLOT(slotUpdateFlowPartVariables()) );
}
@@ -529,7 +529,7 @@ Variant * FlowPart::createProperty( const TQString & id, Variant::Type::Value ty
{
if ( MicroSettings * settings = m_pFlowCodeDocument->microSettings() )
v->setAllowed( settings->variableNames() );
- connect( property(id), TQT_SIGNAL(valueChanged(TQVariant, TQVariant )), this, TQT_SLOT(varNameChanged(TQVariant, TQVariant )) );
+ connect( property(id), TQ_SIGNAL(valueChanged(TQVariant, TQVariant )), this, TQ_SLOT(varNameChanged(TQVariant, TQVariant )) );
}
else
slotUpdateFlowPartVariables();
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index 84c8217..cfaf9e2 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -60,19 +60,19 @@ PinMapEditor::PinMapEditor( PinMapping * pinMapping, MicroInfo * picInfo, TQWidg
TQAccel * accel = new TQAccel( this );
accel->connectItem( accel->insertItem( Key_Delete ),
m_pPinMapDocument,
- TQT_SLOT(deleteSelection()) );
+ TQ_SLOT(deleteSelection()) );
accel->connectItem( accel->insertItem( TDEStdAccel::selectAll().keyCodeQt() ),
m_pPinMapDocument,
- TQT_SLOT(selectAll()) );
+ TQ_SLOT(selectAll()) );
accel->connectItem( accel->insertItem( TDEStdAccel::undo().keyCodeQt() ),
m_pPinMapDocument,
- TQT_SLOT(undo()) );
+ TQ_SLOT(undo()) );
accel->connectItem( accel->insertItem( TDEStdAccel::redo().keyCodeQt() ),
m_pPinMapDocument,
- TQT_SLOT(redo()) );
+ TQ_SLOT(redo()) );
TQFrame * f = new TQFrame(this);
diff --git a/src/gui/colorcombo.cpp b/src/gui/colorcombo.cpp
index e5d17dd..c57f89f 100644
--- a/src/gui/colorcombo.cpp
+++ b/src/gui/colorcombo.cpp
@@ -30,8 +30,8 @@ ColorCombo::ColorCombo( ColorScheme colorScheme, TQWidget *parent, const char *n
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) ) );
}
diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp
index d513ebd..a0e7717 100644
--- a/src/gui/doublespinbox.cpp
+++ b/src/gui/doublespinbox.cpp
@@ -42,7 +42,7 @@ DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double
editor()->setAlignment( TQt::AlignRight );
- connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(checkIfChanged()) );
+ connect( this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(checkIfChanged()) );
TQSpinBox::setMinValue( -(1<<30) );
TQSpinBox::setMaxValue( +(1<<30) );
setValue( value );
@@ -94,7 +94,7 @@ void DoubleSpinBox::updateSuffix( double value )
if ( m_queuedSuffix.stripWhiteSpace().isEmpty() )
m_queuedSuffix = "";
- TQTimer::singleShot( 0, this, TQT_SLOT(setQueuedSuffix()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(setQueuedSuffix()) );
}
diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp
index 9a05aee..1c97769 100644
--- a/src/gui/itemeditor.cpp
+++ b/src/gui/itemeditor.cpp
@@ -58,12 +58,12 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
m_defaultsBtn = new TQPushButton( i18n("Defaults"), this);
m_defaultsBtn->setEnabled(false);
- connect(m_defaultsBtn,TQT_SIGNAL(clicked()),propList,TQT_SLOT(slotSetDefaults()));
+ connect(m_defaultsBtn,TQ_SIGNAL(clicked()),propList,TQ_SLOT(slotSetDefaults()));
h1Layout->addWidget(m_defaultsBtn);
m_mergeBtn = new TQPushButton( i18n("Merge properties"), this );
m_mergeBtn->setEnabled(false);
- connect(m_mergeBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(mergeProperties()));
+ connect(m_mergeBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(mergeProperties()));
h1Layout->addWidget(m_mergeBtn);
// TQt::Orientation widget stuff
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index d10cd52..f82fa6d 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -56,10 +56,10 @@ ItemSelector::ItemSelector( TQWidget *parent, const char *name )
setRootIsDecorated(true);
setDragEnabled(true);
-// connect( this, TQT_SIGNAL(executed(TQListViewItem*) ), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
- connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemClicked(TQListViewItem*)) );
- connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)) );
- connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int )), this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int )) );
+// connect( this, TQ_SIGNAL(executed(TQListViewItem*) ), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemClicked(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int )), this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int )) );
}
ItemSelector::~ItemSelector()
@@ -163,7 +163,7 @@ void ItemSelector::slotContextMenuRequested( TQListViewItem* item, const TQPoint
}
TQPopupMenu *menu = new TQPopupMenu(this);
- menu->insertItem( i18n("Remove %1").arg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete );
+ menu->insertItem( i18n("Remove %1").arg(item->text(0)), this, TQ_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete );
menu->popup(pos);
}
diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp
index 9031f45..3be9290 100644
--- a/src/gui/logview.cpp
+++ b/src/gui/logview.cpp
@@ -27,7 +27,7 @@ LogView::LogView( KateMDI::ToolView * parent, const char *name )
setWordWrap( WidgetWidth );
// Connect up signal emitted when the user doubleclicks on a paragraph in the log view
- connect( this, TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(slotParaClicked(int,int)) );
+ connect( this, TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(slotParaClicked(int,int)) );
}
@@ -102,7 +102,7 @@ TQPopupMenu * LogView::createPopupMenu( const TQPoint & pos )
TQPopupMenu * menu = KTextEdit::createPopupMenu( pos );
menu->insertSeparator();
- int id = menu->insertItem( i18n("Clear All"), this, TQT_SLOT(clear()) );
+ int id = menu->insertItem( i18n("Clear All"), this, TQ_SLOT(clear()) );
// "an empty textedit is always considered to have one paragraph" - qt documentation
// although this does not always seem to be the case, so I don't know...
diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp
index 432961d..abc0b89 100644
--- a/src/gui/microselectwidget.cpp
+++ b/src/gui/microselectwidget.cpp
@@ -46,7 +46,7 @@ MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags
m_pMicro->setAutoCompletion(true);
updateFromAllowed();
setMicro("P16F84");
- connect( m_pMicroFamily, TQT_SIGNAL(activated(const TQString & )), this, TQT_SLOT(microFamilyChanged(const TQString& )) );
+ connect( m_pMicroFamily, TQ_SIGNAL(activated(const TQString & )), this, TQ_SLOT(microFamilyChanged(const TQString& )) );
}
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index 9195cfe..8478d66 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -115,16 +115,16 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
}
m_pWidget->variables->insertRows( row, 1 );
- connect( m_pWidget->variables, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SLOT(checkAddVariableRow()) );
+ connect( m_pWidget->variables, TQ_SIGNAL(valueChanged(int,int)), this, TQ_SLOT(checkAddVariableRow()) );
//END Initialize initial variable settings
//BEGIN Initialize pin maps
- connect( m_pWidget->pinMapAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreatePinMap()) );
- connect( m_pWidget->pinMapModify, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModifyPinMap()) );
- connect( m_pWidget->pinMapRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRenamePinMap()) );
- connect( m_pWidget->pinMapRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemovePinMap()) );
+ connect( m_pWidget->pinMapAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreatePinMap()) );
+ connect( m_pWidget->pinMapModify, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModifyPinMap()) );
+ connect( m_pWidget->pinMapRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRenamePinMap()) );
+ connect( m_pWidget->pinMapRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemovePinMap()) );
m_pinMappings = microSettings->pinMappings();
m_pWidget->pinMapCombo->insertStringList( m_pinMappings.keys() );
@@ -138,7 +138,7 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
m_pWidget->adjustSize();
adjustSize();
- connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotSaveStuff()) );
+ connect( this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotSaveStuff()) );
}
@@ -248,7 +248,7 @@ void MicroSettingsDlg::slotCreatePinMap()
PinMappingNameValidator * validator = new PinMappingNameValidator( this );
m_pNewPinMappingWidget->nameEdit->setValidator( validator );
- connect( m_pNewPinMappingWidget->nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckNewPinMappingName(const TQString &)) );
+ connect( m_pNewPinMappingWidget->nameEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckNewPinMappingName(const TQString &)) );
slotCheckNewPinMappingName( 0 );
int accepted = m_pNewPinMappingDlg->exec();
diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp
index e379976..39db03e 100644
--- a/src/gui/newfiledlg.cpp
+++ b/src/gui/newfiledlg.cpp
@@ -79,8 +79,8 @@ NewFileDlg::NewFileDlg( TQWidget *parent )
setMainWidget(m_pNewFileWidget);
// Our behaviour is to have single click selects and double click accepts the dialog
- connect( m_pNewFileWidget->typeIconView, TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(fileTypeChanged(TQIconViewItem*)) );
- connect( m_pNewFileWidget->typeIconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(accept()));
+ connect( m_pNewFileWidget->typeIconView, TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(fileTypeChanged(TQIconViewItem*)) );
+ connect( m_pNewFileWidget->typeIconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQ_SLOT(accept()));
setAcceptDrops(true);
diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp
index 3fa9f9e..f846f7a 100644
--- a/src/gui/orientationwidget.cpp
+++ b/src/gui/orientationwidget.cpp
@@ -46,14 +46,14 @@ OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
}
}
- connect( m_toolBtn[0][0], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_0()) );
- connect( m_toolBtn[0][1], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_90()) );
- connect( m_toolBtn[0][2], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_180()) );
- connect( m_toolBtn[0][3], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_270()) );
- connect( m_toolBtn[1][0], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_0()) );
- connect( m_toolBtn[1][1], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_90()) );
- connect( m_toolBtn[1][2], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_180()) );
- connect( m_toolBtn[1][3], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_270()) );
+ connect( m_toolBtn[0][0], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_0()) );
+ connect( m_toolBtn[0][1], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_90()) );
+ connect( m_toolBtn[0][2], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_180()) );
+ connect( m_toolBtn[0][3], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_270()) );
+ connect( m_toolBtn[1][0], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_0()) );
+ connect( m_toolBtn[1][1], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_90()) );
+ connect( m_toolBtn[1][2], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_180()) );
+ connect( m_toolBtn[1][3], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_270()) );
}
diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp
index 92c32bf..45042f6 100644
--- a/src/gui/oscilloscope.cpp
+++ b/src/gui/oscilloscope.cpp
@@ -72,21 +72,21 @@ Oscilloscope::Oscilloscope( KateMDI::ToolView * parent )
horizontalScroll->setLineStep(32);
horizontalScroll->setPageStep( oscilloscopeView->width() );
- connect( resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()) );
- connect( zoomSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotZoomSliderChanged(int)) );
- connect( horizontalScroll, TQT_SIGNAL(valueChanged(int )), this, TQT_SLOT(slotSliderValueChanged(int )) );
+ connect( resetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset()) );
+ connect( zoomSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotZoomSliderChanged(int)) );
+ connect( horizontalScroll, TQ_SIGNAL(valueChanged(int )), this, TQ_SLOT(slotSliderValueChanged(int )) );
-// connect( pauseBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTogglePause()) );
+// connect( pauseBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTogglePause()) );
TQTimer * updateScrollTmr = new TQTimer(this);
- connect( updateScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollbars()) );
+ connect( updateScrollTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScrollbars()) );
updateScrollTmr->start(20);
TDEGlobal::config()->setGroup("Oscilloscope");
setZoomLevel( TDEGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) );
- connect( this, TQT_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQT_SLOT(slotProbeDataRegistered(int, ProbeData *)) );
- connect( this, TQT_SIGNAL(probeUnregistered(int )), probePositioner, TQT_SLOT(slotProbeDataUnregistered(int )) );
+ connect( this, TQ_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQ_SLOT(slotProbeDataRegistered(int, ProbeData *)) );
+ connect( this, TQ_SIGNAL(probeUnregistered(int )), probePositioner, TQ_SLOT(slotProbeDataUnregistered(int )) );
}
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index 8641c27..2852c16 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -54,7 +54,7 @@ OscilloscopeView::OscilloscopeView( TQWidget *parent, const char *name )
setMouseTracking(true);
m_updateViewTmr = new TQTimer(this);
- connect( m_updateViewTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateViewTimeout()) );
+ connect( m_updateViewTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateViewTimeout()) );
}
@@ -134,7 +134,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event )
fpsMenu.setItemChecked( num, num == m_fps );
}
- connect( &fpsMenu, TQT_SIGNAL(activated(int )), this, TQT_SLOT(slotSetFrameRate(int )) );
+ connect( &fpsMenu, TQ_SIGNAL(activated(int )), this, TQ_SLOT(slotSetFrameRate(int )) );
fpsMenu.exec( event->globalPos() );
return;
}
diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp
index 941126f..ee27a14 100644
--- a/src/gui/pieditor.cpp
+++ b/src/gui/pieditor.cpp
@@ -26,7 +26,7 @@ PIEditor::PIEditor(TQString id, Variant *data, TQWidget *parent, const char *nam
{
m_id = id;
m_data = data;
- connect(m_data,TQT_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQT_SLOT(valueChanged(TQVariant)));
+ connect(m_data,TQ_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQ_SLOT(valueChanged(TQVariant)));
setFocus();
update();
//show();
@@ -54,7 +54,7 @@ PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name )
m_comboBox->insertItem( i18n("False"), 1 );
m_comboBox->setCurrentItem( m_data->value().toBool() ? 0 : 1 );
- connect( m_comboBox, TQT_SIGNAL(activated(int )), this, TQT_SLOT(selectChanged(int )) );
+ connect( m_comboBox, TQ_SIGNAL(activated(int )), this, TQ_SLOT(selectChanged(int )) );
}
PIBool::~PIBool()
@@ -88,8 +88,8 @@ PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name
m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this );
m_combo->setColor(m_data->value().toColor());
- connect(m_combo,TQT_SIGNAL(activated(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&)));
-// connect(m_combo,TQT_SIGNAL(highlighted(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&)));
+ connect(m_combo,TQ_SIGNAL(activated(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&)));
+// connect(m_combo,TQ_SIGNAL(highlighted(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&)));
}
PIColor::~PIColor()
@@ -122,7 +122,7 @@ PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *nam
spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this);
- connect(spin,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(spinValueChanged(double)));
+ connect(spin,TQ_SIGNAL(valueChanged(double)),this,TQ_SLOT(spinValueChanged(double)));
}
PIDouble::~PIDouble()
@@ -160,8 +160,8 @@ PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char
m_urlreq->setURL( m_data->value().toString() );
m_urlreq->setFilter( m_data->filter() );
- connect(m_urlreq,TQT_SIGNAL(urlSelected(const TQString&)),this,TQT_SLOT(slotURLChanged(const TQString&)));
- //connect(m_urlreq,TQT_SIGNAL(openFileDialog(KURLRequester*)),this,TQT_SLOT(slotOpenFileDialog(KURLRequester* )));
+ connect(m_urlreq,TQ_SIGNAL(urlSelected(const TQString&)),this,TQ_SLOT(slotURLChanged(const TQString&)));
+ //connect(m_urlreq,TQ_SIGNAL(openFileDialog(KURLRequester*)),this,TQ_SLOT(slotOpenFileDialog(KURLRequester* )));
}
PIFilename::~PIFilename()
@@ -201,7 +201,7 @@ PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *n
spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this );
- connect( spin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(spinValueChanged(int)));
+ connect( spin, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spinValueChanged(int)));
}
PIInt::~PIInt()
@@ -227,7 +227,7 @@ PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
m_edit = new KLineEdit( m_data->value().toString() , this );
- connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged()));
+ connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotEditTextChanged()));
}
@@ -262,8 +262,8 @@ PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const
type == Variant::Type::FileName ||
type == Variant::Type::VarName );
- connect(m_combo,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotComboChanged()));
- connect(m_combo,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComboChanged()));
+ connect(m_combo,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotComboChanged()));
+ connect(m_combo,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(slotComboChanged()));
}
diff --git a/src/gui/plvitem.cpp b/src/gui/plvitem.cpp
index a94af4c..590e07b 100644
--- a/src/gui/plvitem.cpp
+++ b/src/gui/plvitem.cpp
@@ -23,7 +23,7 @@ PLVItem::PLVItem(TDEListView *listview, const TQString &id, Variant *data)
m_id = id;
setText(1,p_data->displayString() );
- connect(data,TQT_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQT_SLOT(updateData(TQVariant )));
+ connect(data,TQ_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQ_SLOT(updateData(TQVariant )));
//setHeight(100);
}
diff --git a/src/gui/probepositioner.cpp b/src/gui/probepositioner.cpp
index 25f7119..51cd6e6 100644
--- a/src/gui/probepositioner.cpp
+++ b/src/gui/probepositioner.cpp
@@ -112,9 +112,9 @@ ProbeData* ProbePositioner::probeAtPosition( const TQPoint &pos )
void ProbePositioner::slotProbeDataRegistered( int id, ProbeData *probe )
{
m_probeDataMap[id] = probe;
- connect( probe, TQT_SIGNAL(displayAttributeChanged()), this, TQT_SLOT(forceRepaint()) );
+ connect( probe, TQ_SIGNAL(displayAttributeChanged()), this, TQ_SLOT(forceRepaint()) );
// This connect doesn't really belong here, but it save a lot of code
- connect( probe, TQT_SIGNAL(displayAttributeChanged()), Oscilloscope::self()->oscilloscopeView, TQT_SLOT(updateView()) );
+ connect( probe, TQ_SIGNAL(displayAttributeChanged()), Oscilloscope::self()->oscilloscopeView, TQ_SLOT(updateView()) );
forceRepaint();
Oscilloscope::self()->oscilloscopeView->updateView();
}
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index 6ab051b..3b8dbaf 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -34,8 +34,8 @@ NewProjectDlg::NewProjectDlg( TQWidget * parent )
: KDialogBase( parent, "newprojectdlg", true, "New Project", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true )
{
m_pWidget = new NewProjectWidget(this);
- connect( m_pWidget->projectNameEdit, TQT_SIGNAL(textChanged(const TQString & )), this, TQT_SLOT(locationChanged(const TQString& )) );
- connect( m_pWidget->projectLocationURL, TQT_SIGNAL(textChanged(const TQString & )), this, TQT_SLOT(locationChanged(const TQString& )) );
+ connect( m_pWidget->projectNameEdit, TQ_SIGNAL(textChanged(const TQString & )), this, TQ_SLOT(locationChanged(const TQString& )) );
+ connect( m_pWidget->projectLocationURL, TQ_SIGNAL(textChanged(const TQString & )), this, TQ_SLOT(locationChanged(const TQString& )) );
// Check if already valid dir
locationChanged( TQString() );
diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp
index 560dedd..59813ec 100644
--- a/src/gui/propertieslistview.cpp
+++ b/src/gui/propertieslistview.cpp
@@ -36,9 +36,9 @@ PropertiesListView::PropertiesListView(TQWidget *parent, const char *name)
p_lastItem = 0l;
m_diffBt = 0L;
- connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),this,TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+ connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),this,TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
m_editor = 0L;
- connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(headerSizeChanged(int,int,int)));
+ connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(headerSizeChanged(int,int,int)));
}
PropertiesListView::~PropertiesListView()
@@ -185,10 +185,10 @@ void PropertiesListView::slotSelectionChanged(TQListViewItem *item)
}
}
- connect(p_lastItem->data(),TQT_SIGNAL(destroyed()),this,TQT_SLOT(destroyEditor()));
+ connect(p_lastItem->data(),TQ_SIGNAL(destroyed()),this,TQ_SLOT(destroyEditor()));
// Connect so that changes in the editor change the canvas item data.
- connect(m_editor,TQT_SIGNAL(editorDataChanged(const TQString&,TQVariant)),ItemInterface::self(),TQT_SLOT(slotSetData(const TQString&,TQVariant)));
- connect(m_editor,TQT_SIGNAL(editorDataChanged(const TQString&,TQVariant)),this,TQT_SLOT(slotDataChanged(const TQString&,TQVariant)));
+ connect(m_editor,TQ_SIGNAL(editorDataChanged(const TQString&,TQVariant)),ItemInterface::self(),TQ_SLOT(slotSetData(const TQString&,TQVariant)));
+ connect(m_editor,TQ_SIGNAL(editorDataChanged(const TQString&,TQVariant)),this,TQ_SLOT(slotDataChanged(const TQString&,TQVariant)));
int x = columnWidth(0);
int y = viewportToContents(TQPoint(0,itemRect(p_lastItem).y())).y();
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index 6976f00..1361bb2 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -62,18 +62,18 @@ SettingsDlg::SettingsDlg( TQWidget *parent, const char *name, TDEConfigSkeleton
addPage( m_gpasmSettingsWidget, "Gpasm", "convert_to_hex", "gpasm" );
addPage( m_sdccOptionsWidget, "SDCC", "text-x-csrc", "SDCC" );
- connect( m_generalOptionsWidget->refreshRateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotUpdateRefreshRateLabel(int)) );
- connect( m_picProgrammerConfigWidget->kcfg_PicProgrammerProgram, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotUpdatePicProgrammerDescription()) );
- connect( m_picProgrammerConfigWidget->removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveProgrammerConfig()) );
- connect( m_picProgrammerConfigWidget->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddProgrammerConfig()) );
+ connect( m_generalOptionsWidget->refreshRateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotUpdateRefreshRateLabel(int)) );
+ connect( m_picProgrammerConfigWidget->kcfg_PicProgrammerProgram, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotUpdatePicProgrammerDescription()) );
+ connect( m_picProgrammerConfigWidget->removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveProgrammerConfig()) );
+ connect( m_picProgrammerConfigWidget->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddProgrammerConfig()) );
- connect( m_picProgrammerConfigWidget->initCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) );
- connect( m_picProgrammerConfigWidget->readCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) );
- connect( m_picProgrammerConfigWidget->writeCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) );
- connect( m_picProgrammerConfigWidget->verifyCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) );
- connect( m_picProgrammerConfigWidget->blankCheckCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) );
- connect( m_picProgrammerConfigWidget->eraseCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) );
+ connect( m_picProgrammerConfigWidget->initCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) );
+ connect( m_picProgrammerConfigWidget->readCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) );
+ connect( m_picProgrammerConfigWidget->writeCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) );
+ connect( m_picProgrammerConfigWidget->verifyCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) );
+ connect( m_picProgrammerConfigWidget->blankCheckCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) );
+ connect( m_picProgrammerConfigWidget->eraseCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) );
m_generalOptionsWidget->kcfg_GridColor->setEnabled( KTLConfig::showGrid() );
@@ -300,7 +300,7 @@ void SettingsDlg::updateSettings()
emit settingsChanged();
}
- TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateSettings()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateSettings()) );
}
@@ -346,7 +346,7 @@ void SettingsDlg::updateWidgets()
combo->insertStringList( programmerNames );
combo->setSizeLimit( programmerNames.size() );
- TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateWidgets()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateWidgets()) );
}
diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp
index 0e972e2..cb7033a 100644
--- a/src/gui/symbolviewer.cpp
+++ b/src/gui/symbolviewer.cpp
@@ -39,8 +39,8 @@ SymbolViewerItem::SymbolViewerItem( SymbolViewer * symbolViewer, RegisterInfo *
// setText( TYPE_COLUMN, RegisterInfo::toString( m_pRegisterInfo->type() ) );
radixChanged(); // force update of displayed string
- connect( m_pRegisterInfo, TQT_SIGNAL(valueChanged(unsigned)), this, TQT_SLOT(valueChanged(unsigned)) );
- connect( m_pSymbolViewer, TQT_SIGNAL(valueRadixChanged(SymbolViewer::Radix)), this, TQT_SLOT(radixChanged()) );
+ connect( m_pRegisterInfo, TQ_SIGNAL(valueChanged(unsigned)), this, TQ_SLOT(valueChanged(unsigned)) );
+ connect( m_pSymbolViewer, TQ_SIGNAL(valueRadixChanged(SymbolViewer::Radix)), this, TQ_SLOT(radixChanged()) );
}
@@ -89,7 +89,7 @@ SymbolViewer::SymbolViewer( KateMDI::ToolView * parent )
m_pRadixCombo->insertItem( i18n("Hexadecimal") );
m_valueRadix = Decimal;
m_pRadixCombo->setCurrentItem(2);
- connect( m_pRadixCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectRadix(int)) );
+ connect( m_pRadixCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectRadix(int)) );
m_pGpsim = 0l;
m_pCurrentContext = 0l;
@@ -156,7 +156,7 @@ void SymbolViewer::setContext( GpsimProcessor * gpsim )
if (!m_pCurrentContext)
return;
- connect( gpsim, TQT_SIGNAL(destroyed()), m_pSymbolList, TQT_SLOT(clear()) );
+ connect( gpsim, TQ_SIGNAL(destroyed()), m_pSymbolList, TQ_SLOT(clear()) );
unsigned count = m_pCurrentContext->size();
for ( unsigned i = 0; i < count; ++i )
diff --git a/src/icndocument.cpp b/src/icndocument.cpp
index 0df2e96..a623abb 100644
--- a/src/icndocument.cpp
+++ b/src/icndocument.cpp
@@ -963,7 +963,7 @@ bool ICNDocument::registerItem( TQCanvasItem *qcanvasItem )
{
Node *node = (Node*)qcanvasItem;
m_nodeList.append(node);
- connect( node, TQT_SIGNAL(removed(Node*)), this, TQT_SLOT(requestRerouteInvalidatedConnectors()) );
+ connect( node, TQ_SIGNAL(removed(Node*)), this, TQ_SLOT(requestRerouteInvalidatedConnectors()) );
emit nodeAdded(node);
break;
}
@@ -971,7 +971,7 @@ bool ICNDocument::registerItem( TQCanvasItem *qcanvasItem )
{
Connector *connector = dynamic_cast<Connector*>(qcanvasItem);
m_connectorList.append(connector);
- connect( connector, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(requestRerouteInvalidatedConnectors()) );
+ connect( connector, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(requestRerouteInvalidatedConnectors()) );
emit connectorAdded(connector);
break;
}
diff --git a/src/icnview.cpp b/src/icnview.cpp
index cd0e628..2977daa 100644
--- a/src/icnview.cpp
+++ b/src/icnview.cpp
@@ -28,12 +28,12 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v
//BEGIN Routing Actions
// These actions get inserted into the main menu
- m_pAutoRoutingAction = new TDERadioAction( i18n("Automatic"), "", 0, this, TQT_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" );
+ m_pAutoRoutingAction = new TDERadioAction( i18n("Automatic"), "", 0, this, TQ_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" );
m_pAutoRoutingAction->setExclusiveGroup("routing_mode");
if ( !manualRouting )
m_pAutoRoutingAction->setChecked( true );
- m_pManualRoutingAction = new TDERadioAction( i18n("Manual"), "", 0, this, TQT_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" );
+ m_pManualRoutingAction = new TDERadioAction( i18n("Manual"), "", 0, this, TQ_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" );
m_pManualRoutingAction->setExclusiveGroup("routing_mode");
if ( manualRouting )
m_pManualRoutingAction->setChecked( true );
@@ -52,10 +52,10 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v
m->setCheckable(true);
m->setItemChecked( manualRouting ? 1 : 0, true );
- connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetRoutingMode(int)) );
+ connect( m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetRoutingMode(int)) );
//END Routing Actions
- connect( icnDocument->m_cmManager, TQT_SIGNAL(manualRoutingChanged(bool )), this, TQT_SLOT(slotUpdateRoutingToggles(bool )) );
+ connect( icnDocument->m_cmManager, TQ_SIGNAL(manualRoutingChanged(bool )), this, TQ_SLOT(slotUpdateRoutingToggles(bool )) );
}
diff --git a/src/item.cpp b/src/item.cpp
index 2e6ca76..320b99a 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -319,7 +319,7 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo )
textEdit->setText( v->value().toString() );
layout->addWidget( textEdit, 10 );
textEdit->setFocus();
- connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) );
+ connect( dlg, TQ_SIGNAL( user1Clicked() ), textEdit, TQ_SLOT( clear() ) );
dlg->setMinimumWidth( 600 );
if ( dlg->exec() == KDialogBase::Accepted )
{
@@ -353,7 +353,7 @@ void Item::setParentItem( Item *newParentItem )
if (oldParentItem)
{
- disconnect( oldParentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeItem()) );
+ disconnect( oldParentItem, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(removeItem()) );
oldParentItem->removeChild(this);
}
@@ -363,7 +363,7 @@ void Item::setParentItem( Item *newParentItem )
// kdError() << k_funcinfo << "Already a child of " << newParentItem << endl;
else
{
- connect( newParentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeItem()) );
+ connect( newParentItem, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(removeItem()) );
newParentItem->addChild(this);
}
}
@@ -418,7 +418,7 @@ void Item::addChild( Item *child )
}
m_children.append(child);
- connect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
+ connect( child, TQ_SIGNAL(removed(Item* )), this, TQ_SLOT(removeChild(Item* )) );
child->setParentItem(this);
childAdded(child);
@@ -432,7 +432,7 @@ void Item::removeChild( Item *child )
return;
m_children.remove(child);
- disconnect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
+ disconnect( child, TQ_SIGNAL(removed(Item* )), this, TQ_SLOT(removeChild(Item* )) );
childRemoved(child);
p_itemDocument->slotUpdateZOrdering();
@@ -563,7 +563,7 @@ Variant * Item::createProperty( const TQString & id, Variant::Type::Value type )
{
m_variantData[id] = new Variant(type);
if (m_bDoneCreation)
- connect( m_variantData[id], TQT_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQT_SLOT(dataChanged()) );
+ connect( m_variantData[id], TQ_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQ_SLOT(dataChanged()) );
}
return m_variantData[id];
@@ -591,7 +591,7 @@ void Item::finishedCreation( )
m_bDoneCreation = true;
const VariantDataMap::iterator end = m_variantData.end();
for ( VariantDataMap::iterator it = m_variantData.begin(); it != end; ++it )
- connect( it.data(), TQT_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQT_SLOT(dataChanged()) );
+ connect( it.data(), TQ_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQ_SLOT(dataChanged()) );
dataChanged();
}
//END Data stuff
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index a8dc42b..a1da229 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -74,15 +74,15 @@ ItemDocument::ItemDocument( const TQString &caption, KTechlab *ktechlab, const c
m_canvas->setDoubleBuffering(true);
m_pEventTimer = new TQTimer(this);
- connect( m_pEventTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processItemDocumentEvents()) );
+ connect( m_pEventTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processItemDocumentEvents()) );
- connect( this, TQT_SIGNAL(itemSelected(Item*)), this, TQT_SLOT(slotInitItemActions(Item*)) );
- connect( this, TQT_SIGNAL(itemUnselected(Item*)), this, TQT_SLOT(slotInitItemActions(Item*)) );
+ connect( this, TQ_SIGNAL(itemSelected(Item*)), this, TQ_SLOT(slotInitItemActions(Item*)) );
+ connect( this, TQ_SIGNAL(itemUnselected(Item*)), this, TQ_SLOT(slotInitItemActions(Item*)) );
- connect( ComponentSelector::self(), TQT_SIGNAL(itemClicked(const TQString& )), this, TQT_SLOT(slotUnsetRepeatedItemId()) );
- connect( FlowPartSelector::self(), TQT_SIGNAL(itemClicked(const TQString& )), this, TQT_SLOT(slotUnsetRepeatedItemId()) );
+ connect( ComponentSelector::self(), TQ_SIGNAL(itemClicked(const TQString& )), this, TQ_SLOT(slotUnsetRepeatedItemId()) );
+ connect( FlowPartSelector::self(), TQ_SIGNAL(itemClicked(const TQString& )), this, TQ_SLOT(slotUnsetRepeatedItemId()) );
#ifdef MECHANICS
- connect( MechanicsSelector::self(), TQT_SIGNAL(itemClicked(const TQString& )), this, TQT_SLOT(slotUnsetRepeatedItemId()) );
+ connect( MechanicsSelector::self(), TQ_SIGNAL(itemClicked(const TQString& )), this, TQ_SLOT(slotUnsetRepeatedItemId()) );
#endif
m_pAlignmentAction = new TDEActionMenu( i18n("Alignment"), "format-justify-right", this );
@@ -130,9 +130,9 @@ bool ItemDocument::registerItem( TQCanvasItem *qcanvasItem )
{
Item *item = dynamic_cast<Item*>(qcanvasItem);
m_itemList.append(item);
- connect( item, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(requestRerouteInvalidatedConnectors()) );
- connect( item, TQT_SIGNAL(selected(Item*,bool)), this, TQT_SIGNAL(itemSelected(Item*)) );
- connect( item, TQT_SIGNAL(unselected(Item*,bool)), this, TQT_SIGNAL(itemUnselected(Item*)) );
+ connect( item, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(requestRerouteInvalidatedConnectors()) );
+ connect( item, TQ_SIGNAL(selected(Item*,bool)), this, TQ_SIGNAL(itemSelected(Item*)) );
+ connect( item, TQ_SIGNAL(unselected(Item*,bool)), this, TQ_SIGNAL(itemUnselected(Item*)) );
itemAdded(item);
return true;
}
@@ -1219,7 +1219,7 @@ Canvas::Canvas( ItemDocument *itemDocument, const char * name )
{
p_itemDocument = itemDocument;
m_pMessageTimeout = new TQTimer(this);
- connect( m_pMessageTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetAllChanged()) );
+ connect( m_pMessageTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetAllChanged()) );
}
diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp
index 669d1c8..bc9c052 100644
--- a/src/itemdocumentdata.cpp
+++ b/src/itemdocumentdata.cpp
@@ -1310,7 +1310,7 @@ void SubcircuitData::initECSubcircuit( ECSubcircuit * ecSubcircuit )
component->updateConnectorPoints(false);
component->setVisible(false);
component->setCanvas(0l);
- ecSubcircuit->connect( ecSubcircuit, TQT_SIGNAL(subcircuitDeleted()), component, TQT_SLOT(removeItem()) );
+ ecSubcircuit->connect( ecSubcircuit, TQ_SIGNAL(subcircuitDeleted()), component, TQ_SLOT(removeItem()) );
}
}
for ( ConnectorDataMap::iterator it = m_connectorDataMap.begin(); it != connectorEnd; ++it )
@@ -1321,7 +1321,7 @@ void SubcircuitData::initECSubcircuit( ECSubcircuit * ecSubcircuit )
connector->updateConnectorPoints(false);
connector->setVisible(false);
connector->setCanvas(0l);
- ecSubcircuit->connect( ecSubcircuit, TQT_SIGNAL(subcircuitDeleted()), connector, TQT_SLOT(removeConnector()) );
+ ecSubcircuit->connect( ecSubcircuit, TQ_SIGNAL(subcircuitDeleted()), connector, TQ_SLOT(removeConnector()) );
}
}
const NodeDataMap::iterator nodeEnd = m_nodeDataMap.end();
@@ -1332,7 +1332,7 @@ void SubcircuitData::initECSubcircuit( ECSubcircuit * ecSubcircuit )
{
node->setVisible(false);
node->setCanvas(0l);
- ecSubcircuit->connect( ecSubcircuit, TQT_SIGNAL(subcircuitDeleted()), node, TQT_SLOT(removeNode()) );
+ ecSubcircuit->connect( ecSubcircuit, TQ_SIGNAL(subcircuitDeleted()), node, TQ_SLOT(removeNode()) );
}
}
diff --git a/src/itemgroup.cpp b/src/itemgroup.cpp
index 1268550..9ff4a23 100644
--- a/src/itemgroup.cpp
+++ b/src/itemgroup.cpp
@@ -25,7 +25,7 @@ ItemGroup::ItemGroup( ItemDocument *view, const char *name )
p_view = view;
p_icnDocument = dynamic_cast<ICNDocument*>(p_view);
p_mechanicsDocument = dynamic_cast<MechanicsDocument*>(p_view);
- TQTimer::singleShot( 0, this, TQT_SLOT(getViewPtrs()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(getViewPtrs()) );
}
diff --git a/src/iteminterface.cpp b/src/iteminterface.cpp
index 3e94b1a..3fcac4b 100644
--- a/src/iteminterface.cpp
+++ b/src/iteminterface.cpp
@@ -74,8 +74,8 @@ void ItemInterface::slotItemDocumentChanged( ItemDocument * doc )
slotClearAll();
if ( ItemDocument * itemDocument = dynamic_cast<ItemDocument*>((Document*)p_cvb) )
{
- disconnect( itemDocument, TQT_SIGNAL(itemSelected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) );
- disconnect( itemDocument, TQT_SIGNAL(itemUnselected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) );
+ disconnect( itemDocument, TQ_SIGNAL(itemSelected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) );
+ disconnect( itemDocument, TQ_SIGNAL(itemUnselected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) );
}
p_itemGroup = 0l;
@@ -86,8 +86,8 @@ void ItemInterface::slotItemDocumentChanged( ItemDocument * doc )
if (!p_cvb)
return;
- connect( p_cvb, TQT_SIGNAL(itemSelected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) );
- connect( p_cvb, TQT_SIGNAL(itemUnselected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) );
+ connect( p_cvb, TQ_SIGNAL(itemSelected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) );
+ connect( p_cvb, TQ_SIGNAL(itemUnselected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) );
p_itemGroup = p_cvb->selectList();
@@ -285,8 +285,8 @@ TQWidget * ItemInterface::configWidget()
box->setEditable( true );
m_stringComboBoxMap[vait.key()] = box;
- connectMapWidget( box, TQT_SIGNAL(textChanged(const TQString &)));
- connectMapWidget( box, TQT_SIGNAL(activated(const TQString &)));
+ connectMapWidget( box, TQ_SIGNAL(textChanged(const TQString &)));
+ connectMapWidget( box, TQ_SIGNAL(activated(const TQString &)));
editWidget = box;
break;
@@ -301,7 +301,7 @@ TQWidget * ItemInterface::configWidget()
KURLComboRequester * urlreq = new KURLComboRequester( configWidget );
urlreq->setFilter( vait.data()->filter() );
- connectMapWidget( urlreq, TQT_SIGNAL(urlSelected(const TQString &)) );
+ connectMapWidget( urlreq, TQ_SIGNAL(urlSelected(const TQString &)) );
m_stringURLReqMap[vait.key()] = urlreq;
KComboBox * box = urlreq->comboBox();
@@ -312,8 +312,8 @@ TQWidget * ItemInterface::configWidget()
urlreq->setURL( vait.data()->value().toString() );
// Generally we only want a file name once the user has finished typing out the full file name.
- connectMapWidget( box, TQT_SIGNAL(returnPressed(const TQString &)));
- connectMapWidget( box, TQT_SIGNAL(activated(const TQString &)));
+ connectMapWidget( box, TQ_SIGNAL(returnPressed(const TQString &)));
+ connectMapWidget( box, TQ_SIGNAL(activated(const TQString &)));
editWidget = urlreq;
break;
@@ -323,7 +323,7 @@ TQWidget * ItemInterface::configWidget()
KLineEdit * edit = new KLineEdit( configWidget );
edit->setText( vait.data()->value().toString() );
- connectMapWidget(edit,TQT_SIGNAL(textChanged(const TQString &)));
+ connectMapWidget(edit,TQ_SIGNAL(textChanged(const TQString &)));
m_stringLineEditMap[vait.key()] = edit;
editWidget = edit;
break;
@@ -332,7 +332,7 @@ TQWidget * ItemInterface::configWidget()
{
KIntSpinBox *spin = new KIntSpinBox( (int)vait.data()->minValue(), (int)vait.data()->maxValue(), 1, vait.data()->value().toInt(), 10, configWidget );
- connectMapWidget( spin, TQT_SIGNAL(valueChanged(int)) );
+ connectMapWidget( spin, TQ_SIGNAL(valueChanged(int)) );
m_intSpinBoxMap[vait.key()] = spin;
editWidget = spin;
break;
@@ -341,7 +341,7 @@ TQWidget * ItemInterface::configWidget()
{
DoubleSpinBox *spin = new DoubleSpinBox( vait.data()->minValue(), vait.data()->maxValue(), vait.data()->minAbsValue(), vait.data()->value().toDouble(), vait.data()->unit(), configWidget );
- connectMapWidget( spin, TQT_SIGNAL(valueChanged(double)));
+ connectMapWidget( spin, TQ_SIGNAL(valueChanged(double)));
m_doubleSpinBoxMap[vait.key()] = spin;
editWidget = spin;
break;
@@ -353,7 +353,7 @@ TQWidget * ItemInterface::configWidget()
ColorCombo * colorBox = new ColorCombo( (ColorCombo::ColorScheme)vait.data()->colorScheme(), configWidget );
colorBox->setColor( value );
- connectMapWidget( colorBox, TQT_SIGNAL(activated(const TQColor &)));
+ connectMapWidget( colorBox, TQ_SIGNAL(activated(const TQColor &)));
m_colorComboMap[vait.key()] = colorBox;
editWidget = colorBox;
@@ -365,7 +365,7 @@ TQWidget * ItemInterface::configWidget()
TQCheckBox * box = new TQCheckBox( vait.data()->toolbarCaption(), configWidget );
box->setChecked(value);
- connectMapWidget( box, TQT_SIGNAL(toggled(bool)));
+ connectMapWidget( box, TQ_SIGNAL(toggled(bool)));
m_boolCheckMap[vait.key()] = box;
editWidget = box;
break;
@@ -430,7 +430,7 @@ TQWidget * ItemInterface::configWidget()
void ItemInterface::connectMapWidget( TQWidget *widget, const char *_signal )
{
- connect( widget, _signal, this, TQT_SLOT(tbDataChanged()) );
+ connect( widget, _signal, this, TQ_SLOT(tbDataChanged()) );
}
diff --git a/src/itemview.cpp b/src/itemview.cpp
index 88d33d9..5b84954 100644
--- a/src/itemview.cpp
+++ b/src/itemview.cpp
@@ -37,24 +37,24 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
{
TDEActionCollection * ac = actionCollection();
- KStdAction::selectAll( itemDocument, TQT_SLOT(selectAll()), ac );
- KStdAction::zoomIn( this, TQT_SLOT(zoomIn()), ac );
- KStdAction::zoomOut( this, TQT_SLOT(zoomOut()), ac );
- KStdAction::actualSize( this, TQT_SLOT(actualSize()), ac )->setEnabled(false);
+ KStdAction::selectAll( itemDocument, TQ_SLOT(selectAll()), ac );
+ KStdAction::zoomIn( this, TQ_SLOT(zoomIn()), ac );
+ KStdAction::zoomOut( this, TQ_SLOT(zoomOut()), ac );
+ KStdAction::actualSize( this, TQ_SLOT(actualSize()), ac )->setEnabled(false);
TDEAccel *pAccel = new TDEAccel(this);
- pAccel->insert( "Cancel", i18n("Cancel"), i18n("Cancel the current operation"), TQt::Key_Escape, itemDocument, TQT_SLOT(cancelCurrentOperation()) );
+ pAccel->insert( "Cancel", i18n("Cancel"), i18n("Cancel the current operation"), TQt::Key_Escape, itemDocument, TQ_SLOT(cancelCurrentOperation()) );
pAccel->readSettings();
- new TDEAction( i18n("Delete"), "edit-delete", TQt::Key_Delete, itemDocument, TQT_SLOT(deleteSelection()), ac, "edit_delete" );
- new TDEAction( i18n("Export as Image..."), 0, 0, itemDocument, TQT_SLOT(exportToImage()), ac, "file_export_image");
+ new TDEAction( i18n("Delete"), "edit-delete", TQt::Key_Delete, itemDocument, TQ_SLOT(deleteSelection()), ac, "edit_delete" );
+ new TDEAction( i18n("Export as Image..."), 0, 0, itemDocument, TQ_SLOT(exportToImage()), ac, "file_export_image");
//BEGIN Item Alignment actions
- new TDEAction( i18n("Align Horizontally"), 0, 0, itemDocument, TQT_SLOT(alignHorizontally()), ac, "align_horizontally" );
- new TDEAction( i18n("Align Vertically"), 0, 0, itemDocument, TQT_SLOT(alignVertically()), ac, "align_vertically" );
- new TDEAction( i18n("Distribute Horizontally"), 0, 0, itemDocument, TQT_SLOT(distributeHorizontally()), ac, "distribute_horizontally" );
- new TDEAction( i18n("Distribute Vertically"), 0, 0, itemDocument, TQT_SLOT(distributeVertically()), ac, "distribute_vertically" );
+ new TDEAction( i18n("Align Horizontally"), 0, 0, itemDocument, TQ_SLOT(alignHorizontally()), ac, "align_horizontally" );
+ new TDEAction( i18n("Align Vertically"), 0, 0, itemDocument, TQ_SLOT(alignVertically()), ac, "align_vertically" );
+ new TDEAction( i18n("Distribute Horizontally"), 0, 0, itemDocument, TQ_SLOT(distributeHorizontally()), ac, "distribute_horizontally" );
+ new TDEAction( i18n("Distribute Vertically"), 0, 0, itemDocument, TQ_SLOT(distributeVertically()), ac, "distribute_vertically" );
//END Item Alignment actions
@@ -70,13 +70,13 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_arrow", TDEIcon::Small ), i18n("Arrow"), DrawPart::da_arrow );
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_ellipse", TDEIcon::Small ), i18n("Ellipse"), DrawPart::da_ellipse );
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_rectangle", TDEIcon::Small ), i18n("Rectangle"), DrawPart::da_rectangle );
- connect( m, TQT_SIGNAL(activated(int)), itemDocument, TQT_SLOT(slotSetDrawAction(int)) );
+ connect( m, TQ_SIGNAL(activated(int)), itemDocument, TQ_SLOT(slotSetDrawAction(int)) );
//END Draw actions
//BEGIN Item Control actions
- new TDEAction( i18n("Raise Selection"), "1uparrow", TQt::Key_PageUp, itemDocument, TQT_SLOT(raiseZ()), ac, "edit_raise" );
- new TDEAction( i18n("Lower Selection"), "1downarrow", TQt::Key_PageDown, itemDocument, TQT_SLOT(lowerZ()), ac, "edit_lower" );
+ new TDEAction( i18n("Raise Selection"), "1uparrow", TQt::Key_PageUp, itemDocument, TQ_SLOT(raiseZ()), ac, "edit_raise" );
+ new TDEAction( i18n("Lower Selection"), "1downarrow", TQt::Key_PageDown, itemDocument, TQ_SLOT(lowerZ()), ac, "edit_lower" );
//END Item Control actions
@@ -86,8 +86,8 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
setXMLFile( "ktechlabitemviewui.rc" );
m_pUpdateStatusTmr = new TQTimer(this);
- connect( m_pUpdateStatusTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()) );
- connect( this, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(stopUpdatingStatus()) );
+ connect( m_pUpdateStatusTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateStatus()) );
+ connect( this, TQ_SIGNAL(viewUnfocused()), this, TQ_SLOT(stopUpdatingStatus()) );
p_itemDocument = itemDocument;
m_zoomLevel = 1.;
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index be99f47..9dd3451 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -64,8 +64,8 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor
: TDEToggleAction(text,cut,parent,name)
, m_tv(tv)
{
- connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
- connect(m_tv,TQT_SIGNAL(visibleChanged(bool)),this,TQT_SLOT(visibleChanged(bool)));
+ connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool)));
+ connect(m_tv,TQ_SIGNAL(visibleChanged(bool)),this,TQ_SLOT(visibleChanged(bool)));
setChecked(m_tv->visible());
}
@@ -105,8 +105,8 @@ GUIClient::GUIClient ( MainWindow *mw )
, KXMLGUIClient ( mw )
, m_mw (mw)
{
- connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
- this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+ connect( m_mw->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+ this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
if (actionCollection()->tdeaccel()==0)
actionCollection()->setWidget(m_mw);
@@ -268,7 +268,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
show ();
- connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+ connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
tab(newId)->installEventFilter(this);
return widget;
@@ -416,8 +416,8 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
if (sidebarPosition() != 3)
p->insertItem(SmallIconSet("go-down"), i18n("Bottom Sidebar"),3);
- connect(p, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(buttonPopupActivate(int)));
+ connect(p, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(buttonPopupActivate(int)));
p->exec(e->globalPos());
delete p;
@@ -524,7 +524,7 @@ void Sidebar::restoreSession (TDEConfig *config)
// readd the button
int newId = m_widgetToId[tv];
appendTab (tv->icon, newId, tv->text);
- connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+ connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
tab(newId)->installEventFilter(this);
// reshuffle in splitter
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index 46e5935..f4153eb 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -72,7 +72,7 @@ KTechlab::KTechlab()
m_pToolBarOverlayLabel = 0l;
m_pUpdateCaptionsTimer = new TQTimer( this );
- connect( m_pUpdateCaptionsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateCaptions()) );
+ connect( m_pUpdateCaptionsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateCaptions()) );
setMinimumSize( 400, 400 );
@@ -233,7 +233,7 @@ void KTechlab::addWindow( ViewContainer * vc )
if ( vc && !m_viewContainerList.contains(vc) )
{
m_viewContainerList << vc;
- connect( vc, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(slotViewContainerDestroyed(TQObject* )) );
+ connect( vc, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(slotViewContainerDestroyed(TQObject* )) );
}
m_viewContainerList.remove((ViewContainer*)0);
@@ -310,7 +310,7 @@ void KTechlab::overlayToolBarScreenshot()
m_pToolBarOverlayLabel->setPixmap( shot );
m_pToolBarOverlayLabel->show();
- TQTimer::singleShot( 100, this, TQT_SLOT( hideToolBarOverlay() ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( hideToolBarOverlay() ) );
}
@@ -363,11 +363,11 @@ void KTechlab::removeGUIClients()
void KTechlab::setupTabWidget()
{
m_pViewContainerTabWidget = new KTabWidget(centralWidget());
- connect( tabWidget(), TQT_SIGNAL(currentChanged(TQWidget* )), this, TQT_SLOT(slotViewContainerActivated(TQWidget* )) );
- connect( tabWidget(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), this, TQT_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) );
- connect( tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget* )), this, TQT_SLOT(slotTabDragInitiate(TQWidget* )) );
- connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQDropEvent* )), this, TQT_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) );
- connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), this, TQT_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) );
+ connect( tabWidget(), TQ_SIGNAL(currentChanged(TQWidget* )), this, TQ_SLOT(slotViewContainerActivated(TQWidget* )) );
+ connect( tabWidget(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), this, TQ_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) );
+ connect( tabWidget(), TQ_SIGNAL(initiateDrag(TQWidget* )), this, TQ_SLOT(slotTabDragInitiate(TQWidget* )) );
+ connect( tabWidget(), TQ_SIGNAL(receivedDropEvent(TQDropEvent* )), this, TQ_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) );
+ connect( tabWidget(), TQ_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), this, TQ_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) );
TDEConfig *config = kapp->config();
config->setGroup("UI");
@@ -387,12 +387,12 @@ void KTechlab::setupTabWidget()
but->setIconSet(SmallIcon("tab_remove"));
but->adjustSize();
but->hide();
- connect( but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotViewContainerClose()) );
+ connect( but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotViewContainerClose()) );
tabWidget()->setCornerWidget(but, TopRight);
}
// tabWidget()->setTabReorderingEnabled(true);
-// connect(tabWidget(), TQT_SIGNAL(movedTab(int, int)), this, TQT_SLOT(tabMoved(int, int)));
- connect(tabWidget(), TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), this, TQT_SLOT(slotTabContext(TQWidget*,const TQPoint &)));
+// connect(tabWidget(), TQ_SIGNAL(movedTab(int, int)), this, TQ_SLOT(tabMoved(int, int)));
+ connect(tabWidget(), TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), this, TQ_SLOT(slotTabContext(TQWidget*,const TQPoint &)));
//END Tab bar stuff
}
@@ -415,67 +415,67 @@ void KTechlab::setupActions()
{
TDEActionCollection *ac = actionCollection();
- KStdAction::openNew( this, TQT_SLOT(slotFileNew()), ac );
- KStdAction::open( this, TQT_SLOT(slotFileOpen()), ac );
- KStdAction::save( this, TQT_SLOT(slotFileSave()), ac );
- KStdAction::saveAs( this, TQT_SLOT(slotFileSaveAs()), ac );
- KStdAction::close( this, TQT_SLOT(slotViewClose()), ac );
- KStdAction::print( this, TQT_SLOT(slotFilePrint()), ac );
- KStdAction::quit( this, TQT_SLOT(slotFileQuit()), ac );
- KStdAction::undo( this, TQT_SLOT(slotEditUndo()), ac );
- KStdAction::redo( this, TQT_SLOT(slotEditRedo()), ac );
- KStdAction::cut( this, TQT_SLOT(slotEditCut()), ac );
- KStdAction::copy( this, TQT_SLOT(slotEditCopy()), ac );
- KStdAction::paste( this, TQT_SLOT(slotEditPaste()), ac );
- KStdAction::keyBindings( this, TQT_SLOT(slotOptionsConfigureKeys()), ac );
- KStdAction::configureToolbars( this, TQT_SLOT(slotOptionsConfigureToolbars()), ac );
- KStdAction::preferences( this, TQT_SLOT(slotOptionsPreferences()), ac );
+ KStdAction::openNew( this, TQ_SLOT(slotFileNew()), ac );
+ KStdAction::open( this, TQ_SLOT(slotFileOpen()), ac );
+ KStdAction::save( this, TQ_SLOT(slotFileSave()), ac );
+ KStdAction::saveAs( this, TQ_SLOT(slotFileSaveAs()), ac );
+ KStdAction::close( this, TQ_SLOT(slotViewClose()), ac );
+ KStdAction::print( this, TQ_SLOT(slotFilePrint()), ac );
+ KStdAction::quit( this, TQ_SLOT(slotFileQuit()), ac );
+ KStdAction::undo( this, TQ_SLOT(slotEditUndo()), ac );
+ KStdAction::redo( this, TQ_SLOT(slotEditRedo()), ac );
+ KStdAction::cut( this, TQ_SLOT(slotEditCut()), ac );
+ KStdAction::copy( this, TQ_SLOT(slotEditCopy()), ac );
+ KStdAction::paste( this, TQ_SLOT(slotEditPaste()), ac );
+ KStdAction::keyBindings( this, TQ_SLOT(slotOptionsConfigureKeys()), ac );
+ KStdAction::configureToolbars( this, TQ_SLOT(slotOptionsConfigureToolbars()), ac );
+ KStdAction::preferences( this, TQ_SLOT(slotOptionsPreferences()), ac );
//BEGIN New file popup
- TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT(slotFileNew()), ac, "newfile_popup" );
+ TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT(slotFileNew()), ac, "newfile_popup" );
p->popupMenu()->insertTitle( i18n("New File") );
- (new TDEAction( i18n("Assembly"), "text-x-src", 0, this, TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
- (new TDEAction( i18n("C source"), "text-x-csrc", 0, this, TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
- (new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, this, TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() );
- (new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, this, TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() );
+ (new TDEAction( i18n("Assembly"), "text-x-src", 0, this, TQ_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
+ (new TDEAction( i18n("C source"), "text-x-csrc", 0, this, TQ_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
+ (new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, this, TQ_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() );
+ (new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, this, TQ_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() );
#ifdef MECHANICS
- (new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, this, TQT_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() );
+ (new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, this, TQ_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() );
#endif
- (new TDEAction( "Microbe", "ktechlab_microbe", 0, this, TQT_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() );
+ (new TDEAction( "Microbe", "ktechlab_microbe", 0, this, TQ_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() );
//END New File popup
-// m_recentFiles = KStdAction::openRecent( this, TQT_SLOT(load(const KURL&)), ac );
- m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), this, TQT_SLOT(load(const KURL &)), ac, "file_open_recent" );
- m_statusbarAction = KStdAction::showStatusbar( this, TQT_SLOT(slotOptionsShowStatusbar()), ac );
+// m_recentFiles = KStdAction::openRecent( this, TQ_SLOT(load(const KURL&)), ac );
+ m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), this, TQ_SLOT(load(const KURL &)), ac, "file_open_recent" );
+ m_statusbarAction = KStdAction::showStatusbar( this, TQ_SLOT(slotOptionsShowStatusbar()), ac );
//BEGIN Project Actions
ProjectManager *pm = ProjectManager::self(this);
- new TDEAction( i18n("New Project.."), "window-new", 0, pm, TQT_SLOT(slotNewProject()), ac, "project_new" );
- new TDEAction( i18n("Open Project..."), "project_open", 0, pm, TQT_SLOT(slotOpenProject()), ac, "project_open" );
-// m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
- m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
- new TDEAction( i18n("Export to Makefile..."), "fileexport", 0, pm, TQT_SLOT(slotExportToMakefile()), ac, "project_export_makefile" );
- new TDEAction( i18n("Create Subproject..."), 0, 0, pm, TQT_SLOT(slotCreateSubproject()), ac, "project_create_subproject" );
- new TDEAction( i18n("Add Existing File..."), "document-open", 0, pm, TQT_SLOT(slotAddFile()), ac, "project_add_existing_file" );
- new TDEAction( i18n("Add Current File..."), "fileimport", 0, pm, TQT_SLOT(slotAddCurrentFile()), ac, "project_add_current_file" );
-// new TDEAction( i18n("Project Options"), "configure", 0, pm, TQT_SLOT(slotProjectOptions()), ac, "project_options" );
- new TDEAction( i18n("Close Project"), "window-close", 0, pm, TQT_SLOT(slotCloseProject()), ac, "project_close" );
- new TDEAction( i18n("Remove from Project"), "edit-delete", 0, pm, TQT_SLOT(slotRemoveSelected()), ac, "project_remove_selected" );
- new TDEAction( i18n("Insert Existing File..."), "document-open", 0, pm, TQT_SLOT(slotSubprojectAddExistingFile()), ac, "subproject_add_existing_file" );
- new TDEAction( i18n("Insert Current File..."), "fileimport", 0, pm, TQT_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" );
- new TDEAction( i18n("Linker Options..."), "configure", 0, pm, TQT_SLOT(slotSubprojectLinkerOptions()), ac, "project_item_linker_options" );
- new TDEAction( i18n("Build..."), "launch", 0, pm, TQT_SLOT(slotItemBuild()), ac, "project_item_build" );
- new TDEAction( i18n("Upload..."), "convert_to_pic", 0, pm, TQT_SLOT(slotItemUpload()), ac, "project_item_upload" );
- new TDEAction( i18n("Processing Options..."), "configure", 0, pm, TQT_SLOT(slotItemProcessingOptions()), ac, "project_item_processing_options" );
+ new TDEAction( i18n("New Project.."), "window-new", 0, pm, TQ_SLOT(slotNewProject()), ac, "project_new" );
+ new TDEAction( i18n("Open Project..."), "project_open", 0, pm, TQ_SLOT(slotOpenProject()), ac, "project_open" );
+// m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
+ m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), ProjectManager::self(), TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
+ new TDEAction( i18n("Export to Makefile..."), "fileexport", 0, pm, TQ_SLOT(slotExportToMakefile()), ac, "project_export_makefile" );
+ new TDEAction( i18n("Create Subproject..."), 0, 0, pm, TQ_SLOT(slotCreateSubproject()), ac, "project_create_subproject" );
+ new TDEAction( i18n("Add Existing File..."), "document-open", 0, pm, TQ_SLOT(slotAddFile()), ac, "project_add_existing_file" );
+ new TDEAction( i18n("Add Current File..."), "fileimport", 0, pm, TQ_SLOT(slotAddCurrentFile()), ac, "project_add_current_file" );
+// new TDEAction( i18n("Project Options"), "configure", 0, pm, TQ_SLOT(slotProjectOptions()), ac, "project_options" );
+ new TDEAction( i18n("Close Project"), "window-close", 0, pm, TQ_SLOT(slotCloseProject()), ac, "project_close" );
+ new TDEAction( i18n("Remove from Project"), "edit-delete", 0, pm, TQ_SLOT(slotRemoveSelected()), ac, "project_remove_selected" );
+ new TDEAction( i18n("Insert Existing File..."), "document-open", 0, pm, TQ_SLOT(slotSubprojectAddExistingFile()), ac, "subproject_add_existing_file" );
+ new TDEAction( i18n("Insert Current File..."), "fileimport", 0, pm, TQ_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" );
+ new TDEAction( i18n("Linker Options..."), "configure", 0, pm, TQ_SLOT(slotSubprojectLinkerOptions()), ac, "project_item_linker_options" );
+ new TDEAction( i18n("Build..."), "launch", 0, pm, TQ_SLOT(slotItemBuild()), ac, "project_item_build" );
+ new TDEAction( i18n("Upload..."), "convert_to_pic", 0, pm, TQ_SLOT(slotItemUpload()), ac, "project_item_upload" );
+ new TDEAction( i18n("Processing Options..."), "configure", 0, pm, TQ_SLOT(slotItemProcessingOptions()), ac, "project_item_processing_options" );
//END Project Actions
- new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, this, TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" );
- new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, this, TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" );
+ new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, this, TQ_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" );
+ new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, this, TQ_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" );
TDEToggleAction * ta = new TDEToggleAction( i18n("Run Simulation"), "media-playback-start", TQt::Key_F10, 0, 0, ac, "simulation_run" );
ta->setChecked(true);
- connect( ta, TQT_SIGNAL(toggled(bool )), Simulator::self(), TQT_SLOT(slotSetSimulating(bool )) );
+ connect( ta, TQ_SIGNAL(toggled(bool )), Simulator::self(), TQ_SLOT(slotSetSimulating(bool )) );
#if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
ta->setCheckedState( KGuiItem( i18n("Pause Simulation"), "media-playback-pause", 0 ) );
@@ -563,7 +563,7 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e )
dropMenu.insertSeparator();
dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "process-stop", TDEIcon::Small ), i18n("C&ancel"), 2 );
- connect( &dropMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDragContextActivated(int)) );
+ connect( &dropMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDragContextActivated(int)) );
// dropMenu.exec(e->pos() + widget->pos() );
dropMenu.exec( TQCursor::pos() );
}
@@ -776,7 +776,7 @@ void KTechlab::slotOptionsPreferences()
// User edited the configuration - update your local copies of the
// configuration data
- connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateConfiguration()) );
+ connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotUpdateConfiguration()) );
dialog->show();
}
@@ -834,7 +834,7 @@ void KTechlab::slotTabContext( TQWidget* widget,const TQPoint & pos )
}
}
- connect( tabMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT(slotTabContextActivated(int)) );
+ connect( tabMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT(slotTabContextActivated(int)) );
tabMenu->exec(pos);
delete tabMenu;
diff --git a/src/languages/externallanguage.cpp b/src/languages/externallanguage.cpp
index 553e597..36d1476 100644
--- a/src/languages/externallanguage.cpp
+++ b/src/languages/externallanguage.cpp
@@ -37,7 +37,7 @@ void ExternalLanguage::deleteLanguageProcess()
// I'm not too sure if this combination of killing the process is the best way....
// m_languageProcess->tryTerminate();
-// TQTimer::singleShot( 5000, m_languageProcess, TQT_SLOT( kill() ) );
+// TQTimer::singleShot( 5000, m_languageProcess, TQ_SLOT( kill() ) );
// delete m_languageProcess;
m_languageProcess->kill();
m_languageProcess->deleteLater();
@@ -126,14 +126,14 @@ void ExternalLanguage::resetLanguageProcess()
m_languageProcess = new TDEProcess(this);
- connect( m_languageProcess, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
- this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) );
+ connect( m_languageProcess, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
+ this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) );
- connect( m_languageProcess, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
- this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
+ connect( m_languageProcess, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
+ this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) );
- connect( m_languageProcess, TQT_SIGNAL(processExited( TDEProcess* )),
- this, TQT_SLOT(processExited( TDEProcess* )) );
+ connect( m_languageProcess, TQ_SIGNAL(processExited( TDEProcess* )),
+ this, TQ_SLOT(processExited( TDEProcess* )) );
}
diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp
index 743fa54..16d8358 100644
--- a/src/languages/flowcode.cpp
+++ b/src/languages/flowcode.cpp
@@ -44,8 +44,8 @@ void FlowCode::processInput( ProcessOptions options )
options.p_flowCodeDocument = new FlowCodeDocument( TQString(), 0l );
options.p_flowCodeDocument->openURL( options.inputFiles().first() );
- connect( this, TQT_SIGNAL(processSucceeded( Language *)), options.p_flowCodeDocument, TQT_SLOT(deleteLater()) );
- connect( this, TQT_SIGNAL(processFailed( Language *)), options.p_flowCodeDocument, TQT_SLOT(deleteLater()) );
+ connect( this, TQ_SIGNAL(processSucceeded( Language *)), options.p_flowCodeDocument, TQ_SLOT(deleteLater()) );
+ connect( this, TQ_SIGNAL(processFailed( Language *)), options.p_flowCodeDocument, TQ_SLOT(deleteLater()) );
}
if ( !options.p_flowCodeDocument->microSettings() )
diff --git a/src/languages/language.cpp b/src/languages/language.cpp
index 2395ecb..5fdaa11 100644
--- a/src/languages/language.cpp
+++ b/src/languages/language.cpp
@@ -208,7 +208,7 @@ ProcessOptions::ProcessOptions( OutputMethodInfo info )
void ProcessOptions::setTextOutputTarget( TextDocument * target, TQObject * receiver, const char * slot )
{
m_pTextOutputTarget = target;
- TQObject::connect( m_pHelper, TQT_SIGNAL(textOutputtedTo( TextDocument* )), receiver, slot );
+ TQObject::connect( m_pHelper, TQ_SIGNAL(textOutputtedTo( TextDocument* )), receiver, slot );
}
diff --git a/src/languages/languagemanager.cpp b/src/languages/languagemanager.cpp
index 47bfaa2..a71ca5a 100644
--- a/src/languages/languagemanager.cpp
+++ b/src/languages/languagemanager.cpp
@@ -52,7 +52,7 @@ LanguageManager::LanguageManager( KateMDI::ToolView * parent, KTechlab * ktl )
m_logView = new LogView( parent, "LanguageManager LogView");
TQWhatsThis::add( m_logView, i18n("These messages show the output of language-related functionality such as compiling and assembling.<br><br>For error messages, clicking on the line will automatically open up the file at the position of the error.") );
- connect( m_logView, TQT_SIGNAL(paraClicked(const TQString&, MessageInfo )), this, TQT_SLOT(slotParaClicked(const TQString&, MessageInfo )) );
+ connect( m_logView, TQ_SIGNAL(paraClicked(const TQString&, MessageInfo )), this, TQ_SLOT(slotParaClicked(const TQString&, MessageInfo )) );
reset();
}
diff --git a/src/languages/processchain.cpp b/src/languages/processchain.cpp
index 83757aa..a0d8e40 100644
--- a/src/languages/processchain.cpp
+++ b/src/languages/processchain.cpp
@@ -57,7 +57,7 @@ ProcessChain::ProcessChain( ProcessOptions options, KTechlab * ktechlab, const c
target = options.targetFile();
LanguageManager::self()->logView()->addOutput( i18n("Building: %1").arg( target ), LogView::ot_important );
- TQTimer::singleShot( 0, this, TQT_SLOT(compile()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(compile()) );
}
@@ -267,8 +267,8 @@ a * ProcessChain::b( ) \
if ( !c ) \
{ \
c = new a( this, m_pKTechlab ); \
- connect( c, TQT_SIGNAL(processSucceeded(Language* )), this, TQT_SLOT(slotFinishedCompile(Language* )) ); \
- connect( c, TQT_SIGNAL(processFailed(Language* )), this, TQT_SIGNAL(failed()) ); \
+ connect( c, TQ_SIGNAL(processSucceeded(Language* )), this, TQ_SLOT(slotFinishedCompile(Language* )) ); \
+ connect( c, TQ_SIGNAL(processFailed(Language* )), this, TQ_SIGNAL(failed()) ); \
} \
return c; \
}
@@ -311,8 +311,8 @@ void ProcessListChain::slotProcessChainSuccessful()
ProcessChain * pc = LanguageManager::self()->compile(po);
- connect( pc, TQT_SIGNAL(successful()), this, TQT_SLOT(slotProcessChainSuccessful()) );
- connect( pc, TQT_SIGNAL(failed()), this, TQT_SLOT(slotProcessChainFailed()) );
+ connect( pc, TQ_SIGNAL(successful()), this, TQ_SLOT(slotProcessChainSuccessful()) );
+ connect( pc, TQ_SIGNAL(failed()), this, TQ_SLOT(slotProcessChainFailed()) );
}
diff --git a/src/mechanics/mechanicsdocument.cpp b/src/mechanics/mechanicsdocument.cpp
index 1c197be..b261970 100644
--- a/src/mechanics/mechanicsdocument.cpp
+++ b/src/mechanics/mechanicsdocument.cpp
@@ -146,8 +146,8 @@ void MechanicsDocument::appendDeleteList( TQCanvasItem *qcanvasItem )
m_itemDeleteList.append(mechItem);
m_itemList.remove(mechItem);
- disconnect( mechItem, TQT_SIGNAL(selected(Item*,bool)), this, TQT_SIGNAL(itemSelected(Item*)) );
- disconnect( mechItem, TQT_SIGNAL(unselected(Item*,bool)), this, TQT_SIGNAL(itemUnselected(Item*)) );
+ disconnect( mechItem, TQ_SIGNAL(selected(Item*,bool)), this, TQ_SIGNAL(itemSelected(Item*)) );
+ disconnect( mechItem, TQ_SIGNAL(unselected(Item*,bool)), this, TQ_SIGNAL(itemUnselected(Item*)) );
mechItem->removeItem();
}
diff --git a/src/mechanics/mechanicsitem.cpp b/src/mechanics/mechanicsitem.cpp
index c02cfa4..d41e888 100644
--- a/src/mechanics/mechanicsitem.cpp
+++ b/src/mechanics/mechanicsitem.cpp
@@ -118,13 +118,13 @@ void MechanicsItem::reparented( Item *oldItem, Item *newItem )
if (oldMechItem)
{
m_relativePosition = oldMechItem->absolutePosition() + m_relativePosition;
- disconnect( oldMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) );
+ disconnect( oldMechItem, TQ_SIGNAL(moved()), this, TQ_SLOT(parentMoved()) );
}
if (newMechItem)
{
m_relativePosition = m_relativePosition - newMechItem->absolutePosition();
- connect( newMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) );
+ connect( newMechItem, TQ_SIGNAL(moved()), this, TQ_SLOT(parentMoved()) );
}
updateCanvasPoints();
@@ -137,7 +137,7 @@ void MechanicsItem::childAdded( Item *child )
if (!mechItem)
return;
- connect( mechItem, TQT_SIGNAL(updateMechanicsInfoCombined()), this, TQT_SLOT(childMoved()) );
+ connect( mechItem, TQ_SIGNAL(updateMechanicsInfoCombined()), this, TQ_SLOT(childMoved()) );
updateMechanicsInfoCombined();
}
@@ -148,7 +148,7 @@ void MechanicsItem::childRemoved( Item *child )
if (!mechItem)
return;
- disconnect( mechItem, TQT_SIGNAL(updateMechanicsInfoCombined()), this, TQT_SLOT(childMoved()) );
+ disconnect( mechItem, TQ_SIGNAL(updateMechanicsInfoCombined()), this, TQ_SLOT(childMoved()) );
updateMechanicsInfoCombined();
}
diff --git a/src/mechanics/mechanicssimulation.cpp b/src/mechanics/mechanicssimulation.cpp
index 8ec5e2f..c657c77 100644
--- a/src/mechanics/mechanicssimulation.cpp
+++ b/src/mechanics/mechanicssimulation.cpp
@@ -20,7 +20,7 @@ MechanicsSimulation::MechanicsSimulation( MechanicsDocument *mechanicsDocument )
{
p_mechanicsDocument = mechanicsDocument;
m_advanceTmr = new TQTimer(this);
- connect( m_advanceTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAdvance()) );
+ connect( m_advanceTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAdvance()) );
m_advanceTmr->start(1);
}
diff --git a/src/node.cpp b/src/node.cpp
index 6155c06..d259c08 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -298,8 +298,8 @@ void Node::setParentItem( CNItem *parentItem )
setLevel(p_parentItem->level());
- connect( p_parentItem, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(moveBy(double, double)) );
- connect( p_parentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeNode(Item*)) );
+ connect( p_parentItem, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(moveBy(double, double)) );
+ connect( p_parentItem, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(removeNode(Item*)) );
}
@@ -393,9 +393,9 @@ bool Node::handleNewConnector( Connector * connector )
return false;
}
- connect( this, TQT_SIGNAL(removed(Node*)), connector, TQT_SLOT(removeConnector(Node*)) );
- connect( connector, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(checkForRemoval(Connector*)) );
- connect( connector, TQT_SIGNAL(selected(bool)), this, TQT_SLOT(setNodeSelected(bool)) );
+ connect( this, TQ_SIGNAL(removed(Node*)), connector, TQ_SLOT(removeConnector(Node*)) );
+ connect( connector, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(checkForRemoval(Connector*)) );
+ connect( connector, TQ_SIGNAL(selected(bool)), this, TQ_SLOT(setNodeSelected(bool)) );
if ( !isChildNode() )
p_icnDocument->slotRequestAssignNG();
diff --git a/src/nodegroup.cpp b/src/nodegroup.cpp
index aaea114..3b23e23 100644
--- a/src/nodegroup.cpp
+++ b/src/nodegroup.cpp
@@ -480,7 +480,7 @@ void NodeGroup::clearConList()
if (con)
{
con->setNodeGroup(0l);
- disconnect( con, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(connectorRemoved(Connector*)) );
+ disconnect( con, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(connectorRemoved(Connector*)) );
}
}
m_conList.clear();
@@ -515,7 +515,7 @@ void NodeGroup::init()
m_conList += con;
con->setNodeGroup(this);
}
- connect( con, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(connectorRemoved(Connector*)) );
+ connect( con, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(connectorRemoved(Connector*)) );
}
conEnd = outCon.end();
@@ -527,19 +527,19 @@ void NodeGroup::init()
m_conList += con;
con->setNodeGroup(this);
}
- connect( con, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(connectorRemoved(Connector*)) );
+ connect( con, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(connectorRemoved(Connector*)) );
}
// Connect the node up to us
- connect( *nodeIt, TQT_SIGNAL(removed(Node*)), this, TQT_SLOT(nodeRemoved(Node*)) );
+ connect( *nodeIt, TQ_SIGNAL(removed(Node*)), this, TQ_SLOT(nodeRemoved(Node*)) );
}
// And connect up our external nodes
xnEnd = m_extNodeList.end();
for ( NodeList::iterator it = m_extNodeList.begin(); it != xnEnd; ++it )
{
-// connect( *it, TQT_SIGNAL(moved(Node*)), this, TQT_SLOT(extNodeMoved()) );
- connect( *it, TQT_SIGNAL(removed(Node*)), this, TQT_SLOT(nodeRemoved(Node*)) );
+// connect( *it, TQ_SIGNAL(moved(Node*)), this, TQ_SLOT(extNodeMoved()) );
+ connect( *it, TQ_SIGNAL(removed(Node*)), this, TQ_SLOT(nodeRemoved(Node*)) );
}
}
diff --git a/src/picitem.cpp b/src/picitem.cpp
index a091e93..7c212a8 100644
--- a/src/picitem.cpp
+++ b/src/picitem.cpp
@@ -40,7 +40,7 @@ PinItem::PinItem( FlowCodeDocument* _view, TQPoint position, bool _onLeft, PinSe
view = _view;
onLeft = _onLeft;
- connect( m_pinSettings, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateDrawing()) );
+ connect( m_pinSettings, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateDrawing()) );
if ( TQFontInfo(m_font).pixelSize() > 11 ) // It has to be > 11, not > 12, as (I think) pixelSize() rounds off the actual size
m_font.setPixelSize(12);
@@ -357,8 +357,8 @@ void PicItem::buttonStateChanged( const TQString &id, bool state )
update();
MicroSettingsDlg *dlg = new MicroSettingsDlg( microSettings, 0L, "microSettingsDlg" );
- connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotMicroSettingsDlgAccepted()) );
- connect( dlg, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotMicroSettingsDlgAccepted()) );
+ connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotMicroSettingsDlgAccepted()) );
+ connect( dlg, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotMicroSettingsDlgAccepted()) );
dlg->show();
// At this point the PIC is selected but this does not appear to the
// user so we must deselect it when done.
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 7acfa25..e768720 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -911,7 +911,7 @@ ProjectManager::ProjectManager( KTechlab * ktl, KateMDI::ToolView * parent )
setListCaption( i18n("File") );
setCaption( i18n("Project Manager") );
- connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemClicked(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemClicked(TQListViewItem*)) );
}
diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp
index 8ed5e80..0786c28 100644
--- a/src/recentfilesaction.cpp
+++ b/src/recentfilesaction.cpp
@@ -22,15 +22,15 @@ RecentFilesAction::RecentFilesAction( const TQString & configGroupName, const TQ
m_maxItems = 10;
m_popup = new TDEPopupMenu;
- connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
- connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
- connect( this, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( itemSelected( const TQString& ) ) );
+ connect(m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow()));
+ connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int)));
+ connect( this, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( itemSelected( const TQString& ) ) );
setMenuAccelsEnabled( false );
if ( receiver )
- connect( this, TQT_SIGNAL(urlSelected(const KURL &)), receiver, slot );
+ connect( this, TQ_SIGNAL(urlSelected(const KURL &)), receiver, slot );
}
diff --git a/src/resizeoverlay.cpp b/src/resizeoverlay.cpp
index 3082057..b2b19ef 100644
--- a/src/resizeoverlay.cpp
+++ b/src/resizeoverlay.cpp
@@ -69,7 +69,7 @@ ResizeHandle *ResizeOverlay::createResizeHandle( int id, ResizeHandle::DrawType
ResizeHandle *newResizeHandle = new ResizeHandle( this, id, drawType, xsnap, ysnap );
m_resizeHandleMap[id] = newResizeHandle;
- connect( newResizeHandle, TQT_SIGNAL(rhMovedBy(int, double, double )), this, TQT_SLOT(slotResizeHandleMoved(int, double, double )) );
+ connect( newResizeHandle, TQ_SIGNAL(rhMovedBy(int, double, double )), this, TQ_SLOT(slotResizeHandleMoved(int, double, double )) );
return newResizeHandle;
}
@@ -81,7 +81,7 @@ void ResizeOverlay::removeResizeHandle( int id )
return;
ResizeHandle *rh = it.data();
- disconnect( rh, TQT_SIGNAL(rhMovedBy(int, double, double )), this, TQT_SLOT(slotResizeHandleMoved(int, double, double )) );
+ disconnect( rh, TQ_SIGNAL(rhMovedBy(int, double, double )), this, TQ_SLOT(slotResizeHandleMoved(int, double, double )) );
delete rh;
m_resizeHandleMap.erase(it);
}
@@ -122,15 +122,15 @@ void ResizeOverlay::syncX( ResizeHandle *rh1, ResizeHandle *rh2 )
{
if ( !rh1 || !rh2 )
return;
- connect( rh1, TQT_SIGNAL(rhMovedByX(double )), rh2, TQT_SLOT(slotMoveByX(double )) );
- connect( rh2, TQT_SIGNAL(rhMovedByX(double )), rh1, TQT_SLOT(slotMoveByX(double )) );
+ connect( rh1, TQ_SIGNAL(rhMovedByX(double )), rh2, TQ_SLOT(slotMoveByX(double )) );
+ connect( rh2, TQ_SIGNAL(rhMovedByX(double )), rh1, TQ_SLOT(slotMoveByX(double )) );
}
void ResizeOverlay::syncY( ResizeHandle *rh1, ResizeHandle *rh2 )
{
if ( !rh1 || !rh2 )
return;
- connect( rh1, TQT_SIGNAL(rhMovedByY(double )), rh2, TQT_SLOT(slotMoveByY(double )) );
- connect( rh2, TQT_SIGNAL(rhMovedByY(double )), rh1, TQT_SLOT(slotMoveByY(double )) );
+ connect( rh1, TQ_SIGNAL(rhMovedByY(double )), rh2, TQ_SLOT(slotMoveByY(double )) );
+ connect( rh2, TQ_SIGNAL(rhMovedByY(double )), rh1, TQ_SLOT(slotMoveByY(double )) );
}
//END class ResizeOverlay
@@ -141,8 +141,8 @@ MechanicsItemOverlay::MechanicsItemOverlay( MechanicsItem *parent )
: ResizeOverlay(parent)
{
p_mechanicsItem = parent;
- connect( parent, TQT_SIGNAL(moved()), this, TQT_SLOT(slotUpdateResizeHandles()) );
- connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) );
+ connect( parent, TQ_SIGNAL(moved()), this, TQ_SLOT(slotUpdateResizeHandles()) );
+ connect( parent, TQ_SIGNAL(resized()), this, TQ_SLOT(slotUpdateResizeHandles()) );
m_tl = createResizeHandle( ResizeHandle::rhp_topLeft, ResizeHandle::dt_resize_backwardsDiagonal );
m_tm = createResizeHandle( ResizeHandle::rhp_topMiddle, ResizeHandle::dt_resize_vertical );
@@ -232,8 +232,8 @@ void MechanicsItemOverlay::slotResizeHandleMoved( int id, double dx, double dy )
RectangularOverlay::RectangularOverlay( Item *parent, int xsnap, int ysnap )
: ResizeOverlay(parent)
{
- connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) );
- connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) );
+ connect( parent, TQ_SIGNAL(resized()), this, TQ_SLOT(slotUpdateResizeHandles()) );
+ connect( parent, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(slotMoveAllResizeHandles(double, double )) );
m_tl = createResizeHandle( ResizeHandle::rhp_topLeft, ResizeHandle::dt_resize_backwardsDiagonal, xsnap, ysnap );
m_tm = createResizeHandle( ResizeHandle::rhp_topMiddle, ResizeHandle::dt_resize_vertical, xsnap, ysnap );
@@ -359,8 +359,8 @@ TQRect RectangularOverlay::getSizeRect( bool *ok, bool *widthOk, bool *heightOk
LineOverlay::LineOverlay( Item * parent )
: ResizeOverlay(parent)
{
- connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) );
- connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) );
+ connect( parent, TQ_SIGNAL(resized()), this, TQ_SLOT(slotUpdateResizeHandles()) );
+ connect( parent, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(slotMoveAllResizeHandles(double, double )) );
m_pStart = createResizeHandle( ResizeHandle::rhp_start, ResizeHandle::dt_point_rect );
m_pEnd = createResizeHandle( ResizeHandle::rhp_end, ResizeHandle::dt_point_rect );
diff --git a/src/simulator.cpp b/src/simulator.cpp
index fda2e3c..48c6681 100644
--- a/src/simulator.cpp
+++ b/src/simulator.cpp
@@ -57,7 +57,7 @@ Simulator::Simulator()
m_pChangedCircuitLast = m_pChangedCircuitStart;
TQTimer * stepTimer = new TQTimer(this);
- connect( stepTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(step()) );
+ connect( stepTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(step()) );
stepTimer->start(1);
}
diff --git a/src/textdocument.cpp b/src/textdocument.cpp
index 8f656b6..80381a4 100644
--- a/src/textdocument.cpp
+++ b/src/textdocument.cpp
@@ -73,11 +73,11 @@ TextDocument::TextDocument( const TQString &caption, KTechlab *ktechlab, const c
guessScheme();
- connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SIGNAL(undoRedoStateChanged()) );
- connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotSyncModifiedStates()) );
- connect( m_doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotSyncModifiedStates()) );
- connect( m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(slotUpdateMarksInfo()) );
- connect( m_doc, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionmChanged()) );
+ connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SIGNAL(undoRedoStateChanged()) );
+ connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotSyncModifiedStates()) );
+ connect( m_doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotSyncModifiedStates()) );
+ connect( m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(slotUpdateMarksInfo()) );
+ connect( m_doc, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionmChanged()) );
m_doc->setDescription((KTextEditor::MarkInterface::MarkTypes)Breakpoint, i18n("Breakpoint"));
m_doc->setPixmap((KTextEditor::MarkInterface::MarkTypes)Breakpoint, *inactiveBreakpointPixmap());
@@ -170,9 +170,9 @@ void TextDocument::setText( const TQString & text, bool asInitial )
{
if ( asInitial )
{
- disconnect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SIGNAL(undoRedoStateChanged()) );
- disconnect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotSyncModifiedStates()) );
- disconnect( m_doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotSyncModifiedStates()) );
+ disconnect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SIGNAL(undoRedoStateChanged()) );
+ disconnect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotSyncModifiedStates()) );
+ disconnect( m_doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotSyncModifiedStates()) );
}
const ViewList::iterator end = m_viewList.end();
@@ -190,9 +190,9 @@ void TextDocument::setText( const TQString & text, bool asInitial )
m_doc->clearRedo();
setModified(false);
- connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SIGNAL(undoRedoStateChanged()) );
- connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotSyncModifiedStates()) );
- connect( m_doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotSyncModifiedStates()) );
+ connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SIGNAL(undoRedoStateChanged()) );
+ connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotSyncModifiedStates()) );
+ connect( m_doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotSyncModifiedStates()) );
}
}
@@ -447,7 +447,7 @@ void TextDocument::convertToAssembly()
return;
ProcessOptions o( dlg.info() );
- o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) );
+ o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) );
o.setInputFiles(filePath);
o.setProcessPath( ProcessOptions::ProcessPath::path( ProcessOptions::guessMediaType(filePath), toType ) );
LanguageManager::self()->compile(o);
@@ -489,7 +489,7 @@ void TextDocument::convertToHex()
return;
ProcessOptions o( dlg.info() );
- o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) );
+ o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) );
o.setInputFiles(filePath);
o.setProcessPath( ProcessOptions::ProcessPath::path( ProcessOptions::guessMediaType(filePath), ProcessOptions::ProcessPath::Program ) );
LanguageManager::self()->compile(o);
@@ -604,7 +604,7 @@ void TextDocument::slotUpdateMarksInfo()
if ( mark->type & Bookmark )
{
TDEAction * a = new TDEAction( i18n("%1 - %2").arg( TQString::number( mark->line+1 ) ).arg( m_doc->textLine(mark->line) ),
- 0, this, TQT_SLOT(slotBookmarkRequested()), this,
+ 0, this, TQ_SLOT(slotBookmarkRequested()), this,
TQString("bookmark_%1").arg(TQString::number(mark->line)).latin1() );
m_bookmarkActions.append(a);
}
@@ -752,7 +752,7 @@ void TextDocument::debugRun()
break;
}
- m_symbolFile = GpsimProcessor::generateSymbolFile( m_debugFile, this, TQT_SLOT(slotCODCreationSucceeded()), TQT_SLOT(slotCODCreationFailed()) );
+ m_symbolFile = GpsimProcessor::generateSymbolFile( m_debugFile, this, TQ_SLOT(slotCODCreationSucceeded()), TQ_SLOT(slotCODCreationFailed()) );
#endif // !NO_GPSIM
}
@@ -973,9 +973,9 @@ void TextDocument::setDebugger( GpsimDebugger * debugger, bool ownDebugger )
if ( m_debugFile.isEmpty() )
m_debugFile = url().path();
- connect( m_pDebugger, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDebuggerDestroyed()) );
- connect( m_pDebugger->gpsim(), TQT_SIGNAL(runningStatusChanged(bool )), this, TQT_SLOT(slotInitDebugActions()) );
- connect( m_pDebugger, TQT_SIGNAL(lineReached(const SourceLine &)), this, TQT_SLOT(slotDebugSetCurrentLine(const SourceLine &)) );
+ connect( m_pDebugger, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDebuggerDestroyed()) );
+ connect( m_pDebugger->gpsim(), TQ_SIGNAL(runningStatusChanged(bool )), this, TQ_SLOT(slotInitDebugActions()) );
+ connect( m_pDebugger, TQ_SIGNAL(lineReached(const SourceLine &)), this, TQ_SLOT(slotDebugSetCurrentLine(const SourceLine &)) );
m_pDebugger->setBreakpoints( m_debugFile, breakpointList() );
slotInitDebugActions();
diff --git a/src/textview.cpp b/src/textview.cpp
index 19049c8..2936d12 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -63,24 +63,24 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", TDEIcon::Small ), i18n("Assembly"), TextDocument::AssemblyOutput );
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", TDEIcon::Small ), i18n("Hex"), TextDocument::HexOutput );
m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", TDEIcon::Small ), i18n("PIC (upload)"), TextDocument::PICOutput );
- connect( m, TQT_SIGNAL(activated(int)), textDocument, TQT_SLOT(slotConvertTo(int)) );
+ connect( m, TQ_SIGNAL(activated(int)), textDocument, TQ_SLOT(slotConvertTo(int)) );
m->setItemEnabled( TextDocument::MicrobeOutput, false );
//END Convert To * Actions
- new TDEAction( i18n("Format Assembly Code"), "", TQt::Key_F12, textDocument, TQT_SLOT(formatAssembly()), ac, "format_asm" );
+ new TDEAction( i18n("Format Assembly Code"), "", TQt::Key_F12, textDocument, TQ_SLOT(formatAssembly()), ac, "format_asm" );
#ifndef NO_GPSIM
//BEGIN Debug Actions
- new TDEAction( i18n("Set &Breakpoint"), 0, 0, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
- new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQT_SLOT(debugRun()), ac, "debug_run" );
- new TDEAction( i18n("Interrupt"), "media-playback-pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" );
- new TDEAction( i18n("Stop"), "process-stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" );
- new TDEAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQT_SLOT(debugStep()), ac, "debug_step" );
- new TDEAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQT_SLOT(debugStepOver()), ac, "debug_step_over" );
- new TDEAction( i18n("Step Out"), "dbgstepout", 0, textDocument, TQT_SLOT(debugStepOut()), ac, "debug_step_out" );
+ new TDEAction( i18n("Set &Breakpoint"), 0, 0, this, TQ_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
+ new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQ_SLOT(debugRun()), ac, "debug_run" );
+ new TDEAction( i18n("Interrupt"), "media-playback-pause", 0, textDocument, TQ_SLOT(debugInterrupt()), ac, "debug_interrupt" );
+ new TDEAction( i18n("Stop"), "process-stop", 0, textDocument, TQ_SLOT(debugStop()), ac, "debug_stop" );
+ new TDEAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQ_SLOT(debugStep()), ac, "debug_step" );
+ new TDEAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQ_SLOT(debugStepOver()), ac, "debug_step_over" );
+ new TDEAction( i18n("Step Out"), "dbgstepout", 0, textDocument, TQ_SLOT(debugStepOut()), ac, "debug_step_out" );
//END Debug Actions
#endif
@@ -98,8 +98,8 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
m_view->installPopup( static_cast<TQPopupMenu*>( p_ktechlab->factory()->container( "tdetexteditor_popup", p_ktechlab ) ) );
- connect( m_view, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorPositionChanged()) );
- connect( m_view, TQT_SIGNAL(gotFocus(Kate::View*)), this, TQT_SLOT(setFocused()) );
+ connect( m_view, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotCursorPositionChanged()) );
+ connect( m_view, TQ_SIGNAL(gotFocus(Kate::View*)), this, TQ_SLOT(setFocused()) );
m_layout->insertWidget( 0, m_view );
@@ -112,8 +112,8 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
m_pTextViewLabel->hide();
TextViewEventFilter * eventFilter = new TextViewEventFilter( this );
- connect( eventFilter, TQT_SIGNAL(wordHoveredOver( const TQString&, int, int )), this, TQT_SLOT(slotWordHoveredOver( const TQString&, int, int )) );
- connect( eventFilter, TQT_SIGNAL(wordUnhovered()), this, TQT_SLOT(slotWordUnhovered()) );
+ connect( eventFilter, TQ_SIGNAL(wordHoveredOver( const TQString&, int, int )), this, TQ_SLOT(slotWordHoveredOver( const TQString&, int, int )) );
+ connect( eventFilter, TQ_SIGNAL(wordUnhovered()), this, TQ_SLOT(slotWordUnhovered()) );
TQObject * internalView = m_view->child( 0, "KateViewInternal" );
internalView->installEventFilter( eventFilter );
@@ -377,16 +377,16 @@ TextViewEventFilter::TextViewEventFilter( TextView * textView )
m_lastLine = m_lastCol = -1;
((KTextEditor::TextHintInterface*)textView->kateView()->tqt_cast("KTextEditor::TextHintInterface"))->enableTextHints(0);
- connect( textView->kateView(), TQT_SIGNAL(needTextHint(int, int, TQString &)), this, TQT_SLOT(slotNeedTextHint( int, int, TQString& )) );
+ connect( textView->kateView(), TQ_SIGNAL(needTextHint(int, int, TQString &)), this, TQ_SLOT(slotNeedTextHint( int, int, TQString& )) );
m_pHoverTimer = new TQTimer( this );
- connect( m_pHoverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hoverTimeout()) );
+ connect( m_pHoverTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hoverTimeout()) );
m_pSleepTimer = new TQTimer( this );
- connect( m_pSleepTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(gotoSleep()) );
+ connect( m_pSleepTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(gotoSleep()) );
m_pNoWordTimer = new TQTimer( this );
- connect( m_pNoWordTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoWordTimeout()) );
+ connect( m_pNoWordTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNoWordTimeout()) );
}
diff --git a/src/variablelabel.cpp b/src/variablelabel.cpp
index ee7686e..6277b5b 100644
--- a/src/variablelabel.cpp
+++ b/src/variablelabel.cpp
@@ -47,8 +47,8 @@ void VariableLabel::setRegister( RegisterInfo * info, const TQString & name )
m_pRegisterInfo = info;
m_registerName = name;
- connect( m_pRegisterInfo, TQT_SIGNAL(destroyed()), this, TQT_SLOT(hide()) );
- connect( m_pRegisterInfo, TQT_SIGNAL(valueChanged(unsigned)), this, TQT_SLOT(updateText()) );
+ connect( m_pRegisterInfo, TQ_SIGNAL(destroyed()), this, TQ_SLOT(hide()) );
+ connect( m_pRegisterInfo, TQ_SIGNAL(valueChanged(unsigned)), this, TQ_SLOT(updateText()) );
updateText();
}
@@ -59,8 +59,8 @@ void VariableLabel::disconnectRegisterInfo()
if ( !m_pRegisterInfo )
return;
- disconnect( m_pRegisterInfo, TQT_SIGNAL(destroyed()), this, TQT_SLOT(hide()) );
- disconnect( m_pRegisterInfo, TQT_SIGNAL(valueChanged(unsigned)), this, TQT_SLOT(updateText()) );
+ disconnect( m_pRegisterInfo, TQ_SIGNAL(destroyed()), this, TQ_SLOT(hide()) );
+ disconnect( m_pRegisterInfo, TQ_SIGNAL(valueChanged(unsigned)), this, TQ_SLOT(updateText()) );
m_pRegisterInfo = 0l;
m_registerName = TQString();
diff --git a/src/view.cpp b/src/view.cpp
index 52d2417..31a5758 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -89,7 +89,7 @@ View::View( Document *document, ViewContainer *viewContainer, uint viewAreaId, c
m_layout->addWidget( new KVSSBSep(this) );
m_layout->addWidget( m_statusBar );
- connect( p_ktechlab, TQT_SIGNAL(configurationChanged()), this, TQT_SLOT(slotUpdateConfiguration()) );
+ connect( p_ktechlab, TQ_SIGNAL(configurationChanged()), this, TQ_SLOT(slotUpdateConfiguration()) );
}
}
@@ -186,11 +186,11 @@ ViewStatusBar::ViewStatusBar( View *view )
m_modifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::Small );
m_unmodifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "null", TDEIcon::Small );
- connect( view->document(), TQT_SIGNAL(modifiedStateChanged()), this, TQT_SLOT(slotModifiedStateChanged()) );
- connect( view->document(), TQT_SIGNAL(fileNameChanged(const KURL& )), this, TQT_SLOT(slotFileNameChanged(const KURL& )) );
+ connect( view->document(), TQ_SIGNAL(modifiedStateChanged()), this, TQ_SLOT(slotModifiedStateChanged()) );
+ connect( view->document(), TQ_SIGNAL(fileNameChanged(const KURL& )), this, TQ_SLOT(slotFileNameChanged(const KURL& )) );
- connect( view, TQT_SIGNAL(viewFocused(View* )), this, TQT_SLOT(slotViewFocused(View* )) );
- connect( view, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(slotViewUnfocused()) );
+ connect( view, TQ_SIGNAL(viewFocused(View* )), this, TQ_SLOT(slotViewFocused(View* )) );
+ connect( view, TQ_SIGNAL(viewUnfocused()), this, TQ_SLOT(slotViewUnfocused()) );
slotModifiedStateChanged();
slotFileNameChanged( view->document()->url() );
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 2a7492f..a87a233 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -27,11 +27,11 @@ ViewContainer::ViewContainer( const TQString & caption, KTechlab * ktechlab, TQW
b_deleted = false;
p_ktechlab = ktechlab;
if (ktechlab)
- connect( ktechlab, TQT_SIGNAL(needUpdateCaptions()), this, TQT_SLOT(updateCaption()) );
+ connect( ktechlab, TQ_SIGNAL(needUpdateCaptions()), this, TQ_SLOT(updateCaption()) );
TQHBoxLayout *layout = new TQHBoxLayout(this);
m_baseViewArea = new ViewArea( this, this, 0, "viewarea_0" );
- connect( m_baseViewArea, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(baseViewAreaDestroyed(TQObject* )) );
+ connect( m_baseViewArea, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(baseViewAreaDestroyed(TQObject* )) );
layout->addWidget(m_baseViewArea);
@@ -415,8 +415,8 @@ ViewArea *ViewArea::createViewArea( Position position, uint id )
p_viewArea1 = new ViewArea(this, p_viewContainer, m_id, TQString("viewarea_%1").arg(TQString::number(m_id)).latin1());
p_viewArea2 = new ViewArea(this, p_viewContainer, id, TQString("viewarea_%1").arg(TQString::number(id)).latin1());
- connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
- connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
+ connect( p_viewArea1, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) );
+ connect( p_viewArea2, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) );
p_view->reparent( p_viewArea1, TQPoint(), true );
p_viewArea1->setView(p_view);
@@ -459,7 +459,7 @@ void ViewArea::setView( View *view )
return;
}
p_view = view;
- connect( view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(viewDestroyed()) );
+ connect( view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(viewDestroyed()) );
}
@@ -560,7 +560,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam
{
int viewArea1Id = contains[0];
p_viewArea1 = new ViewArea(this, p_viewContainer, viewArea1Id, TQString("viewarea_%1").arg(TQString::number(viewArea1Id)).latin1());
- connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
+ connect( p_viewArea1, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) );
p_viewArea1->restoreState( config, viewArea1Id, groupName );
p_viewArea1->show();
}
@@ -569,7 +569,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam
{
int viewArea2Id = contains[1];
p_viewArea2 = new ViewArea(this, p_viewContainer, viewArea2Id, TQString("viewarea_%1").arg(TQString::number(viewArea2Id)).latin1());
- connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
+ connect( p_viewArea2, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) );
p_viewArea2->restoreState( config, viewArea2Id, groupName );
p_viewArea2->show();
}