summaryrefslogtreecommitdiffstats
path: root/kivio/kiviopart
diff options
context:
space:
mode:
Diffstat (limited to 'kivio/kiviopart')
-rw-r--r--kivio/kiviopart/kivio_canvas.cpp6
-rw-r--r--kivio/kiviopart/kivio_dlg_pageshow.cpp2
-rw-r--r--kivio/kiviopart/kivio_doc.cpp6
-rw-r--r--kivio/kiviopart/kivio_icon_view.cpp4
-rw-r--r--kivio/kiviopart/kivio_stackbar.cpp12
-rw-r--r--kivio/kiviopart/kivio_stencil_geometry_panel.cpp10
-rw-r--r--kivio/kiviopart/kivio_view.cpp212
-rw-r--r--kivio/kiviopart/kivioarrowheadaction.cpp18
-rw-r--r--kivio/kiviopart/kiviostencilsetaction.cpp18
-rw-r--r--kivio/kiviopart/kiviostencilsetinstaller.cpp2
-rw-r--r--kivio/kiviopart/stencilbardockmanager.cpp18
-rw-r--r--kivio/kiviopart/tools/kivio_mousetool.cpp2
-rw-r--r--kivio/kiviopart/tools/mousetoolaction.cpp2
-rw-r--r--kivio/kiviopart/tools/mousetoolaction.h12
-rw-r--r--kivio/kiviopart/ui/addstencilsetdialog.cpp2
-rw-r--r--kivio/kiviopart/ui/kivio_birdeye_panel.cpp12
-rw-r--r--kivio/kiviopart/ui/kivio_layer_panel.cpp10
-rw-r--r--kivio/kiviopart/ui/kivio_protection_panel.cpp36
-rw-r--r--kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp4
-rw-r--r--kivio/kiviopart/ui/kiviooptionsdialog.cpp10
-rw-r--r--kivio/kiviopart/ui/kiviotextformatdlg.cpp4
-rw-r--r--kivio/kiviopart/ui/objectlistpalette.cpp2
22 files changed, 202 insertions, 202 deletions
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index 89695d241..25da24ed6 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -79,8 +79,8 @@ KivioCanvas::KivioCanvas( TQWidget *par, KivioView* view, KivioDoc* doc, TQScrol
m_pVertScrollBar->setPageStep(10);
m_pHorzScrollBar->setPageStep(10);
- connect(m_pVertScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollV(int)));
- connect( m_pHorzScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollH(int)));
+ connect(m_pVertScrollBar, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrollV(int)));
+ connect( m_pHorzScrollBar, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrollH(int)));
m_iXOffset = 0;
m_iYOffset = 0;
@@ -100,7 +100,7 @@ KivioCanvas::KivioCanvas( TQWidget *par, KivioView* view, KivioDoc* doc, TQScrol
unclippedPainter = 0L;
m_borderTimer = new TQTimer(this);
- connect(m_borderTimer,TQT_SIGNAL(timeout()),TQT_SLOT(borderTimerTimeout()));
+ connect(m_borderTimer,TQ_SIGNAL(timeout()),TQ_SLOT(borderTimerTimeout()));
}
KivioCanvas::~KivioCanvas()
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp
index f8cae8bd1..49a26564e 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.cpp
+++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp
@@ -54,7 +54,7 @@ KivioPageShow::KivioPageShow( KivioView* parent, const char* name )
TQStringList tabsList = m_pView->doc()->map()->hiddenPages();
list->insertStringList(tabsList);
- connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQT_SLOT(slotDoubleClicked(TQListBoxItem *)));
+ connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQ_SLOT(slotDoubleClicked(TQListBoxItem *)));
resize( 200, 150 );
}
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index c7196c1d8..16c02a8e6 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -146,8 +146,8 @@ KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* pa
//laurent: Why don't use menu history for undo/redo command ? sync with other koffice application
m_commandHistory = new KoCommandHistory( actionCollection(), /*false*/true ) ;
- connect( m_commandHistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) );
- connect( m_commandHistory, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) );
+ connect( m_commandHistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( slotDocumentRestored() ) );
+ connect( m_commandHistory, TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( slotCommandExecuted() ) );
if ( name )
@@ -770,7 +770,7 @@ void KivioDoc::addSpawnerSet( const TQString &dirName )
if(!m_loadTimer) {
m_loadTimer = new TQTimer(this);
- connect(m_loadTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadStencil()));
+ connect(m_loadTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(loadStencil()));
}
if(!m_loadTimer->isActive()) {
diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp
index 41cabd59e..6e8e6b213 100644
--- a/kivio/kiviopart/kivio_icon_view.cpp
+++ b/kivio/kiviopart/kivio_icon_view.cpp
@@ -108,8 +108,8 @@ KivioIconView::KivioIconView( bool _readWrite,TQWidget *parent, const char *name
setAcceptDrops(false);
viewport()->setAcceptDrops(false);
if(isReadWrite) {
- connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(slotDoubleClicked(TQIconViewItem*)));
- connect(this, TQT_SIGNAL(clicked(TQIconViewItem*)), this, TQT_SLOT(slotClicked(TQIconViewItem*)));
+ connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQ_SLOT(slotDoubleClicked(TQIconViewItem*)));
+ connect(this, TQ_SIGNAL(clicked(TQIconViewItem*)), this, TQ_SLOT(slotClicked(TQIconViewItem*)));
}
}
diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp
index 32d56ce74..8605acd7f 100644
--- a/kivio/kiviopart/kivio_stackbar.cpp
+++ b/kivio/kiviopart/kivio_stackbar.cpp
@@ -35,7 +35,7 @@ KivioStackBar::KivioStackBar(KivioView* view, TQWidget* parent, const char* name
setNewLine(true);
m_visiblePage = 0;
- connect(this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), this, TQT_SLOT(newPlace(TQDockWindow::Place)));
+ connect(this, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), this, TQ_SLOT(newPlace(TQDockWindow::Place)));
}
KivioStackBar::~KivioStackBar()
@@ -57,11 +57,11 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title )
DragBarButton* b = new DragBarButton( title, this );
b->setOrientation(orientation());
- connect( b, TQT_SIGNAL(clicked()), TQT_SLOT(showButtonPage()) );
- connect( b, TQT_SIGNAL(beginDrag()), TQT_SLOT(buttonBeginDrag()) );
- connect( b, TQT_SIGNAL(finishDrag()), TQT_SLOT(buttonFinishDrag()) );
- connect( b, TQT_SIGNAL(closeRequired(DragBarButton*)), TQT_SLOT(slotDeleteButton(DragBarButton*)) );
- connect(this, TQT_SIGNAL(orientationChanged(TQt::Orientation)), b, TQT_SLOT(setOrientation(TQt::Orientation)));
+ connect( b, TQ_SIGNAL(clicked()), TQ_SLOT(showButtonPage()) );
+ connect( b, TQ_SIGNAL(beginDrag()), TQ_SLOT(buttonBeginDrag()) );
+ connect( b, TQ_SIGNAL(finishDrag()), TQ_SLOT(buttonFinishDrag()) );
+ connect( b, TQ_SIGNAL(closeRequired(DragBarButton*)), TQ_SLOT(slotDeleteButton(DragBarButton*)) );
+ connect(this, TQ_SIGNAL(orientationChanged(TQt::Orientation)), b, TQ_SLOT(setOrientation(TQt::Orientation)));
boxLayout()->addWidget(b);
boxLayout()->addWidget(w, 1);
diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
index 82064c492..7465f9f7f 100644
--- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
+++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
@@ -29,11 +29,11 @@ KivioStencilGeometryPanel::KivioStencilGeometryPanel(TQWidget* parent)
// m_rotationSBox = new KIntSpinBox(-360, 360, 1, 0, 10, this);
// m_rotationSBox->hide();
- connect(m_pX, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(xChange(double)));
- connect(m_pY, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(yChange(double)));
- connect(m_pW, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(wChange(double)));
- connect(m_pH, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(hChange(double)));
-// connect(m_rotationSBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(rotationChange(int)));
+ connect(m_pX, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(xChange(double)));
+ connect(m_pY, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(yChange(double)));
+ connect(m_pW, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(wChange(double)));
+ connect(m_pH, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(hChange(double)));
+// connect(m_rotationSBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(rotationChange(int)));
grid->addWidget(lx, 0, 0);
grid->addWidget(m_pX, 1, 0);
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index a64bb9ce7..2c72e77d4 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -172,9 +172,9 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
// Handle progress information from the doc
m_statusBarProgress = 0;
- connect(m_pDoc, TQT_SIGNAL(initProgress()), this, TQT_SLOT(initStatusBarProgress()));
- connect(m_pDoc, TQT_SIGNAL(progress(int)), this, TQT_SLOT(setStatusBarProgress(int)));
- connect(m_pDoc, TQT_SIGNAL(endProgress()), this, TQT_SLOT(removeStatusBarProgress()));
+ connect(m_pDoc, TQ_SIGNAL(initProgress()), this, TQ_SLOT(initStatusBarProgress()));
+ connect(m_pDoc, TQ_SIGNAL(progress(int)), this, TQ_SLOT(setStatusBarProgress(int)));
+ connect(m_pDoc, TQ_SIGNAL(endProgress()), this, TQ_SLOT(removeStatusBarProgress()));
bool isModified = doc->isModified();
m_pStencilBarDockManager = new StencilBarDockManager(this);
@@ -192,12 +192,12 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
// Tab Bar
m_pTabBar = new KoTabBar(tabSplit);
connect( m_pTabBar,
- TQT_SIGNAL(tabChanged(const TQString&)),
- TQT_SLOT( changePage(const TQString&)));
- connect( m_pTabBar, TQT_SIGNAL( doubleClicked() ), TQT_SLOT( renamePage() ) );
- connect( m_pTabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ),
- TQT_SLOT( popupTabBarMenu( const TQPoint& ) ) );
- connect(m_pTabBar, TQT_SIGNAL(tabMoved(unsigned, unsigned)), this, TQT_SLOT(moveTab(unsigned, unsigned)));
+ TQ_SIGNAL(tabChanged(const TQString&)),
+ TQ_SLOT( changePage(const TQString&)));
+ connect( m_pTabBar, TQ_SIGNAL( doubleClicked() ), TQ_SLOT( renamePage() ) );
+ connect( m_pTabBar, TQ_SIGNAL( contextMenu( const TQPoint& ) ),
+ TQ_SLOT( popupTabBarMenu( const TQPoint& ) ) );
+ connect(m_pTabBar, TQ_SIGNAL(tabMoved(unsigned, unsigned)), this, TQ_SLOT(moveTab(unsigned, unsigned)));
m_pTabBar->setReverseLayout( TQApplication::reverseLayout() );
// Scroll Bar
@@ -226,24 +226,24 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
KoRuler::F_HELPLINES, m_pDoc->unit());
hRuler->showMousePos(true);
hRuler->setZoom(zoomHandler()->zoomedResolutionX());
- connect(m_vertScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setRulerVOffset(int)));
- connect(m_horzScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setRulerHOffset(int)));
- connect(vRuler, TQT_SIGNAL(unitChanged(KoUnit::Unit)), TQT_SLOT(rulerChangedUnit(KoUnit::Unit)));
- connect(hRuler, TQT_SIGNAL(unitChanged(KoUnit::Unit)), TQT_SLOT(rulerChangedUnit(KoUnit::Unit)));
- connect(vRuler, TQT_SIGNAL(doubleClicked()), TQT_SLOT(paperLayoutDlg()));
- connect(hRuler, TQT_SIGNAL(doubleClicked()), TQT_SLOT(paperLayoutDlg()));
- connect(m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), TQT_SLOT(setRulerUnit(KoUnit::Unit)));
- connect(m_pCanvas, TQT_SIGNAL(visibleAreaChanged()), TQT_SLOT(updateRulers()));
-
- connect(vRuler, TQT_SIGNAL(addGuide(const TQPoint&, bool, int)),
- &(m_pCanvas->guideLines()), TQT_SLOT(addGuide(const TQPoint&, bool, int)));
- connect(vRuler, TQT_SIGNAL(moveGuide(const TQPoint&, bool, int)),
- &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int)));
- connect(hRuler, TQT_SIGNAL(addGuide(const TQPoint&, bool, int)),
- &(m_pCanvas->guideLines()), TQT_SLOT(addGuide(const TQPoint&, bool, int)));
- connect(hRuler, TQT_SIGNAL(moveGuide(const TQPoint&, bool, int)),
- &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int)));
- connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*)));
+ connect(m_vertScrollBar, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setRulerVOffset(int)));
+ connect(m_horzScrollBar, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setRulerHOffset(int)));
+ connect(vRuler, TQ_SIGNAL(unitChanged(KoUnit::Unit)), TQ_SLOT(rulerChangedUnit(KoUnit::Unit)));
+ connect(hRuler, TQ_SIGNAL(unitChanged(KoUnit::Unit)), TQ_SLOT(rulerChangedUnit(KoUnit::Unit)));
+ connect(vRuler, TQ_SIGNAL(doubleClicked()), TQ_SLOT(paperLayoutDlg()));
+ connect(hRuler, TQ_SIGNAL(doubleClicked()), TQ_SLOT(paperLayoutDlg()));
+ connect(m_pDoc, TQ_SIGNAL(unitChanged(KoUnit::Unit)), TQ_SLOT(setRulerUnit(KoUnit::Unit)));
+ connect(m_pCanvas, TQ_SIGNAL(visibleAreaChanged()), TQ_SLOT(updateRulers()));
+
+ connect(vRuler, TQ_SIGNAL(addGuide(const TQPoint&, bool, int)),
+ &(m_pCanvas->guideLines()), TQ_SLOT(addGuide(const TQPoint&, bool, int)));
+ connect(vRuler, TQ_SIGNAL(moveGuide(const TQPoint&, bool, int)),
+ &(m_pCanvas->guideLines()), TQ_SLOT(moveGuide(const TQPoint&, bool, int)));
+ connect(hRuler, TQ_SIGNAL(addGuide(const TQPoint&, bool, int)),
+ &(m_pCanvas->guideLines()), TQ_SLOT(addGuide(const TQPoint&, bool, int)));
+ connect(hRuler, TQ_SIGNAL(moveGuide(const TQPoint&, bool, int)),
+ &(m_pCanvas->guideLines()), TQ_SLOT(moveGuide(const TQPoint&, bool, int)));
+ connect(&(m_pCanvas->guideLines()), TQ_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQ_SLOT(updateGuideLines(KoView*)));
TQGridLayout* layout = new TQGridLayout(pRightSide);
layout->addWidget(hRuler, 0, 1);
@@ -257,8 +257,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
TQWidget::setFocusPolicy( TQWidget::StrongFocus );
setFocusProxy( m_pCanvas );
- connect( this, TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) );
- connect( this, TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) );
+ connect( this, TQ_SIGNAL( invalidated() ), m_pCanvas, TQ_SLOT( update() ) );
+ connect( this, TQ_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQ_SLOT( repaint( const TQRegion&, bool ) ) );
setInstance(KivioFactory::global());
if ( !m_pDoc->isReadWrite() )
@@ -286,15 +286,15 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
setActivePage(m_pDoc->map()->firstPage());
- connect( m_pDoc, TQT_SIGNAL( sig_selectionChanged() ), TQT_SLOT( updateToolBars() ) );
- connect( m_pDoc, TQT_SIGNAL( sig_addPage(KivioPage*) ), TQT_SLOT( addPage(KivioPage*) ) );
- connect( m_pDoc, TQT_SIGNAL( sig_addSpawnerSet(KivioStencilSpawnerSet*) ), TQT_SLOT(addSpawnerToStackBar(KivioStencilSpawnerSet*)) );
- connect( m_pDoc, TQT_SIGNAL( sig_updateView(KivioPage*) ), TQT_SLOT(slotUpdateView(KivioPage*)) );
- connect( m_pDoc, TQT_SIGNAL( sig_pageNameChanged(KivioPage*,const TQString&)), TQT_SLOT(slotPageRenamed(KivioPage*,const TQString&)) );
+ connect( m_pDoc, TQ_SIGNAL( sig_selectionChanged() ), TQ_SLOT( updateToolBars() ) );
+ connect( m_pDoc, TQ_SIGNAL( sig_addPage(KivioPage*) ), TQ_SLOT( addPage(KivioPage*) ) );
+ connect( m_pDoc, TQ_SIGNAL( sig_addSpawnerSet(KivioStencilSpawnerSet*) ), TQ_SLOT(addSpawnerToStackBar(KivioStencilSpawnerSet*)) );
+ connect( m_pDoc, TQ_SIGNAL( sig_updateView(KivioPage*) ), TQ_SLOT(slotUpdateView(KivioPage*)) );
+ connect( m_pDoc, TQ_SIGNAL( sig_pageNameChanged(KivioPage*,const TQString&)), TQ_SLOT(slotPageRenamed(KivioPage*,const TQString&)) );
- connect( m_pDoc, TQT_SIGNAL( sig_updateGrid()),TQT_SLOT(slotUpdateGrid()));
+ connect( m_pDoc, TQ_SIGNAL( sig_updateGrid()),TQ_SLOT(slotUpdateGrid()));
- connect(m_pDoc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(loadingFinished()));
+ connect(m_pDoc, TQ_SIGNAL(loadingFinished()), this, TQ_SLOT(loadingFinished()));
initActions();
@@ -341,11 +341,11 @@ void KivioView::createGeometryDock()
m_pStencilGeometryPanel->setUnit(m_pDoc->unit());
paletteManager()->addWidget(m_pStencilGeometryPanel, "stencilgeometrypanel", "geometrydocker");
- connect( m_pStencilGeometryPanel, TQT_SIGNAL(positionChanged(double, double)), this, TQT_SLOT(slotChangeStencilPosition(double, double)) );
- connect( m_pStencilGeometryPanel, TQT_SIGNAL(sizeChanged(double, double)), this, TQT_SLOT(slotChangeStencilSize(double, double)) );
-// connect(m_pStencilGeometryPanel, TQT_SIGNAL(rotationChanged(int)), TQT_SLOT(slotChangeStencilRotation(int)));
+ connect( m_pStencilGeometryPanel, TQ_SIGNAL(positionChanged(double, double)), this, TQ_SLOT(slotChangeStencilPosition(double, double)) );
+ connect( m_pStencilGeometryPanel, TQ_SIGNAL(sizeChanged(double, double)), this, TQ_SLOT(slotChangeStencilSize(double, double)) );
+// connect(m_pStencilGeometryPanel, TQ_SIGNAL(rotationChanged(int)), TQ_SLOT(slotChangeStencilRotation(int)));
- connect( m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), m_pStencilGeometryPanel, TQT_SLOT(setUnit(KoUnit::Unit)) );
+ connect( m_pDoc, TQ_SIGNAL(unitChanged(KoUnit::Unit)), m_pStencilGeometryPanel, TQ_SLOT(setUnit(KoUnit::Unit)) );
}
void KivioView::createBirdEyeDock()
@@ -380,149 +380,149 @@ void KivioView::setupActions()
{
KivioStencilSetAction* addStSet = new KivioStencilSetAction( i18n("Add Stencil Set"),
"open_stencilset", actionCollection(), "addStencilSet" );
- connect(addStSet,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(addStencilSet(const TQString&)));
- connect(this, TQT_SIGNAL(updateStencilSetList()), addStSet, TQT_SLOT(updateMenu()));
- connect(addStSet, TQT_SIGNAL(showDialog()), this, TQT_SLOT(showAddStencilSetDialog()));
+ connect(addStSet,TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(addStencilSet(const TQString&)));
+ connect(this, TQ_SIGNAL(updateStencilSetList()), addStSet, TQ_SLOT(updateMenu()));
+ connect(addStSet, TQ_SIGNAL(showDialog()), this, TQ_SLOT(showAddStencilSetDialog()));
m_alignAndDistribute = new TDEAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, this,
- TQT_SLOT(alignStencilsDlg()), actionCollection(), "alignStencils" );
+ TQ_SLOT(alignStencilsDlg()), actionCollection(), "alignStencils" );
- m_editCut = KStdAction::cut( this, TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" );
- m_editCopy = KStdAction::copy( this, TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" );
- m_editPaste = KStdAction::paste( this, TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" );
- connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardDataChanged()));
+ m_editCut = KStdAction::cut( this, TQ_SLOT(cutStencil()), actionCollection(), "cutStencil" );
+ m_editCopy = KStdAction::copy( this, TQ_SLOT(copyStencil()), actionCollection(), "copyStencil" );
+ m_editPaste = KStdAction::paste( this, TQ_SLOT(pasteStencil()), actionCollection(), "pasteStencil" );
+ connect(TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardDataChanged()));
- m_selectAll = KStdAction::selectAll(this, TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils");
- m_selectNone = KStdAction::deselect(this, TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils");
+ m_selectAll = KStdAction::selectAll(this, TQ_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils");
+ m_selectNone = KStdAction::deselect(this, TQ_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils");
- m_groupAction = new TDEAction( i18n("Group Selection"), "group", CTRL+Key_G, this, TQT_SLOT(groupStencils()), actionCollection(), "groupStencils" );
+ m_groupAction = new TDEAction( i18n("Group Selection"), "group", CTRL+Key_G, this, TQ_SLOT(groupStencils()), actionCollection(), "groupStencils" );
m_groupAction->setWhatsThis(i18n("Group selected objects into a single stencil"));
- m_ungroupAction = new TDEAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, this, TQT_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" );
+ m_ungroupAction = new TDEAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, this, TQ_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" );
m_ungroupAction->setWhatsThis(i18n("Break up a selected group stencil"));
- m_stencilToFront = new TDEAction( i18n("Bring to Front"), "bring_forward", 0, this, TQT_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" );
- m_stencilToBack = new TDEAction( i18n("Send to Back"), "send_backward", 0, this, TQT_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" );
+ m_stencilToFront = new TDEAction( i18n("Bring to Front"), "bring_forward", 0, this, TQ_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" );
+ m_stencilToBack = new TDEAction( i18n("Send to Back"), "send_backward", 0, this, TQ_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" );
- m_menuTextFormatAction = new TDEAction(i18n("&Text..."), 0, 0, this, TQT_SLOT(textFormat()),
+ m_menuTextFormatAction = new TDEAction(i18n("&Text..."), 0, 0, this, TQ_SLOT(textFormat()),
actionCollection(), "textFormat");
- m_menuStencilConnectorsAction = new TDEAction(i18n("&Stencils && Connectors..."), 0, 0, this, TQT_SLOT(stencilFormat()),
+ m_menuStencilConnectorsAction = new TDEAction(i18n("&Stencils && Connectors..."), 0, 0, this, TQ_SLOT(stencilFormat()),
actionCollection(), "stencilFormat");
- m_arrowHeadsMenuAction = new TDEAction(i18n("&Arrowheads..."), 0, 0, this, TQT_SLOT(arrowHeadFormat()),
+ m_arrowHeadsMenuAction = new TDEAction(i18n("&Arrowheads..."), 0, 0, this, TQ_SLOT(arrowHeadFormat()),
actionCollection(), "arrowHeadFormat");
m_arrowHeadsMenuAction->setWhatsThis(i18n("Arrowheads allow you to add an arrow to the beginning and/or end of a line."));
/* Create the fg color button */
m_setFGColor = new TTDESelectColorAction( i18n("Line Color"), TTDESelectColorAction::LineColor, actionCollection(), "setFGColor" );
m_setFGColor->setWhatsThis(i18n("The line color allows you to choose a color for the lines of the stencils."));
- connect(m_setFGColor,TQT_SIGNAL(activated()),TQT_SLOT(setFGColor()));
+ connect(m_setFGColor,TQ_SIGNAL(activated()),TQ_SLOT(setFGColor()));
m_setBGColor = new TTDESelectColorAction( i18n("Fill Color"), TTDESelectColorAction::FillColor, actionCollection(), "setBGColor" );
m_setBGColor->setWhatsThis(i18n("You can choose a color for the background of a stencil by using this button."));
- connect(m_setBGColor,TQT_SIGNAL(activated()),TQT_SLOT(setBGColor()));
+ connect(m_setBGColor,TQ_SIGNAL(activated()),TQ_SLOT(setBGColor()));
// Text bar
m_setFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "setFontFamily" );
- connect( m_setFontFamily, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setFontFamily(const TQString&)) );
+ connect( m_setFontFamily, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(setFontFamily(const TQString&)) );
m_setFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "setFontSize" );
- connect( m_setFontSize, TQT_SIGNAL( fontSizeChanged( int ) ),
- this, TQT_SLOT( setFontSize(int ) ) );
+ connect( m_setFontSize, TQ_SIGNAL( fontSizeChanged( int ) ),
+ this, TQ_SLOT( setFontSize(int ) ) );
m_setTextColor = new TTDESelectColorAction( i18n("Text Color"), TTDESelectColorAction::TextColor, actionCollection(), "setTextColor" );
- connect( m_setTextColor, TQT_SIGNAL(activated()), TQT_SLOT(setTextColor()) );
+ connect( m_setTextColor, TQ_SIGNAL(activated()), TQ_SLOT(setTextColor()) );
m_setBold = new TDEToggleAction( i18n("Toggle Bold Text"), "format-text-bold", 0, actionCollection(), "setFontBold" );
- connect( m_setBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontBold(bool)) );
+ connect( m_setBold, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleFontBold(bool)) );
m_setItalics = new TDEToggleAction( i18n("Toggle Italics Text"), "format-text-italic", 0, actionCollection(), "setFontItalics" );
- connect( m_setItalics, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontItalics(bool)) );
+ connect( m_setItalics, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleFontItalics(bool)) );
m_setUnderline = new TDEToggleAction( i18n("Toggle Underline Text"), "format-text-underline", 0, actionCollection(), "setFontUnderline" );
- connect( m_setUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontUnderline(bool)));
+ connect( m_setUnderline, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleFontUnderline(bool)));
m_textAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", CTRL + Key_L,
- this, TQT_SLOT( textAlignLeft() ),
+ this, TQ_SLOT( textAlignLeft() ),
actionCollection(), "textAlignLeft" );
m_textAlignLeft->setExclusiveGroup( "align" );
m_textAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", CTRL + ALT + Key_C,
- this, TQT_SLOT( textAlignCenter() ),
+ this, TQ_SLOT( textAlignCenter() ),
actionCollection(), "textAlignCenter" );
m_textAlignCenter->setExclusiveGroup( "align" );
m_textAlignCenter->setChecked( TRUE );
m_textAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", CTRL + ALT + Key_R,
- this, TQT_SLOT( textAlignRight() ),
+ this, TQ_SLOT( textAlignRight() ),
actionCollection(), "textAlignRight" );
m_textAlignRight->setExclusiveGroup( "align" );
m_textVAlignSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0,
- this, TQT_SLOT( textSuperScript() ),
+ this, TQ_SLOT( textSuperScript() ),
actionCollection(), "textVAlignSuper" );
m_textVAlignSuper->setExclusiveGroup( "valign" );
m_textVAlignSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0,
- this, TQT_SLOT( textSubScript() ),
+ this, TQ_SLOT( textSubScript() ),
actionCollection(), "textVAlignSub" );
m_textVAlignSub->setExclusiveGroup( "valign" );
- m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", this, TQT_SLOT(setLineWidth(double)),
+ m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", this, TQ_SLOT(setLineWidth(double)),
actionCollection(), "setLineWidth");
m_lineWidthAction->setUnit(m_pDoc->unit());
- connect(m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), m_lineWidthAction, TQT_SLOT(setUnit(KoUnit::Unit)));
+ connect(m_pDoc, TQ_SIGNAL(unitChanged(KoUnit::Unit)), m_lineWidthAction, TQ_SLOT(setUnit(KoUnit::Unit)));
- m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", this, TQT_SLOT(setLineStyle(int)),
+ m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", this, TQ_SLOT(setLineStyle(int)),
actionCollection(), "setLineStyle");
- m_paperLayout = new TDEAction( i18n("Page Layout..."), 0, this, TQT_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" );
- m_insertPage = new TDEAction( i18n("Insert Page"),"item_add", 0, this, TQT_SLOT(insertPage()), actionCollection(), "insertPage" );
- m_removePage = new TDEAction( i18n("Remove Page"), "item_remove",0,this, TQT_SLOT(removePage()), actionCollection(), "removePage" );
+ m_paperLayout = new TDEAction( i18n("Page Layout..."), 0, this, TQ_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" );
+ m_insertPage = new TDEAction( i18n("Insert Page"),"item_add", 0, this, TQ_SLOT(insertPage()), actionCollection(), "insertPage" );
+ m_removePage = new TDEAction( i18n("Remove Page"), "item_remove",0,this, TQ_SLOT(removePage()), actionCollection(), "removePage" );
- m_renamePage = new TDEAction( i18n("Rename Page..."), "item_rename",0,this, TQT_SLOT(renamePage()), actionCollection(), "renamePage" );
+ m_renamePage = new TDEAction( i18n("Rename Page..."), "item_rename",0,this, TQ_SLOT(renamePage()), actionCollection(), "renamePage" );
- m_showPage = new TDEAction( i18n("Show Page..."),0 ,this,TQT_SLOT(showPage()), actionCollection(), "showPage" );
- m_hidePage = new TDEAction( i18n("Hide Page"),0 ,this,TQT_SLOT(hidePage()), actionCollection(), "hidePage" );
+ m_showPage = new TDEAction( i18n("Show Page..."),0 ,this,TQ_SLOT(showPage()), actionCollection(), "showPage" );
+ m_hidePage = new TDEAction( i18n("Hide Page"),0 ,this,TQ_SLOT(hidePage()), actionCollection(), "hidePage" );
showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "showPageMargins" );
- connect( showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool)));
+ connect( showPageMargins, TQ_SIGNAL(toggled(bool)), TQ_SLOT(togglePageMargins(bool)));
#if KDE_IS_VERSION(3,2,90)
showPageMargins->setCheckedState(i18n("Hide Page Margins"));
#endif
showRulers = new TDEToggleAction( i18n("Show Rulers"), "view_ruler", 0, actionCollection(), "showRulers" );
- connect( showRulers, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowRulers(bool)));
+ connect( showRulers, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleShowRulers(bool)));
#if KDE_IS_VERSION(3,2,90)
showRulers->setCheckedState(i18n("Hide Rulers"));
#endif
// Grid actions
showGrid = new TDEToggleAction( i18n("Show Grid"), "view_grid", 0, actionCollection(), "showGrid" );
- connect( showGrid, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowGrid(bool)));
+ connect( showGrid, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleShowGrid(bool)));
#if KDE_IS_VERSION(3,2,90)
showGrid->setCheckedState(i18n("Hide Grid"));
#endif
TDEToggleAction* snapGrid = new TDEToggleAction( i18n("Snap Grid"), "view_grid", 0, actionCollection(), "snapGrid" );
- connect( snapGrid, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleSnapGrid(bool)));
+ connect( snapGrid, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleSnapGrid(bool)));
// Guides actions
showGuides = new TDEToggleAction( i18n("Guide Lines"), 0, actionCollection(), "showGuides" );
- connect( showGuides, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowGuides(bool)));
- TDEAction* addGuide = new TDEAction(i18n("Add Guide Line..."), 0, this, TQT_SLOT(addGuideLine()),
+ connect( showGuides, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleShowGuides(bool)));
+ TDEAction* addGuide = new TDEAction(i18n("Add Guide Line..."), 0, this, TQ_SLOT(addGuideLine()),
actionCollection(), "addGuideLine");
- connect(showGuides, TQT_SIGNAL(toggled(bool)), addGuide, TQT_SLOT(setEnabled(bool)));
+ connect(showGuides, TQ_SIGNAL(toggled(bool)), addGuide, TQ_SLOT(setEnabled(bool)));
//--
m_setArrowHeads = new KivioArrowHeadAction(i18n("Arrowheads"), "arrowheads", actionCollection(), "arrowHeads");
m_setArrowHeads->setWhatsThis(i18n("Arrowheads allow you to add an arrow to the beginning and/or end of a line."));
- connect( m_setArrowHeads, TQT_SIGNAL(endChanged(int)), TQT_SLOT(slotSetEndArrow(int)));
- connect( m_setArrowHeads, TQT_SIGNAL(startChanged(int)), TQT_SLOT(slotSetStartArrow(int)));
+ connect( m_setArrowHeads, TQ_SIGNAL(endChanged(int)), TQ_SLOT(slotSetEndArrow(int)));
+ connect( m_setArrowHeads, TQ_SIGNAL(startChanged(int)), TQ_SLOT(slotSetStartArrow(int)));
- KStdAction::preferences(this, TQT_SLOT(optionsDialog()), actionCollection(), "options");
+ KStdAction::preferences(this, TQ_SLOT(optionsDialog()), actionCollection(), "options");
(void) new TDEAction(i18n("Install Stencil Set..."), 0, this,
- TQT_SLOT(installStencilSet()), actionCollection(), "installStencilSet");
+ TQ_SLOT(installStencilSet()), actionCollection(), "installStencilSet");
m_editDelete = new TDEAction(i18n("Delete"), "edit-delete", Key_Delete,
- this, TQT_SLOT(deleteObject()), actionCollection(), "deleteObject");
+ this, TQ_SLOT(deleteObject()), actionCollection(), "deleteObject");
}
void KivioView::initActions()
@@ -586,10 +586,10 @@ void KivioView::addPage( KivioPage* page )
{
insertPage( page );
- TQObject::connect( page, TQT_SIGNAL( sig_PageHidden( KivioPage* ) ),
- this, TQT_SLOT( slotPageHidden( KivioPage* ) ) );
- TQObject::connect( page, TQT_SIGNAL( sig_PageShown( KivioPage* ) ),
- this, TQT_SLOT( slotPageShown( KivioPage* ) ) );
+ TQObject::connect( page, TQ_SIGNAL( sig_PageHidden( KivioPage* ) ),
+ this, TQ_SLOT( slotPageHidden( KivioPage* ) ) );
+ TQObject::connect( page, TQ_SIGNAL( sig_PageShown( KivioPage* ) ),
+ this, TQ_SLOT( slotPageShown( KivioPage* ) ) );
updatePageStatusLabel();
}
@@ -654,8 +654,8 @@ void KivioView::setActivePage( KivioPage* page )
return;
if(m_pActivePage) {
- disconnect(m_pActivePage, TQT_SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)), this,
- TQT_SLOT(setRulerPageLayout(const KoPageLayout&)));
+ disconnect(m_pActivePage, TQ_SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)), this,
+ TQ_SLOT(setRulerPageLayout(const KoPageLayout&)));
}
m_pActivePage = page;
@@ -667,8 +667,8 @@ void KivioView::setActivePage( KivioPage* page )
m_pDoc->updateView(m_pActivePage);
setRulerPageLayout(m_pActivePage->paperLayout());
- connect(m_pActivePage, TQT_SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)),
- TQT_SLOT(setRulerPageLayout(const KoPageLayout&)));
+ connect(m_pActivePage, TQ_SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)),
+ TQ_SLOT(setRulerPageLayout(const KoPageLayout&)));
m_pCanvas->guideLines().setGuideLines(m_pActivePage->horizontalGuideLines(),
m_pActivePage->verticalGuideLines());
@@ -950,10 +950,10 @@ void KivioView::addSpawnerToStackBar( KivioStencilSpawnerSet *pSpawner )
}
KivioIconView *pView = new KivioIconView(m_pDoc->isReadWrite());
- TQObject::connect(pView, TQT_SIGNAL(createNewStencil(KivioStencilSpawner*)), this,
- TQT_SLOT(addStencilFromSpawner(KivioStencilSpawner*)));
- connect(pView, TQT_SIGNAL(stencilSelected(KivioStencilSpawner*)),
- m_addStencilTool, TQT_SLOT(activateNewStencil(KivioStencilSpawner* )));
+ TQObject::connect(pView, TQ_SIGNAL(createNewStencil(KivioStencilSpawner*)), this,
+ TQ_SLOT(addStencilFromSpawner(KivioStencilSpawner*)));
+ connect(pView, TQ_SIGNAL(stencilSelected(KivioStencilSpawner*)),
+ m_addStencilTool, TQ_SLOT(activateNewStencil(KivioStencilSpawner* )));
pView->setStencilSpawnerSet(pSpawner);
m_pStencilBarDockManager->insertStencilSet(pView, pSpawner->name());
@@ -2262,8 +2262,8 @@ void KivioView::showAddStencilSetDialog()
{
if(!m_addStencilSetDialog) {
m_addStencilSetDialog = new Kivio::AddStencilSetDialog(this, "AddStencilSetDialog");
- connect(m_addStencilSetDialog, TQT_SIGNAL(addStencilSet(const TQString&)), this, TQT_SLOT(addStencilSet(const TQString&)));
- connect(this, TQT_SIGNAL(updateStencilSetList()), m_addStencilSetDialog, TQT_SLOT(updateList()));
+ connect(m_addStencilSetDialog, TQ_SIGNAL(addStencilSet(const TQString&)), this, TQ_SLOT(addStencilSet(const TQString&)));
+ connect(this, TQ_SIGNAL(updateStencilSetList()), m_addStencilSetDialog, TQ_SLOT(updateList()));
}
m_addStencilSetDialog->show();
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 8d7beefa4..9ace753d5 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -55,8 +55,8 @@ KivioArrowHeadAction::KivioArrowHeadAction(const TQString &text, const TQString
m_currentStart = m_currentEnd = 0;
m_startPopup->setItemChecked(0, true);
m_endPopup->setItemChecked(0, true);
- connect(m_startPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(setCurrentStartArrow(int)));
- connect(m_endPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(setCurrentEndArrow(int)));
+ connect(m_startPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(setCurrentStartArrow(int)));
+ connect(m_endPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(setCurrentEndArrow(int)));
}
KivioArrowHeadAction::~KivioArrowHeadAction()
@@ -100,7 +100,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
menu->setItemEnabled( id, false );
addContainer( menu, id );
- connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
return containerCount() - 1;
}
@@ -111,8 +111,8 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
int id_ = TDEAction::getToolButtonID();
if ( icon().isEmpty() && !iconSet().isNull() )
- bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
- TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+ bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this,
+ TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
index );
else
{
@@ -123,8 +123,8 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
else
instance = TDEGlobal::instance();
- bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
- TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+ bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+ TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
index, instance );
}
@@ -133,7 +133,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
if (!whatsThis().isEmpty())
TQWhatsThis::add( bar->getButton(id_), whatsThis() );
- connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
bar->getButton(id_)->setPopup(popupMenu(), true );
@@ -151,7 +151,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
bar->setItemEnabled( id, false );
addContainer( bar, id );
- connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
return containerCount() - 1;
}
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 5d0040827..2ef54d4f8 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -113,7 +113,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
menu->setItemEnabled( id, false );
addContainer( menu, id );
- connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
return containerCount() - 1;
}
@@ -124,8 +124,8 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
int id_ = TDEAction::getToolButtonID();
if ( icon().isEmpty() && !iconSet().isNull() )
- bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
- TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+ bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this,
+ TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
index );
else
{
@@ -136,8 +136,8 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
else
instance = TDEGlobal::instance();
- bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
- TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+ bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+ TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
index, instance );
}
@@ -146,7 +146,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
if (!whatsThis().isEmpty())
TQWhatsThis::add( bar->getButton(id_), whatsThis() );
- connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
bar->getButton(id_)->setPopup(popupMenu(), true );
@@ -164,7 +164,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
bar->setItemEnabled( id, false );
addContainer( bar, id );
- connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+ connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
return containerCount() - 1;
}
@@ -177,7 +177,7 @@ void KivioStencilSetAction::updateMenu()
m_ssId = 0;
m_popup->clear();
- m_popup->insertItem(i18n("Show Stencil Set Chooser"), this, TQT_SIGNAL(showDialog()));
+ m_popup->insertItem(i18n("Show Stencil Set Chooser"), this, TQ_SIGNAL(showDialog()));
m_popup->insertSeparator();
m_pathList.clear();
@@ -217,7 +217,7 @@ void KivioStencilSetAction::loadCollections( const TQString& rootDirStr )
if(index < 0) {
ch = new TDEPopupMenu;
- connect(ch,TQT_SIGNAL(activated(int)),TQT_SLOT(slotActivated(int)));
+ connect(ch,TQ_SIGNAL(activated(int)),TQ_SLOT(slotActivated(int)));
m_popup->insertItem(TQIconSet(dirtPixmap(colFInfo->absFilePath())),
KivioStencilSpawnerSet::readTitle(colFInfo->absFilePath()),ch);
m_collectionIdList.append(cId);
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp
index da9730a40..2b5d533d3 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.cpp
+++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp
@@ -51,7 +51,7 @@ namespace Kivio {
setButtonOK(KGuiItem(i18n("&Install"), "button_ok"));
resize(400, 10);
- connect( m_url->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotUrlChanged( const TQString & ) ) );
+ connect( m_url->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotUrlChanged( const TQString & ) ) );
slotUrlChanged( m_url->lineEdit()->text() );
m_url->setFocus();
}
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index e0aef5f8b..70600cb75 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -46,11 +46,11 @@ StencilBarDockManager::StencilBarDockManager( KivioView* parent, const char* nam
m_pBars.setAutoDelete(true);
m_pDoc = m_pView->doc();
- connect(m_pDoc, TQT_SIGNAL(sig_deleteStencilSet(DragBarButton*, TQWidget*, KivioStackBar*)), this,
- TQT_SLOT(slotDeleteStencilSet(DragBarButton*, TQWidget*, KivioStackBar*)));
+ connect(m_pDoc, TQ_SIGNAL(sig_deleteStencilSet(DragBarButton*, TQWidget*, KivioStackBar*)), this,
+ TQ_SLOT(slotDeleteStencilSet(DragBarButton*, TQWidget*, KivioStackBar*)));
moveManager = new KoToolDockMoveManager();
- connect(moveManager,TQT_SIGNAL(positionChanged()),TQT_SLOT(slotMoving()));
+ connect(moveManager,TQ_SIGNAL(positionChanged()),TQ_SLOT(slotMoving()));
}
StencilBarDockManager::~StencilBarDockManager()
@@ -143,10 +143,10 @@ void StencilBarDockManager::insertStencilSet( TQWidget* w, const TQString& capti
bar = new KivioStackBar(m_pView, m_pView->mainWindow());
m_pView->mainWindow()->moveDockWindow(bar, position);
m_pBars.append(bar);
- connect(bar,TQT_SIGNAL(beginDragPage(DragBarButton*)),TQT_SLOT(slotBeginDragPage(DragBarButton*)));
- connect(bar,TQT_SIGNAL(finishDragPage(DragBarButton*)),TQT_SLOT(slotFinishDragPage(DragBarButton*)));
- connect(bar,TQT_SIGNAL(deleteButton(DragBarButton*,TQWidget*,KivioStackBar*)),
- m_pDoc, TQT_SLOT(slotDeleteStencilSet(DragBarButton*,TQWidget*,KivioStackBar*)));
+ connect(bar,TQ_SIGNAL(beginDragPage(DragBarButton*)),TQ_SLOT(slotBeginDragPage(DragBarButton*)));
+ connect(bar,TQ_SIGNAL(finishDragPage(DragBarButton*)),TQ_SLOT(slotFinishDragPage(DragBarButton*)));
+ connect(bar,TQ_SIGNAL(deleteButton(DragBarButton*,TQWidget*,KivioStackBar*)),
+ m_pDoc, TQ_SLOT(slotDeleteStencilSet(DragBarButton*,TQWidget*,KivioStackBar*)));
}
}
@@ -363,7 +363,7 @@ void KoToolDockMoveManager::doMove( TQWidget* _w )
drawRectangle(xp, yp, w, h);
timer->disconnect();
- connect(timer,TQT_SIGNAL(timeout()),TQT_SLOT(doMoveInternal()));
+ connect(timer,TQ_SIGNAL(timeout()),TQ_SLOT(doMoveInternal()));
timer->start(0);
}
@@ -588,7 +588,7 @@ void KoToolDockMoveManager::doResize( TQWidget* _w )
drawRectangle(xp, yp, w, h);
timer->disconnect();
- connect(timer,TQT_SIGNAL(timeout()),TQT_SLOT(doResizeInternal()));
+ connect(timer,TQ_SIGNAL(timeout()),TQ_SLOT(doResizeInternal()));
timer->start(0);
}
diff --git a/kivio/kiviopart/tools/kivio_mousetool.cpp b/kivio/kiviopart/tools/kivio_mousetool.cpp
index e74d01478..d8b63631e 100644
--- a/kivio/kiviopart/tools/kivio_mousetool.cpp
+++ b/kivio/kiviopart/tools/kivio_mousetool.cpp
@@ -23,7 +23,7 @@
namespace Kivio {
MouseTool::MouseTool(KivioView* parent, const char* name) : Kivio::Plugin(parent, name)
{
- connect(this, TQT_SIGNAL(activated(Kivio::MouseTool*)), view()->pluginManager(), TQT_SLOT(activate(Kivio::MouseTool*)));
+ connect(this, TQ_SIGNAL(activated(Kivio::MouseTool*)), view()->pluginManager(), TQ_SLOT(activate(Kivio::MouseTool*)));
}
MouseTool::~MouseTool()
diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp
index 51b2481e6..f6ddf334d 100644
--- a/kivio/kiviopart/tools/mousetoolaction.cpp
+++ b/kivio/kiviopart/tools/mousetoolaction.cpp
@@ -87,7 +87,7 @@ int MouseToolAction::plug(TQWidget* widget, int index)
if(::tqt_cast<TDEToolBar*>(widget)) {
TDEToolBar* toolBar = static_cast<TDEToolBar*>(widget);
TDEToolBarButton* button = toolBar->getButton(itemId(usedIndex));
- connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL(doubleClicked()));
+ connect(button, TQ_SIGNAL(doubleClicked(int)), this, TQ_SIGNAL(doubleClicked()));
}
return usedIndex;
diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h
index 41a59924a..4af8a531f 100644
--- a/kivio/kiviopart/tools/mousetoolaction.h
+++ b/kivio/kiviopart/tools/mousetoolaction.h
@@ -44,8 +44,8 @@ class KIVIO_EXPORT MouseToolAction : public TDERadioAction
/**
* @param text The text that will be displayed.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param receiver The SLOT's parent.
- * @param slot The TQT_SLOT to invoke to execute this action.
+ * @param receiver The slot's parent.
+ * @param slot The slot to invoke to execute this action.
* @param parent This action's parent.
* @param name An internal name for this action.
*/
@@ -76,8 +76,8 @@ class KIVIO_EXPORT MouseToolAction : public TDERadioAction
* @param text The text that will be displayed.
* @param pix The icons that go with this action.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param receiver The SLOT's parent.
- * @param slot The TQT_SLOT to invoke to execute this action.
+ * @param receiver The slot's parent.
+ * @param slot The slot to invoke to execute this action.
* @param parent This action's parent.
* @param name An internal name for this action.
*/
@@ -88,8 +88,8 @@ class KIVIO_EXPORT MouseToolAction : public TDERadioAction
* @param text The text that will be displayed.
* @param pix The dynamically loaded icon that goes with this action.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param receiver The SLOT's parent.
- * @param slot The TQT_SLOT to invoke to execute this action.
+ * @param receiver The slot's parent.
+ * @param slot The slot to invoke to execute this action.
* @param parent This action's parent.
* @param name An internal name for this action.
*/
diff --git a/kivio/kiviopart/ui/addstencilsetdialog.cpp b/kivio/kiviopart/ui/addstencilsetdialog.cpp
index 047cce094..39d42a276 100644
--- a/kivio/kiviopart/ui/addstencilsetdialog.cpp
+++ b/kivio/kiviopart/ui/addstencilsetdialog.cpp
@@ -31,7 +31,7 @@ AddStencilSetDialog::AddStencilSetDialog(TQWidget *parent, const char *name)
setMainWidget(m_mainWidget);
setInitialSize(TQSize(600, 450));
- connect(m_mainWidget, TQT_SIGNAL(addStencilSet(const TQString&)), this, TQT_SIGNAL(addStencilSet(const TQString&)));
+ connect(m_mainWidget, TQ_SIGNAL(addStencilSet(const TQString&)), this, TQ_SIGNAL(addStencilSet(const TQString&)));
}
AddStencilSetDialog::~AddStencilSetDialog()
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 398bebc95..6ed856678 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -35,15 +35,15 @@ KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* parent, const ch
canvas->installEventFilter(this);
m_zoomHandler = new KoZoomHandler;
- connect( m_pDoc, TQT_SIGNAL( sig_updateView(KivioPage*)), TQT_SLOT(slotUpdateView(KivioPage*)) );
- connect( m_pView, TQT_SIGNAL(zoomChanged(int)), TQT_SLOT(canvasZoomChanged(int)));
- connect( m_pCanvas, TQT_SIGNAL(visibleAreaChanged()), TQT_SLOT(updateView()));
+ connect( m_pDoc, TQ_SIGNAL( sig_updateView(KivioPage*)), TQ_SLOT(slotUpdateView(KivioPage*)) );
+ connect( m_pView, TQ_SIGNAL(zoomChanged(int)), TQ_SLOT(canvasZoomChanged(int)));
+ connect( m_pCanvas, TQ_SIGNAL(visibleAreaChanged()), TQ_SLOT(updateView()));
m_zoomOutButton->setIconSet(SmallIconSet("zoom-out", 16));
m_zoomInButton->setIconSet(SmallIconSet("zoom-in", 16));
- connect(m_zoomOutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomMinus()));
- connect(m_zoomInButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomPlus()));
- connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)), m_pView, TQT_SLOT(viewZoom(int)));
+ connect(m_zoomOutButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomMinus()));
+ connect(m_zoomInButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomPlus()));
+ connect(m_zoomSlider, TQ_SIGNAL(valueChanged(int)), m_pView, TQ_SLOT(viewZoom(int)));
canvasZoomChanged(m_pView->zoomHandler()->zoom());
}
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index f7803dd67..ba0035101 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -75,11 +75,11 @@ KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* parent, const char*
list->setSorting(5, false);
list->installEventFilter(this);
- actNew = new TDEAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, this, TQT_SLOT(addItem()), this);
- actDel = new TDEAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, this, TQT_SLOT(removeItem()), this);
- actRename = new TDEAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, this, TQT_SLOT(renameItem()), this);
- actUp = new TDEAction( i18n("Move Layer Up"), "go-up", 0, this, TQT_SLOT(upItem()), this);
- actDown = new TDEAction( i18n("Move Layer Down"), "go-down", 0, this, TQT_SLOT(downItem()), this);
+ actNew = new TDEAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, this, TQ_SLOT(addItem()), this);
+ actDel = new TDEAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, this, TQ_SLOT(removeItem()), this);
+ actRename = new TDEAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, this, TQ_SLOT(renameItem()), this);
+ actUp = new TDEAction( i18n("Move Layer Up"), "go-up", 0, this, TQ_SLOT(upItem()), this);
+ actDown = new TDEAction( i18n("Move Layer Down"), "go-down", 0, this, TQ_SLOT(downItem()), this);
actNew->plug(bar);
actDel->plug(bar);
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp
index 2240a4a2d..b7881f60c 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp
@@ -35,12 +35,12 @@
KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *parent, const char *name )
: KivioProtectionPanelBase(parent, name), m_pView(view)
{
- TQObject::connect( m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)) );
- TQObject::connect( m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)) );
- TQObject::connect( m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool)) );
- TQObject::connect( m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool)) );
- TQObject::connect( m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool)) );
- TQObject::connect( m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool)) );
+ TQObject::connect( m_checkWidth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togWidth(bool)) );
+ TQObject::connect( m_checkHeight, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togHeight(bool)) );
+ TQObject::connect( m_checkAspect, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togAspect(bool)) );
+ TQObject::connect( m_checkDeletion, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togDelete(bool)) );
+ TQObject::connect( m_checkXPosition, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togX(bool)) );
+ TQObject::connect( m_checkYPosition, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togY(bool)) );
}
KivioProtectionPanel::~KivioProtectionPanel()
@@ -257,12 +257,12 @@ void KivioProtectionPanel::updateCheckBoxes()
pStencil = m_pView->activePage()->selectedStencils()->next();
}
- TQObject::disconnect(m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)));
- TQObject::disconnect(m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)));
- TQObject::disconnect(m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool)));
- TQObject::disconnect(m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool)));
- TQObject::disconnect(m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool)));
- TQObject::disconnect(m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool)));
+ TQObject::disconnect(m_checkWidth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togWidth(bool)));
+ TQObject::disconnect(m_checkHeight, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togHeight(bool)));
+ TQObject::disconnect(m_checkAspect, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togAspect(bool)));
+ TQObject::disconnect(m_checkDeletion, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togDelete(bool)));
+ TQObject::disconnect(m_checkXPosition, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togX(bool)));
+ TQObject::disconnect(m_checkYPosition, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togY(bool)));
// Enable and disable the check boxes based on what protections are available
for(i = 0; i < NUM_PROTECTIONS; i++) {
@@ -319,10 +319,10 @@ void KivioProtectionPanel::updateCheckBoxes()
m_checkHeight->setChecked( pStencil->protection()->at(kpHeight) );
}
- TQObject::connect(m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)));
- TQObject::connect(m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)));
- TQObject::connect(m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool)));
- TQObject::connect(m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool)));
- TQObject::connect(m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool)));
- TQObject::connect(m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool)));
+ TQObject::connect(m_checkWidth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togWidth(bool)));
+ TQObject::connect(m_checkHeight, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togHeight(bool)));
+ TQObject::connect(m_checkAspect, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togAspect(bool)));
+ TQObject::connect(m_checkDeletion, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togDelete(bool)));
+ TQObject::connect(m_checkXPosition, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togX(bool)));
+ TQObject::connect(m_checkYPosition, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(togY(bool)));
}
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index a2bf2bc4c..c38606588 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -47,8 +47,8 @@ namespace Kivio {
m_stencilSetSplitter->setSizes(sizes);
updateList();
- connect(m_stencilSetLView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(changeStencilSet(TQListViewItem*)));
- connect(m_addToDocBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addToDocument()));
+ connect(m_stencilSetLView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(changeStencilSet(TQListViewItem*)));
+ connect(m_addToDocBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addToDocument()));
TQListViewItem* tmp = m_stencilSetLView->firstChild();
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index cd0f2953d..d2718f0a7 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -148,9 +148,9 @@ void KivioOptionsDialog::initPage()
gl->addMultiCellWidget(m_rulersChBox, 4, 4, 0, 2);
gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2);
- connect(layoutBtn, TQT_SIGNAL(clicked()), TQT_SLOT(pageLayoutDlg()));
- connect(fontBtn, TQT_SIGNAL(clicked()), TQT_SLOT(fontDlg()));
- connect(m_unitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(unitChanged(int)));
+ connect(layoutBtn, TQ_SIGNAL(clicked()), TQ_SLOT(pageLayoutDlg()));
+ connect(fontBtn, TQ_SIGNAL(clicked()), TQ_SLOT(fontDlg()));
+ connect(m_unitCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(unitChanged(int)));
}
void KivioOptionsDialog::initGrid()
@@ -204,8 +204,8 @@ void KivioOptionsDialog::initGrid()
gl->addMultiCellWidget(snapGrp, 4, 4, 0, 2);
gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2);
- connect(m_spaceHorizUSpin, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(setMaxHorizSnap(double)));
- connect(m_spaceVertUSpin, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(setMaxVertSnap(double)));
+ connect(m_spaceHorizUSpin, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(setMaxHorizSnap(double)));
+ connect(m_spaceVertUSpin, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(setMaxVertSnap(double)));
}
void KivioOptionsDialog::applyPage()
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 8111869e4..a61537f76 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -77,8 +77,8 @@ void KivioTextFormatDlg::initPositionTab()
gl->addWidget(m_preview, 0, 1);
gl->addWidget(m_halignBGrp, 1, 1);
- connect(m_valignBGrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateVAlign(int)));
- connect(m_halignBGrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateHAlign(int)));
+ connect(m_valignBGrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateVAlign(int)));
+ connect(m_halignBGrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateHAlign(int)));
}
void KivioTextFormatDlg::updateVAlign(int i)
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index 95b1adfe8..625548037 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -97,7 +97,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
layout->addWidget(m_objectList);
- connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection()));
+ connect(m_objectList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateSelection()));
}
ObjectListPalette::~ObjectListPalette()