diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 10:30:32 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 12:36:03 +0900 |
| commit | c0332621bc998c9786f4841e86a62b7711fe4abf (patch) | |
| tree | 38b3ab6688de7a9396a1c5993a8ec265f5f33b64 | |
| parent | 6c81ff8d61ec679e735d3fbd875583b12f0ef0a5 (diff) | |
| download | koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.tar.gz koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
672 files changed, 6113 insertions, 6113 deletions
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cpp b/chalk/colorspaces/wet/kis_wet_palette_widget.cpp index 43cfd559a..7dc49015d 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cpp +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cpp @@ -63,105 +63,105 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s l->addWidget(b, 0, 0); TQToolTip::add(b, i18n("Quinacridone Rose")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(159, 88, 43)); l->addWidget(b, 0, 1); TQToolTip::add(b,i18n("Indian Red")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor( TQColor(254, 220, 64) ); l->addWidget(b, 0, 2); TQToolTip::add(b,i18n("Cadmium Yellow")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(36, 180, 32)); l->addWidget(b, 0, 3); TQToolTip::add(b,i18n("Hookers Green")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(16, 185, 215)); l->addWidget(b, 0, 4); TQToolTip::add(b,i18n("Cerulean Blue")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(96, 32, 8)); l->addWidget(b, 0, 5); TQToolTip::add(b,i18n("Burnt Umber")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(254, 96, 8)); l->addWidget(b, 0, 6); TQToolTip::add(b,i18n("Cadmium Red")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(255, 136, 8)); l->addWidget(b, 0, 7); TQToolTip::add(b,i18n("Brilliant Orange")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(240, 199, 8)); l->addWidget(b, 1, 0); TQToolTip::add(b,i18n("Hansa Yellow")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(96, 170, 130)); l->addWidget(b, 1, 1); TQToolTip::add(b,i18n("Phthalo Green")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(48, 32, 170)); l->addWidget(b, 1, 2); TQToolTip::add(b,i18n("French Ultramarine")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(118, 16, 135)); l->addWidget(b, 1, 3); TQToolTip::add(b,i18n("Interference Lilac")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(254, 254, 254)); l->addWidget(b, 1, 4); TQToolTip::add(b,i18n("Titanium White")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(64, 64, 74)); l->addWidget(b, 1, 5); TQToolTip::add(b,i18n("Ivory Black")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); b = new KisColorCup(this); b->setColor(TQColor(255, 255, 255)); l->addWidget(b, 1, 6); TQToolTip::add(b,i18n("Pure Water")); b->setFixedSize(WIDTH, HEIGHT); - connect(b, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(b, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotFGColorSelected(const TQColor &))); TQGridLayout * g2 = new TQGridLayout(vl, 2, 2); @@ -169,13 +169,13 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s g2->addWidget(label, 0, 0); m_strength = new KDoubleNumInput(0.0, 2.0, 1.0, 0.1, 1, this); m_strength->setRange(0.0, 2.0, 0.1, true); - connect(m_strength, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotStrengthChanged(double))); + connect(m_strength, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotStrengthChanged(double))); g2->addWidget(m_strength, 0, 1); label = new TQLabel(i18n("Wetness:"), this); g2->addWidget(label, 1, 0); m_wetness = new KIntNumInput(16, this); - connect(m_wetness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotWetnessChanged(int))); + connect(m_wetness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotWetnessChanged(int))); m_wetness->setRange(0, 16, true); g2->addWidget(m_wetness, 1, 1); diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cpp b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cpp index 634424469..cbd090f16 100644 --- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cpp +++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cpp @@ -32,7 +32,7 @@ WetnessVisualisationFilter::WetnessVisualisationFilter(KisView* view) : m_view(view), m_action(0) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } // XXX this needs to work on a per-layer basis! diff --git a/chalk/colorspaces/wet/wet_plugin.cpp b/chalk/colorspaces/wet/wet_plugin.cpp index 259fe5d1c..896ef2a6d 100644 --- a/chalk/colorspaces/wet/wet_plugin.cpp +++ b/chalk/colorspaces/wet/wet_plugin.cpp @@ -106,7 +106,7 @@ WetPlugin::WetPlugin(TQObject *parent, const char *name, const TQStringList &) // Wetness visualisation WetnessVisualisationFilter * wf = new WetnessVisualisationFilter(m_view); wf->setAction(new TDEToggleAction(i18n("Wetness Visualisation"), 0, 0, wf, - TQT_SLOT(slotActivated()), actionCollection(), "wetnessvisualisation")); + TQ_SLOT(slotActivated()), actionCollection(), "wetnessvisualisation")); // Create the wet palette KisWetPaletteWidget * w = new KisWetPaletteWidget(m_view); diff --git a/chalk/core/kis_adjustment_layer.cpp b/chalk/core/kis_adjustment_layer.cpp index 69e8b9398..d8b699c68 100644 --- a/chalk/core/kis_adjustment_layer.cpp +++ b/chalk/core/kis_adjustment_layer.cpp @@ -38,8 +38,8 @@ KisAdjustmentLayer::KisAdjustmentLayer(KisImageSP img, const TQString &name, Kis m_cachedPaintDev = new KisPaintDevice( img->colorSpace(), name.latin1()); m_showSelection = true; Q_ASSERT(m_cachedPaintDev); - connect(img, TQT_SIGNAL(sigSelectionChanged(KisImageSP)), - this, TQT_SLOT(slotSelectionChanged(KisImageSP))); + connect(img, TQ_SIGNAL(sigSelectionChanged(KisImageSP)), + this, TQ_SLOT(slotSelectionChanged(KisImageSP))); } KisAdjustmentLayer::KisAdjustmentLayer(const KisAdjustmentLayer& rhs) @@ -50,8 +50,8 @@ KisAdjustmentLayer::KisAdjustmentLayer(const KisAdjustmentLayer& rhs) m_selection = new KisSelection( *rhs.m_selection.data() ); m_selection->setParentLayer(this); m_selection->setInterestedInDirtyness(true); - connect(rhs.image(), TQT_SIGNAL(sigSelectionChanged(KisImageSP)), - this, TQT_SLOT(slotSelectionChanged(KisImageSP))); + connect(rhs.image(), TQ_SIGNAL(sigSelectionChanged(KisImageSP)), + this, TQ_SLOT(slotSelectionChanged(KisImageSP))); } m_cachedPaintDev = new KisPaintDevice( *rhs.m_cachedPaintDev.data() ); m_showSelection = false; diff --git a/chalk/core/kis_image.cpp b/chalk/core/kis_image.cpp index 1180bf4cf..97abe08e8 100644 --- a/chalk/core/kis_image.cpp +++ b/chalk/core/kis_image.cpp @@ -545,7 +545,7 @@ KisImage::KisImage(const KisImage& rhs) : TQObject(), TDEShared(rhs) TQ_CHECK_PTR(m_bkg); m_rootLayer = static_cast<KisGroupLayer*>(rhs.m_rootLayer->clone().data()); - connect(m_rootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + connect(m_rootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); m_annotations = rhs.m_annotations; // XXX the annotations would probably need to be deep-copied @@ -663,7 +663,7 @@ void KisImage::init(KisUndoAdapter *adapter, TQ_INT32 width, TQ_INT32 height, K m_bkg = new KisBackground(); m_rootLayer = new KisGroupLayer(this,"root", OPACITY_OPAQUE); - connect(m_rootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + connect(m_rootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); m_xres = 1.0; m_yres = 1.0; @@ -681,7 +681,7 @@ bool KisImage::locked() const void KisImage::lock() { if (!locked()) { - if (m_rootLayer) disconnect(m_rootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + if (m_rootLayer) disconnect(m_rootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); m_private->sizeChangedWhileLocked = false; m_private->selectionChangedWhileLocked = false; } @@ -707,7 +707,7 @@ void KisImage::unlock() emit sigActiveSelectionChanged(this); } - if (m_rootLayer) connect(m_rootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + if (m_rootLayer) connect(m_rootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); } } } @@ -1139,7 +1139,7 @@ bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP abo actions.at(i)->act(player.data()->paintDevice(), width(), height()); } - connect(player, TQT_SIGNAL(sigMaskInfoChanged()), this, TQT_SIGNAL(sigMaskInfoChanged())); + connect(player, TQ_SIGNAL(sigMaskInfoChanged()), this, TQ_SIGNAL(sigMaskInfoChanged())); } if (layer->extent().isValid()) layer->setDirty(); @@ -1181,8 +1181,8 @@ bool KisImage::removeLayer(KisLayerSP layer) } KisPaintLayerSP player = dynamic_cast<KisPaintLayer*>(layer.data()); if (player != 0) { - disconnect(player, TQT_SIGNAL(sigMaskInfoChanged()), - this, TQT_SIGNAL(sigMaskInfoChanged())); + disconnect(player, TQ_SIGNAL(sigMaskInfoChanged()), + this, TQ_SIGNAL(sigMaskInfoChanged())); } KisLayerSP l = layer->prevSibling(); TQRect r = layer->extent(); @@ -1307,7 +1307,7 @@ TQ_INT32 KisImage::nHiddenLayers() const void KisImage::flatten() { KisGroupLayerSP oldRootLayer = m_rootLayer; - disconnect(oldRootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + disconnect(oldRootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); KisPaintLayer *dst = new KisPaintLayer(this, nextLayerName(), OPACITY_OPAQUE, colorSpace()); TQ_CHECK_PTR(dst); @@ -1318,7 +1318,7 @@ void KisImage::flatten() gc.bitBlt(rc.x(), rc.y(), COMPOSITE_COPY, mergedImage(), OPACITY_OPAQUE, rc.left(), rc.top(), rc.width(), rc.height()); m_rootLayer = new KisGroupLayer(this, "", OPACITY_OPAQUE); - connect(m_rootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + connect(m_rootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); if (undo()) { m_adapter->beginMacro(i18n("Flatten Image")); @@ -1619,12 +1619,12 @@ void KisImage::setColorSpace(KisColorSpace * colorSpace) void KisImage::setRootLayer(KisGroupLayerSP rootLayer) { - disconnect(m_rootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + disconnect(m_rootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); m_rootLayer = rootLayer; if (!locked()) { - connect(m_rootLayer, TQT_SIGNAL(sigDirty(TQRect)), this, TQT_SIGNAL(sigImageUpdated(TQRect))); + connect(m_rootLayer, TQ_SIGNAL(sigDirty(TQRect)), this, TQ_SIGNAL(sigImageUpdated(TQRect))); } activate(m_rootLayer->firstChild()); } diff --git a/chalk/core/kis_paint_device.cpp b/chalk/core/kis_paint_device.cpp index da25caecb..c6bc5b820 100644 --- a/chalk/core/kis_paint_device.cpp +++ b/chalk/core/kis_paint_device.cpp @@ -277,7 +277,7 @@ KisPaintDevice::KisPaintDevice(KisLayer *parent, KisColorSpace * colorSpace, con if (!m_longRunningFilters.isEmpty()) { m_longRunningFilterTimer = new TQTimer(this); - connect(m_longRunningFilterTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(runBackgroundFilters())); + connect(m_longRunningFilterTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(runBackgroundFilters())); m_longRunningFilterTimer->start(2000); } } diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cpp b/chalk/plugins/filters/blur/kis_wdg_blur.cpp index d4213bb58..e67afe4cd 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.cpp +++ b/chalk/plugins/filters/blur/kis_wdg_blur.cpp @@ -42,13 +42,13 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name linkSpacingToggled(true); - connect( widget()->bnLinkSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkSpacingToggled( bool ))); - connect( widget()->intHalfWidth, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHalfWidthChanged(int))); - connect( widget()->intHalfHeight, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHalfHeightChanged(int))); + connect( widget()->bnLinkSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkSpacingToggled( bool ))); + connect( widget()->intHalfWidth, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHalfWidthChanged(int))); + connect( widget()->intHalfHeight, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHalfHeightChanged(int))); - connect( widget()->intStrength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intAngle, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->cbShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intStrength, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intAngle, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->cbShape, TQ_SIGNAL( activated(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); } diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cpp b/chalk/plugins/filters/bumpmap/bumpmap.cpp index 9d7712228..de2bc4ffb 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.cpp +++ b/chalk/plugins/filters/bumpmap/bumpmap.cpp @@ -475,19 +475,19 @@ KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev } // Connect all of the widgets to update signal - connect( m_page->radioLinear, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->radioSpherical, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->radioSinusoidal, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkCompensate, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkInvert, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkTiled, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->dblAzimuth, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->dblElevation, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->dblDepth, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intXOffset, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intYOffset, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intWaterLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intAmbient, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->radioLinear, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->radioSpherical, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->radioSinusoidal, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkCompensate, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkInvert, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkTiled, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->dblAzimuth, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->dblElevation, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->dblDepth, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intXOffset, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intYOffset, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intWaterLevel, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intAmbient, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); } KisBumpmapConfiguration * KisBumpmapConfigWidget::config() diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp index ba9e61e06..3a7556ea0 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp @@ -41,17 +41,17 @@ KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent, l->add(m_page); nfilter->setAutoUpdate(false); -// connect( m_page->bnRefresh, TQT_SIGNAL(clicked()), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numDetail, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numGradient, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numTimeStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numBlur, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numBlurIterations, TQT_SIGNAL(valueChanged (int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numAngularStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numIntegralStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numGaussian, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkLinearInterpolation, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkNormalize, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); +// connect( m_page->bnRefresh, TQ_SIGNAL(clicked()), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numDetail, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numGradient, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numTimeStep, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numBlur, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numBlurIterations, TQ_SIGNAL(valueChanged (int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numAngularStep, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numIntegralStep, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numGaussian, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkLinearInterpolation, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkNormalize, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview())); } diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp index 5b03ad70d..1fee1526e 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp +++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp @@ -35,7 +35,7 @@ KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const cha TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorifyBase(this); widgetLayout -> addWidget(m_widget,0,0); - connect( m_widget->colorTarget, TQT_SIGNAL( changed(const TQColor&)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_widget->colorTarget, TQ_SIGNAL( changed(const TQColor&)), TQ_SIGNAL(sigPleaseUpdatePreview())); } void KisWdgColorify::setConfiguration(KisFilterConfiguration* config) diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp index 31b726bf0..6240297c8 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp @@ -35,8 +35,8 @@ KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, c TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorToAlphaBase(this); widgetLayout -> addWidget(m_widget,0,0); - connect( m_widget->colorTarget, TQT_SIGNAL( changed(const TQColor&)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_widget->intThreshold, TQT_SIGNAL( valueChanged ( int value) ), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_widget->colorTarget, TQ_SIGNAL( changed(const TQColor&)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_widget->intThreshold, TQ_SIGNAL( valueChanged ( int value) ), TQ_SIGNAL(sigPleaseUpdatePreview())); } void KisWdgColorToAlpha::setConfiguration(KisFilterConfiguration* config) diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp index 85b63ffb8..29c74cfdb 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp @@ -271,7 +271,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * l->addWidget(m_page, 0, TQt::AlignTop); height = 256; - connect( m_page->kCurve, TQT_SIGNAL(modified()), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->kCurve, TQ_SIGNAL(modified()), TQ_SIGNAL(sigPleaseUpdatePreview())); // Create the horizontal gradient label TQPixmap hgradientpix(256, 1); diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp index 37c0815ea..7256c50af 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp @@ -320,13 +320,13 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * parent, KisPaint l->add(m_page); height = 256; - connect( m_page->kCurve, TQT_SIGNAL(modified()), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->kCurve, TQ_SIGNAL(modified()), TQ_SIGNAL(sigPleaseUpdatePreview())); // Fill in the channel chooser TQValueVector<KisChannelInfo *> channels = dev->colorSpace()->channels(); for(unsigned int val=0; val < dev->colorSpace()->nColorChannels(); val++) m_page->cmbChannel->insertItem(channels.at(val)->name()); - connect( m_page->cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int))); + connect( m_page->cmbChannel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setActiveChannel(int))); // Create the horizontal gradient label TQPixmap hgradientpix(256, 1); diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp index fcffb3def..851ed3f4b 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp @@ -54,10 +54,10 @@ KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigu widgetLayout->addMultiCellWidget(m_ccfcws, 1, 1, 0, 1); -// connect( bnRefresh, TQT_SIGNAL(clicked()), nfilter, TQT_SLOT(refreshPreview())); - connect( m_ccfcws->matrixWidget, TQT_SIGNAL(valueChanged()), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_ccfcws->spinBoxFactor, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_ccfcws->spinBoxOffset, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); +// connect( bnRefresh, TQ_SIGNAL(clicked()), nfilter, TQ_SLOT(refreshPreview())); + connect( m_ccfcws->matrixWidget, TQ_SIGNAL(valueChanged()), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_ccfcws->spinBoxFactor, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_ccfcws->spinBoxOffset, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); } void KisCustomConvolutionFilterConfigurationWidget::setConfiguration(KisFilterConfiguration * cfg) diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp index 49826ccb9..3a2dbaad0 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp @@ -31,7 +31,7 @@ KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgFastColorTransfer(this); widgetLayout -> addWidget(m_widget,0,0); - connect(m_widget->fileNameURLRequester, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(sigPleaseUpdatePreview())); + connect(m_widget->fileNameURLRequester, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(sigPleaseUpdatePreview())); } diff --git a/chalk/plugins/filters/halftone/kis_halftone.cpp b/chalk/plugins/filters/halftone/kis_halftone.cpp index c2c2f4631..1ca2aba37 100644 --- a/chalk/plugins/filters/halftone/kis_halftone.cpp +++ b/chalk/plugins/filters/halftone/kis_halftone.cpp @@ -113,7 +113,7 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( src->colorSpace()->mathToolboxID() ); setProgressTotalSteps(mathToolbox->fastWaveletTotalSteps(rect) * 2 + size*size*depth ); - connect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); + connect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress())); kdDebug(41005) << size << " " << maxrectsize << " " << rect.x() << " " << rect.y() << endl; @@ -184,7 +184,7 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K delete wav; delete blurwav; delete buff; - disconnect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); + disconnect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress())); setProgressDone(); // Must be called even if you don't really support progression } diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp index e5cca62ed..f1d71404e 100644 --- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp +++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp @@ -77,7 +77,7 @@ void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP ds KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( src->colorSpace()->mathToolboxID() ); setProgressTotalSteps(mathToolbox->fastWaveletTotalSteps(rect) * 2 + size*size*depth ); - connect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); + connect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress())); kdDebug(41005) << size << " " << maxrectsize << " " << rect.x() << " " << rect.y() << endl; @@ -124,7 +124,7 @@ void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP ds delete wav; delete buff; - disconnect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); + disconnect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress())); setProgressDone(); // Must be called even if you don't really support progression } diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp index b83baa116..b33eeadd8 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp @@ -33,11 +33,11 @@ KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* par m_widget = new WdgLensCorrectionOptions(this); widgetLayout -> addWidget(m_widget, 0, 0); - connect( widget()->intXCenter, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intYCenter, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->dblCorrectionNearCenter, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->dblCorrectionNearEdges, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->dblBrightness, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intXCenter, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intYCenter, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->dblCorrectionNearCenter, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->dblCorrectionNearEdges, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->dblBrightness, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview())); } KisWdgLensCorrection::~KisWdgLensCorrection() diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cpp b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp index 3d27e6e68..9e85b6bc5 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.cpp +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp @@ -225,29 +225,29 @@ KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP d TQ_CHECK_PTR(l); l->addWidget(m_page, 0, TQt::AlignTop); - connect( m_page->blackspin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->ingradient, TQT_SIGNAL(modifiedGamma(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->blackspin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->whitespin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->ingradient, TQ_SIGNAL(modifiedGamma(double)), TQ_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->blackspin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyBlack(int))); - connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyWhite(int))); - //connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyGamma())); + connect( m_page->blackspin, TQ_SIGNAL(valueChanged(int)), m_page->ingradient, TQ_SLOT(modifyBlack(int))); + connect( m_page->whitespin, TQ_SIGNAL(valueChanged(int)), m_page->ingradient, TQ_SLOT(modifyWhite(int))); + //connect( m_page->whitespin, TQ_SIGNAL(valueChanged(int)), m_page->ingradient, TQ_SLOT(modifyGamma())); - connect( m_page->ingradient, TQT_SIGNAL(modifiedBlack(int)), m_page->blackspin, TQT_SLOT(setValue(int))); - connect( m_page->ingradient, TQT_SIGNAL(modifiedWhite(int)), m_page->whitespin, TQT_SLOT(setValue(int))); - connect( m_page->ingradient, TQT_SIGNAL(modifiedGamma(double)), m_page->gammaspin, TQT_SLOT(setNum(double))); + connect( m_page->ingradient, TQ_SIGNAL(modifiedBlack(int)), m_page->blackspin, TQ_SLOT(setValue(int))); + connect( m_page->ingradient, TQ_SIGNAL(modifiedWhite(int)), m_page->whitespin, TQ_SLOT(setValue(int))); + connect( m_page->ingradient, TQ_SIGNAL(modifiedGamma(double)), m_page->gammaspin, TQ_SLOT(setNum(double))); - connect( m_page->outblackspin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->outwhitespin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->outblackspin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->outwhitespin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->outblackspin, TQT_SIGNAL(valueChanged(int)), m_page->outgradient, TQT_SLOT(modifyBlack(int))); - connect( m_page->outwhitespin, TQT_SIGNAL(valueChanged(int)), m_page->outgradient, TQT_SLOT(modifyWhite(int))); + connect( m_page->outblackspin, TQ_SIGNAL(valueChanged(int)), m_page->outgradient, TQ_SLOT(modifyBlack(int))); + connect( m_page->outwhitespin, TQ_SIGNAL(valueChanged(int)), m_page->outgradient, TQ_SLOT(modifyWhite(int))); - connect( m_page->outgradient, TQT_SIGNAL(modifiedBlack(int)), m_page->outblackspin, TQT_SLOT(setValue(int))); - connect( m_page->outgradient, TQT_SIGNAL(modifiedWhite(int)), m_page->outwhitespin, TQT_SLOT(setValue(int))); + connect( m_page->outgradient, TQ_SIGNAL(modifiedBlack(int)), m_page->outblackspin, TQ_SLOT(setValue(int))); + connect( m_page->outgradient, TQ_SIGNAL(modifiedWhite(int)), m_page->outwhitespin, TQ_SLOT(setValue(int))); - connect( (TQObject*)(m_page->chkLogarithmic), TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(drawHistogram(bool))); + connect( (TQObject*)(m_page->chkLogarithmic), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(drawHistogram(bool))); KisHistogramProducerSP producer = new KisGenericLabHistogramProducer(); histogram = new KisHistogram(dev, producer, LINEAR); diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp index c13db9527..38dcc5526 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp @@ -33,8 +33,8 @@ KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* parent, const char* n m_widget = new WdgNoiseOptions(this); widgetLayout -> addWidget(m_widget,0,0); - connect( widget()->intLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intOpacity, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intLevel, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intOpacity, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); } KisWdgNoise::~KisWdgNoise() diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp index ba157e14d..2b0f63e8c 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp @@ -33,9 +33,9 @@ KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* parent, con m_widget = new WdgRandomPickOptions(this); widgetLayout -> addWidget(m_widget,0,0); - connect( widget()->intLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intWindowSize, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intOpacity, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intLevel, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intWindowSize, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intOpacity, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); } KisWdgRandomPick::~KisWdgRandomPick() diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp index 627d105cf..744ec49ae 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp @@ -36,9 +36,9 @@ KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * parent, const char * name) m_widget = new WdgUnsharp(this); widgetLayout -> addWidget(m_widget,0,0); - connect( widget()->intHalfSize, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->doubleAmount, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intThreshold, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHalfSize, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->doubleAmount, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intThreshold, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); } void KisWdgUnsharp::setConfiguration(KisFilterConfiguration* config) diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp index 346ff44a1..6788f294a 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp @@ -34,14 +34,14 @@ KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* parent, const char* nam m_widget = new WdgWaveOptions(this); widgetLayout -> addWidget(m_widget, 0, 0); - connect( widget()->intHWavelength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intHShift, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intHAmplitude, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->cbHShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intVWavelength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intVShift, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intVAmplitude, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->cbVShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHWavelength, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHShift, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHAmplitude, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->cbHShape, TQ_SIGNAL( activated(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intVWavelength, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intVShift, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intVAmplitude, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->cbVShape, TQ_SIGNAL( activated(int)), TQ_SIGNAL(sigPleaseUpdatePreview())); } KisWdgWave::~KisWdgWave() diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp index 285b4d6fc..5b8680a61 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp @@ -70,7 +70,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent) TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded - connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); + connect(moreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCustomCurves())); m_customSize = false; m_customOpacity = false; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp index 3a2a22842..905ceb15b 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp @@ -79,7 +79,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet) TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded - connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); + connect(moreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCustomCurves())); } else { m_pressureVariation = 0; m_size = 0; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp index 96e262022..8ceab02c0 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp @@ -55,7 +55,7 @@ KisToolBrush::KisToolBrush() m_timer = new TQTimer(this); TQ_CHECK_PTR(m_timer); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutPaint())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutPaint())); } @@ -115,7 +115,7 @@ void KisToolBrush::setup(TDEActionCollection *collection) if (m_action == 0) { m_action = new TDERadioAction(i18n("&Brush"), "tool_freehand", TQt::Key_B, this, - TQT_SLOT(activate()), collection, + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw freehand")); m_action->setExclusiveGroup("tools"); @@ -152,7 +152,7 @@ TQWidget* KisToolBrush::createOptionWidget(TQWidget* parent) TQWidget *widget = super::createOptionWidget(parent); m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect"); m_chkDirect->setChecked(true); - connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int))); + connect(m_chkDirect, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotSetPaintingMode(int))); m_optionLayout = new TQGridLayout(NULL, 3, 2, 0, 6); TQ_CHECK_PTR(m_optionLayout); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp index 6130aa217..57fa86f73 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp @@ -214,7 +214,7 @@ void KisToolColorPicker::setup(TDEActionCollection *collection) m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new TDERadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Color picker")); m_action->setExclusiveGroup("tools"); m_ownAction = true; @@ -235,12 +235,12 @@ TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent) m_optionsWidget->listViewChannels->setSorting(-1); - connect(m_optionsWidget->cbUpdateCurrentColour, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetUpdateColor(bool))); - connect(m_optionsWidget->cbNormaliseValues, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetNormaliseValues(bool))); - connect(m_optionsWidget->cbPalette, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSetAddPalette(bool))); - connect(m_optionsWidget->radius, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChangeRadius(int))); + connect(m_optionsWidget->cbUpdateCurrentColour, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetUpdateColor(bool))); + connect(m_optionsWidget->cbNormaliseValues, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetNormaliseValues(bool))); + connect(m_optionsWidget->cbPalette, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSetAddPalette(bool))); + connect(m_optionsWidget->radius, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChangeRadius(int))); KisResourceServerBase* srv = KisResourceServerRegistry::instance()->get("PaletteServer"); @@ -258,7 +258,7 @@ TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent) } } - connect(srv, TQT_SIGNAL(resourceAdded(KisResource*)), this, TQT_SLOT(slotAddPalette(KisResource*))); + connect(srv, TQ_SIGNAL(resourceAdded(KisResource*)), this, TQ_SLOT(slotAddPalette(KisResource*))); return m_optionsWidget; } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp index 0f917e7f7..ca7dfd1ed 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp @@ -90,7 +90,7 @@ void KisToolDuplicate::setup(TDEActionCollection *collection) if (m_action == 0) { m_action = new TDERadioAction(i18n("&Duplicate Brush"), "tool_duplicate", TQt::Key_C, this, - TQT_SLOT(activate()), collection, + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Duplicate parts of the image. Shift-click to select the point to duplicate from to begin.")); m_action->setExclusiveGroup("tools"); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp index 0dc53a5b6..284cb5035 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp @@ -174,7 +174,7 @@ void KisToolEllipse::setup(TDEActionCollection *collection) "tool_ellipse", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw an ellipse")); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp index 3c9b60386..7ac91b2e8 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp @@ -167,19 +167,19 @@ TQWidget* KisToolFill::createOptionWidget(TQWidget* parent) m_slThreshold->setRange( 1, 100); m_slThreshold->setSteps( 3, 3); m_slThreshold->setValue(m_threshold); - connect(m_slThreshold, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetThreshold(int))); + connect(m_slThreshold, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetThreshold(int))); m_checkUsePattern = new TQCheckBox(i18n("Use pattern"), widget); m_checkUsePattern->setChecked(m_usePattern); - connect(m_checkUsePattern, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetUsePattern(bool))); + connect(m_checkUsePattern, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetUsePattern(bool))); m_checkSampleMerged = new TQCheckBox(i18n("Limit to current layer"), widget); m_checkSampleMerged->setChecked(m_unmerged); - connect(m_checkSampleMerged, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetSampleMerged(bool))); + connect(m_checkSampleMerged, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetSampleMerged(bool))); m_checkFillSelection = new TQCheckBox(i18n("Fill entire selection"), widget); m_checkFillSelection->setChecked(m_fillOnlySelection); - connect(m_checkFillSelection, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFillSelection(bool))); + connect(m_checkFillSelection, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFillSelection(bool))); addOptionWidgetOption(m_slThreshold, m_lbThreshold); @@ -221,7 +221,7 @@ void KisToolFill::setup(TDEActionCollection *collection) "tool_color_fill", TQt::Key_F, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Contiguous fill")); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp index c0543c6a8..bdf93bdf1 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp @@ -235,10 +235,10 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) m_lbRepeat = new TQLabel(i18n("Repeat:"), widget); m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check"); - connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool))); + connect(m_ckReverse, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetReverse(bool))); m_cmbShape = new TQComboBox(false, widget, "shape_combo"); - connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int))); + connect(m_cmbShape, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetShape(int))); m_cmbShape->insertItem(i18n("Linear")); m_cmbShape->insertItem(i18n("Bi-Linear")); m_cmbShape->insertItem(i18n("Radial")); @@ -247,7 +247,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) m_cmbShape->insertItem(i18n("Conical Symmetric")); m_cmbRepeat = new TQComboBox(false, widget, "repeat_combo"); - connect(m_cmbRepeat, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetRepeat(int))); + connect(m_cmbRepeat, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetRepeat(int))); m_cmbRepeat->insertItem(i18n("None")); m_cmbRepeat->insertItem(i18n("Forwards")); m_cmbRepeat->insertItem(i18n("Alternating")); @@ -263,7 +263,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) m_slAntiAliasThreshold = new KDoubleNumInput(widget, "threshold_slider"); m_slAntiAliasThreshold->setRange( 0, 1); m_slAntiAliasThreshold->setValue(m_antiAliasThreshold); - connect(m_slAntiAliasThreshold, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetAntiAliasThreshold(double))); + connect(m_slAntiAliasThreshold, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotSetAntiAliasThreshold(double))); addOptionWidgetOption(m_slAntiAliasThreshold, m_lbAntiAliasThreshold); @@ -297,7 +297,7 @@ void KisToolGradient::setup(TDEActionCollection *collection) if (m_action == 0) { m_action = new TDERadioAction(i18n("&Gradient"), "tool_gradient", TQt::Key_G, this, - TQT_SLOT(activate()), collection, + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw a gradient")); m_action->setExclusiveGroup("tools"); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cpp b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp index e9e303a64..2d0328eb0 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp @@ -238,7 +238,7 @@ void KisToolLine::setup(TDEActionCollection *collection) if (m_action == 0) { m_action = new TDERadioAction(i18n("&Line"), "tool_line", TQt::Key_L, this, - TQT_SLOT(activate()), collection, + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw a line")); m_action->setExclusiveGroup("tools"); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cpp b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp index 1bcd51350..40ebcc033 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_move.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp @@ -46,7 +46,7 @@ KisToolMove::KisToolMove() setCursor(KisCursor::moveCursor()); m_repeatTimer = new TQTimer(this); - connect( m_repeatTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotMove() ) ); + connect( m_repeatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotMove() ) ); } KisToolMove::~KisToolMove() @@ -104,7 +104,7 @@ void KisToolMove::setup(TDEActionCollection *collection) "tool_move", TQt::SHIFT+TQt::Key_V, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Move")); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp index d96c820f5..b77d66c7c 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp @@ -85,7 +85,7 @@ void KisToolPan::setup(TDEActionCollection *collection) m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new TDERadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Pan")); m_action->setExclusiveGroup("tools"); m_ownAction = true; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp index 0106b769d..8c02b0784 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp @@ -175,7 +175,7 @@ void KisToolRectangle::setup(TDEActionCollection *collection) "tool_rectangle", TQt::Key_F6, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw a rectangle")); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp index 6fb079406..2e77c0c01 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp @@ -170,7 +170,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent) .arg(m_font.pointSize()), fontBox); m_btnMoreFonts = new TQPushButton("...", fontBox); - connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont())); + connect(m_btnMoreFonts, TQ_SIGNAL(released()), this, TQ_SLOT(setFont())); addOptionWidgetOption(fontBox, m_lbFont); @@ -186,7 +186,7 @@ void KisToolText::setup(TDEActionCollection *collection) "tool_text", TQt::SHIFT+TQt::Key_T, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); m_action->setExclusiveGroup("tools"); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp index 77cdd336d..bd5b4a729 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp @@ -46,7 +46,7 @@ KisToolZoom::KisToolZoom() m_plusCursor = KisCursor::load("tool_zoom_plus_cursor.png", 8, 8); m_minusCursor = KisCursor::load("tool_zoom_minus_cursor.png", 8, 8); setCursor(m_plusCursor); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimer())); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimer())); } KisToolZoom::~KisToolZoom() @@ -181,7 +181,7 @@ void KisToolZoom::setup(TDEActionCollection *collection) m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new TDERadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Zoom")); m_action->setExclusiveGroup("tools"); m_ownAction = true; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp index c89702f9d..6a5e90e0c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp @@ -211,7 +211,7 @@ void KisToolMoveSelection::setup(TDEActionCollection *collection) "tool_move", TQt::SHIFT+TQt::Key_V, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Move the selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp index ba80434f3..75212cf63 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp @@ -134,7 +134,7 @@ void KisToolSelectBrush::setup(TDEActionCollection *collection) if (m_action == 0) { m_action = new TDERadioAction(i18n("&Selection Brush"), "tool_brush_selection", "Ctrl+Shift+B", this, - TQT_SLOT(activate()), collection, + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); m_action->setToolTip(i18n("Paint a selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp index bf24775d8..d186dad55 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp @@ -146,7 +146,7 @@ void KisToolSelectContiguous::setup(TDEActionCollection *collection) "tool_contiguous_selection" , 0, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); @@ -192,7 +192,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->setSpacing( 6 ); - connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); + connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int))); TQHBoxLayout * hbox = new TQHBoxLayout(l); TQ_CHECK_PTR(hbox); @@ -206,13 +206,13 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) input->setRange(0, 200, 10, true); input->setValue(20); hbox->addWidget(input); - connect(input, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetFuzziness(int))); + connect(input, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetFuzziness(int))); TQCheckBox* samplemerged = new TQCheckBox(i18n("Sample merged"), m_optWidget); l->addWidget( samplemerged ); samplemerged->setChecked(m_sampleMerged); - connect(samplemerged, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(slotSetSampleMerged(int))); + connect(samplemerged, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(slotSetSampleMerged(int))); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp index 0d632c423..e90360a44 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp @@ -287,7 +287,7 @@ void KisToolSelectElliptical::setup(TDEActionCollection *collection) "tool_elliptical_selection" , TQt::Key_J, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); @@ -303,7 +303,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent) TQ_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Elliptical Selection")); - connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); + connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int))); TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp index 9cfef0a80..91abc07a5 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp @@ -121,7 +121,7 @@ void KisToolSelectEraser::setup(TDEActionCollection *collection) if (m_action == 0) { m_action = new TDERadioAction(i18n("Selection &Eraser"), "tool_eraser_selection", "Ctrl+Shift+E", this, - TQT_SLOT(activate()), collection, + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); m_action->setToolTip(i18n("Erase parts of a selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp index 2507cb569..37930042c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp @@ -256,7 +256,7 @@ void KisToolSelectOutline::setup(TDEActionCollection *collection) "tool_outline_selection", 0, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); @@ -273,7 +273,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent) TQ_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Outline Selection")); - connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); + connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int))); TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp index 464e4b0af..902e80d78 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp @@ -275,7 +275,7 @@ void KisToolSelectPolygonal::setup(TDEActionCollection *collection) "tool_polygonal_selection" , 0, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); @@ -292,7 +292,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent) TQ_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Polygonal Selection")); - connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); + connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int))); TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp index b52ec5635..62cf8f66d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp @@ -288,7 +288,7 @@ void KisToolSelectRectangular::setup(TDEActionCollection *collection) "tool_rect_selection", TQt::Key_R, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); @@ -304,7 +304,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent) TQ_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Rectangular Selection")); - connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); + connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int))); TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp index 8826de3dd..c7f619c18 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp @@ -703,13 +703,13 @@ TQWidget* KisToolCrop::createOptionWidget(TQWidget* parent) m_optWidget = new WdgToolCrop(parent); TQ_CHECK_PTR(m_optWidget); - connect(m_optWidget->bnCrop, TQT_SIGNAL(clicked()), this, TQT_SLOT(crop())); + connect(m_optWidget->bnCrop, TQ_SIGNAL(clicked()), this, TQ_SLOT(crop())); - connect(m_optWidget->intX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropX(int))); - connect(m_optWidget->intY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropY(int))); - connect(m_optWidget->intWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropWidth(int))); - connect(m_optWidget->intHeight, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropHeight(int))); - connect(m_optWidget->doubleRatio, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(setRatio( double ))); + connect(m_optWidget->intX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropX(int))); + connect(m_optWidget->intY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropY(int))); + connect(m_optWidget->intWidth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropWidth(int))); + connect(m_optWidget->intHeight, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropHeight(int))); + connect(m_optWidget->doubleRatio, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(setRatio( double ))); return m_optWidget; } @@ -728,7 +728,7 @@ void KisToolCrop::setup(TDEActionCollection *collection) "tool_crop", 0, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp index a8d1514be..208b4baea 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp @@ -101,7 +101,7 @@ void KisToolBezierPaint::setup(TDEActionCollection *collection) "tool_bezier_paint", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp index 657358609..94000ebcc 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp @@ -90,7 +90,7 @@ void KisToolBezierSelect::setup(TDEActionCollection *collection) "tool_bezier_select", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp index b4369d153..69cd5d05e 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp @@ -574,7 +574,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent) TQ_CHECK_PTR(m_optWidget); m_optWidget->setCaption(m_UIName); - connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); + connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int))); TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cpp b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp index a21bb8089..775e4e93f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.cpp +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp @@ -94,7 +94,7 @@ void KisToolExample::setup(TDEActionCollection *collection) "tool_example", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp index 1412f5fad..63e3f87fb 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp @@ -773,8 +773,8 @@ TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) TQPushButton *finish = new TQPushButton(i18n("To Selection"), m_optWidget); m_slDistance = new TQSlider(MINDIST, MAXDIST, PAGESTEP, m_distance, TQt::Horizontal, m_optWidget); - connect(m_slDistance, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDistance(int))); - connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCommitCurve())); + connect(m_slDistance, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetDistance(int))); + connect(finish, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCommitCurve())); box->addWidget(m_lbDistance, 0, 0); box->addWidget(m_slDistance, 0, 1); @@ -795,7 +795,7 @@ void KisToolMagnetic::setup(TDEActionCollection *collection) "tool_moutline", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp index 14e2d6168..04146c0e2 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp @@ -67,7 +67,7 @@ void KisToolFilter::setup(TDEActionCollection *collection) if (m_action == 0) { m_action = new TDERadioAction(i18n("&Filter Brush"), "tool_filter", 0, this, - TQT_SLOT(activate()), collection, + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); m_action->setToolTip(i18n("Paint with filters")); @@ -124,7 +124,7 @@ TQWidget* KisToolFilter::createOptionWidget(TQWidget* parent) TQ_CHECK_PTR(m_optionLayout); super::addOptionWidgetLayout(m_optionLayout); - connect(m_cbFilter, TQT_SIGNAL(activated ( const KisID& )), this, TQT_SLOT( changeFilter( const KisID& ) ) ); + connect(m_cbFilter, TQ_SIGNAL(activated ( const KisID& )), this, TQ_SLOT( changeFilter( const KisID& ) ) ); changeFilter( m_cbFilter->currentItem () ); return widget; diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp index e676ba56f..fc715e072 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp @@ -474,7 +474,7 @@ void KisToolPerspectiveGrid::setup(TDEActionCollection *collection) "tool_perspectivegrid" , 0, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp index 19451d945..8d63c65c9 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp @@ -157,7 +157,7 @@ void KisToolPerspectiveTransform::deactivate() paintOutline(); - disconnect(m_subject->currentImg().data(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); + disconnect(m_subject->currentImg().data(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolPerspectiveTransform::activate() @@ -196,7 +196,7 @@ void KisToolPerspectiveTransform::activate() initHandles(); } } - connect(m_subject->currentImg(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); + connect(m_subject->currentImg(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolPerspectiveTransform::initHandles() @@ -691,17 +691,17 @@ TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*parent*/) m_optWidget->cmbFilter->setIDList(KisFilterStrategyRegistry::instance()->listKeys()); m_optWidget->cmbFilter->setCurrentText("Mitchell"); - connect(m_optWidget->cmbFilter, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(slotSetFilter(const KisID &))); + connect(m_optWidget->cmbFilter, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(slotSetFilter(const KisID &))); KisID filterID = m_optWidget->cmbFilter->currentItem(); m_filter = KisFilterStrategyRegistry::instance()->get(filterID); /* - connect(m_optWidget->intStartX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartX(int))); - connect(m_optWidget->intStartY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartY(int))); - connect(m_optWidget->intEndX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndX(int))); - connect(m_optWidget->intEndY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndY(int))); + connect(m_optWidget->intStartX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartX(int))); + connect(m_optWidget->intStartY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartY(int))); + connect(m_optWidget->intEndX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndX(int))); + connect(m_optWidget->intEndY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndY(int))); */ m_optWidget->intStartX->hide(); m_optWidget->intStartY->hide(); @@ -729,7 +729,7 @@ void KisToolPerspectiveTransform::setup(TDEActionCollection *collection) "tool_perspectivetransform", 0, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp index 3457d2782..1948de1bc 100644 --- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp +++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp @@ -227,7 +227,7 @@ void KisToolPolygon::setup(TDEActionCollection *collection) "tool_polygon", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp index 594f1cf96..d4fc88034 100644 --- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp +++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp @@ -242,7 +242,7 @@ void KisToolPolyline::setup(TDEActionCollection *collection) "polyline", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp index 3a5182b42..62f014d98 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp @@ -97,7 +97,7 @@ KisToolSelectSimilar::KisToolSelectSimilar() m_fuzziness = 20; m_currentSelectAction = m_defaultSelectAction = SELECTION_ADD; m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimer()) ); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimer()) ); } KisToolSelectSimilar::~KisToolSelectSimilar() @@ -202,7 +202,7 @@ void KisToolSelectSimilar::setup(TDEActionCollection *collection) m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new TDERadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); m_action->setToolTip(i18n("Select similar colors")); m_action->setExclusiveGroup("tools"); @@ -240,7 +240,7 @@ TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* parent) TQ_CHECK_PTR(m_selectionOptionsWidget); l->addWidget(m_selectionOptionsWidget); - connect (m_selectionOptionsWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); + connect (m_selectionOptionsWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int))); TQHBoxLayout * hbox = new TQHBoxLayout(l); TQ_CHECK_PTR(hbox); @@ -256,7 +256,7 @@ TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* parent) input->setRange(0, 200, 10, true); input->setValue(20); hbox->addWidget(input); - connect(input, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetFuzziness(int))); + connect(input, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetFuzziness(int))); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cpp b/chalk/plugins/tools/tool_star/kis_tool_star.cpp index 601bb775f..93587658d 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cpp +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cpp @@ -184,7 +184,7 @@ void KisToolStar::setup(TDEActionCollection *collection) "tool_star", shortcut, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp index 198410673..fc0c9bb46 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp @@ -181,7 +181,7 @@ void KisToolTransform::deactivate() paintOutline(); - disconnect(m_subject->currentImg().data(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); + disconnect(m_subject->currentImg().data(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolTransform::activate() @@ -222,7 +222,7 @@ void KisToolTransform::activate() initHandles(); } } - connect(m_subject->currentImg(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); + connect(m_subject->currentImg(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolTransform::initHandles() @@ -866,17 +866,17 @@ TQWidget* KisToolTransform::createOptionWidget(TQWidget* parent) m_optWidget->cmbFilter->setIDList(KisFilterStrategyRegistry::instance()->listKeys()); m_optWidget->cmbFilter->setCurrentText("Mitchell"); - connect(m_optWidget->cmbFilter, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(slotSetFilter(const KisID &))); + connect(m_optWidget->cmbFilter, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(slotSetFilter(const KisID &))); KisID filterID = m_optWidget->cmbFilter->currentItem(); m_filter = KisFilterStrategyRegistry::instance()->get(filterID); /* - connect(m_optWidget->intStartX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartX(int))); - connect(m_optWidget->intStartY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartY(int))); - connect(m_optWidget->intEndX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndX(int))); - connect(m_optWidget->intEndY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndY(int))); + connect(m_optWidget->intStartX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartX(int))); + connect(m_optWidget->intStartY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartY(int))); + connect(m_optWidget->intEndX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndX(int))); + connect(m_optWidget->intEndY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndY(int))); */ m_optWidget->intStartX->hide(); m_optWidget->intStartY->hide(); @@ -903,7 +903,7 @@ void KisToolTransform::setup(TDEActionCollection *collection) "tool_transform", 0, this, - TQT_SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cpp b/chalk/plugins/viewplugins/colorrange/colorrange.cpp index be0648bab..722467d21 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.cpp +++ b/chalk/plugins/viewplugins/colorrange/colorrange.cpp @@ -58,7 +58,7 @@ ColorRange::ColorRange(TQObject *parent, const char *name, const TQStringList &) setInstance(ColorRangeFactory::instance()); setXMLFile(locate("data","chalkplugins/colorrange.rc"), true); m_view = dynamic_cast<KisView*>(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") ); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Color Range..."), 0, 0, this, TQ_SLOT(slotActivated()), actionCollection(), "colorrange") ); } } diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp index b6b528606..55a582048 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp @@ -201,29 +201,29 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * m_mode = SELECTION_ADD; m_currentAction = REDS; - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); - connect(this, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(cancelClicked())); + connect(this, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(cancelClicked())); - connect(m_page->chkInvert, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInvertClicked())); + connect(m_page->chkInvert, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInvertClicked())); - connect(m_page->cmbSelect, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSelectionTypeChanged(int))); + connect(m_page->cmbSelect, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSelectionTypeChanged(int))); - connect (m_page->radioAdd, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAdd(bool))); + connect (m_page->radioAdd, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAdd(bool))); - connect (m_page->radioSubtract, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSubtract(bool))); + connect (m_page->radioSubtract, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSubtract(bool))); - connect (m_page->bnSelect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectClicked())); + connect (m_page->bnSelect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectClicked())); - connect (m_page->bnDeselect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeselectClicked())); + connect (m_page->bnDeselect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeselectClicked())); } diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp index 377f0569d..50702d80f 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp @@ -69,8 +69,8 @@ ColorSpaceConversion::ColorSpaceConversion(TQObject *parent, const char *name, c setInstance(ColorSpaceConversionFactory::instance()); setXMLFile(locate("data","chalkplugins/colorspaceconversion.rc"), true); - (void) new TDEAction(i18n("&Convert Image Type..."), 0, 0, this, TQT_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); - (void) new TDEAction(i18n("&Convert Layer Type..."), 0, 0, this, TQT_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); + (void) new TDEAction(i18n("&Convert Image Type..."), 0, 0, this, TQ_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); + (void) new TDEAction(i18n("&Convert Layer Type..."), 0, 0, this, TQ_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); } } diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp index 259c6f470..3d2cecfd6 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp @@ -53,12 +53,12 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * parent, fillCmbDestProfile(m_page->cmbColorSpaces->currentItem()); - connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbDestProfile(const KisID &))); + connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbDestProfile(const KisID &))); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp index c82bbbad6..0e4e4335b 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp @@ -58,8 +58,8 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, m_page->opacitySpinBox->setValue( cfg->readNumEntry("dropshadow_opacity", 80 ) ); m_page->allowResizingCheckBox->setChecked( cfg->readBoolEntry("dropshadow_resizing", true ) ); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } DlgDropshadow::~DlgDropshadow() diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp index 97a0b8a7a..5f79231ae 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp @@ -48,7 +48,7 @@ KisDropshadowPlugin::KisDropshadowPlugin(TQObject *parent, const char *name, con setXMLFile(locate("data","chalkplugins/dropshadow.rc"), true); m_view = (KisView*) parent; - (void) new TDEAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); + (void) new TDEAction(i18n("Add Drop Shadow..."), 0, 0, this, TQ_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); } } diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp index 337b55c02..f469c667d 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp @@ -59,7 +59,7 @@ ChalkFiltersGallery::ChalkFiltersGallery(TQObject *parent, const char *name, con m_view = (KisView*) parent; - (void) new TDEAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery"); + (void) new TDEAction(i18n("&Filters Gallery"), 0, 0, this, TQ_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery"); // Add a docker with the list of filters // TQImage img; diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp index 255b8b8d0..58ca6a506 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp @@ -53,7 +53,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const setMainWidget(m_widget); // Initialize filters list - connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); + connect(m_widget->filtersList , TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(selectionHasChanged(TQIconViewItem* ))); // Initialize configWidgetHolder m_widget->configWidgetHolder->setColumnLayout ( 0, TQt::Horizontal ); //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); @@ -63,7 +63,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const { m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() ); } - connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + connect( m_widget->previewWidget, TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview())); resize( minimumSizeHint()); m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); @@ -97,7 +97,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); - connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); + connect(m_currentConfigWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged())); } else { m_labelNoCW->show(); diff --git a/chalk/plugins/viewplugins/histogram/histogram.cpp b/chalk/plugins/viewplugins/histogram/histogram.cpp index 8252a98db..d8b95640e 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.cpp +++ b/chalk/plugins/viewplugins/histogram/histogram.cpp @@ -61,18 +61,18 @@ Histogram::Histogram(TQObject *parent, const char *name, const TQStringList &) setInstance(HistogramFactory::instance()); setXMLFile(locate("data","chalkplugins/histogram.rc"), true); - m_action = new TDEAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram"); + m_action = new TDEAction(i18n("&Histogram"), 0, 0, this, TQ_SLOT(slotActivated()), actionCollection(), "histogram"); m_view = (KisView*) parent; if (KisImageSP img = m_view->canvasSubject()->currentImg()) { - connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged())); - connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); - connect(img, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); - connect(img, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); - connect(img, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(slotLayersChanged())); - connect(img, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(slotLayersChanged())); + connect(img, TQ_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQ_SLOT(slotLayersChanged())); + connect(img, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQ_SLOT(slotLayersChanged())); + connect(img, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayersChanged())); + connect(img, TQ_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, TQ_SLOT(slotLayersChanged())); + connect(img, TQ_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(slotLayersChanged())); + connect(img, TQ_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(slotLayersChanged())); m_img = img; } } diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp index c49838706..b3d3353a8 100644 --- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp +++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp @@ -72,11 +72,11 @@ void KisHistogramWidget::setPaintDevice(KisPaintDeviceSP dev) m_from = m_histogramView->currentProducer()->viewFrom(); m_width = m_histogramView->currentProducer()->viewWidth(); - connect(grpType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTypeSwitched(int))); - connect(cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int))); - connect(zoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomIn())); - connect(zoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOut())); - connect(currentView, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slide(int))); + connect(grpType, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotTypeSwitched(int))); + connect(cmbChannel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setActiveChannel(int))); + connect(zoomIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomIn())); + connect(zoomOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomOut())); + connect(currentView, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slide(int))); } void KisHistogramWidget::setActiveChannel(int channel) diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp index 25a7b9cff..0ba11d4ab 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp @@ -76,14 +76,14 @@ ChalkHistogramDocker::ChalkHistogramDocker(TQObject *parent, const char *name, c m_hview->setCaption(i18n("Histogram")); - connect(m_hview, TQT_SIGNAL(rightClicked(const TQPoint&)), - this, TQT_SLOT(popupMenu(const TQPoint&))); - connect(m_cache, TQT_SIGNAL(cacheUpdated()), - new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated())); - connect(&m_popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(producerChanged(int))); - connect(img, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace*)), - this, TQT_SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here + connect(m_hview, TQ_SIGNAL(rightClicked(const TQPoint&)), + this, TQ_SLOT(popupMenu(const TQPoint&))); + connect(m_cache, TQ_SIGNAL(cacheUpdated()), + new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQ_SLOT(updated())); + connect(&m_popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(producerChanged(int))); + connect(img, TQ_SIGNAL(sigColorSpaceChanged(KisColorSpace*)), + this, TQ_SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here // Add it to the control palette m_view->canvasSubject()->paletteManager()->addWidget( @@ -143,8 +143,8 @@ void ChalkHistogramDocker::producerChanged(int pos) m_hview->setColor(true); m_hview->setCurrentChannels(m_producer, m_producer->channels()); - connect(m_cache, TQT_SIGNAL(cacheUpdated()), - new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated())); + connect(m_cache, TQ_SIGNAL(cacheUpdated()), + new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQ_SLOT(updated())); } } @@ -175,7 +175,7 @@ HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*parent*/, KisHistogra KisAccumulatingHistogramProducer* p) : m_histogram(h), m_view(v), m_producer(p) { - connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(completed())); + connect(p, TQ_SIGNAL(completed()), this, TQ_SLOT(completed())); } void HistogramDockerUpdater::updated() { diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp index 19599cd9c..a4df2688d 100644 --- a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp +++ b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp @@ -47,11 +47,11 @@ KisImageRasteredCache::KisImageRasteredCache(KisView* view, Observer* o) imageSizeChanged(img->width(), img->height()); - connect(img, TQT_SIGNAL(sigImageUpdated(TQRect)), - this, TQT_SLOT(imageUpdated(TQRect))); - connect(img, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), - this, TQT_SLOT(imageSizeChanged(TQ_INT32, TQ_INT32))); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut())); + connect(img, TQ_SIGNAL(sigImageUpdated(TQRect)), + this, TQ_SLOT(imageUpdated(TQRect))); + connect(img, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), + this, TQ_SLOT(imageSizeChanged(TQ_INT32, TQ_INT32))); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeOut())); } KisImageRasteredCache::~KisImageRasteredCache() { @@ -140,7 +140,7 @@ void KisImageRasteredCache::timeOut() { // If there are still elements, we need to be called again (this emulates processEvents) if (!m_queue.isEmpty()) { - TQTimer::singleShot(0, this, TQT_SLOT(timeOut())); + TQTimer::singleShot(0, this, TQ_SLOT(timeOut())); } else { emit cacheUpdated(); m_imageProjection = 0; diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp index c455af8cc..8800c08c0 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp @@ -63,8 +63,8 @@ DlgImageSize::DlgImageSize( TQWidget * parent, unblockAll(); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } @@ -259,17 +259,17 @@ void DlgImageSize::blockAll() void DlgImageSize::unblockAll() { // XXX: more efficient to use blockSignals? - connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotWidthPixelsChanged(int))); + connect (m_page->intWidth, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotWidthPixelsChanged(int))); - connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotHeightPixelsChanged(int))); + connect (m_page->intHeight, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotHeightPixelsChanged(int))); - connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotWidthPercentChanged(int))); + connect (m_page->intWidthPercent, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotWidthPercentChanged(int))); - connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotHeightPercentChanged(int))); + connect (m_page->intHeightPercent, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotHeightPercentChanged(int))); } diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp index 779798056..c0dbbc63f 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp @@ -64,8 +64,8 @@ DlgLayerSize::DlgLayerSize( TQWidget * parent, unblockAll(); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } @@ -243,17 +243,17 @@ void DlgLayerSize::blockAll() void DlgLayerSize::unblockAll() { // XXX: more efficient to use blockSignals? - connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotWidthPixelsChanged(int))); + connect (m_page->intWidth, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotWidthPixelsChanged(int))); - connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotHeightPixelsChanged(int))); + connect (m_page->intHeight, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotHeightPixelsChanged(int))); - connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotWidthPercentChanged(int))); + connect (m_page->intWidthPercent, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotWidthPercentChanged(int))); - connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotHeightPercentChanged(int))); + connect (m_page->intHeightPercent, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotHeightPercentChanged(int))); } diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cpp b/chalk/plugins/viewplugins/imagesize/imagesize.cpp index af9c2570f..644592b2e 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.cpp +++ b/chalk/plugins/viewplugins/imagesize/imagesize.cpp @@ -66,13 +66,13 @@ ImageSize::ImageSize(TQObject *parent, const char *name, const TQStringList &) setInstance(ImageSizeFactory::instance()); setXMLFile(locate("data","chalkplugins/imagesize.rc"), true); - (void) new TDEAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQT_SLOT(slotImageSize()), actionCollection(), "imagesize"); - (void) new TDEAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale"); + (void) new TDEAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQ_SLOT(slotImageSize()), actionCollection(), "imagesize"); + (void) new TDEAction(i18n("&Scale Layer..."), 0, 0, this, TQ_SLOT(slotLayerSize()), actionCollection(), "layerscale"); m_view = (KisView*) parent; // Selection manager takes ownership? - TDEAction * a = new TDEAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); + TDEAction * a = new TDEAction(i18n("&Scale Selection..."), 0, 0, this, TQ_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); TQ_CHECK_PTR(a); m_view ->canvasSubject()-> selectionManager()->addSelectionAction(a); } diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp index 8e2bc4de8..5f686eec7 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp @@ -47,7 +47,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget * parent, const char * name) : setMainWidget(m_page); resize(m_page->sizeHint()); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked())); } DlgBorderSelection::~DlgBorderSelection() diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp index ae590eba9..959966430 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp @@ -47,7 +47,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget * parent, const char * name) : sup setMainWidget(m_page); resize(m_page->sizeHint()); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked())); } DlgGrowSelection::~DlgGrowSelection() diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp index ce4ce9d3b..1d66e89a4 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp @@ -47,7 +47,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget * parent, const char * name) : setMainWidget(m_page); resize(m_page->sizeHint()); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked())); } DlgShrinkSelection::~DlgShrinkSelection() diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp index 823899958..89ccd171d 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp @@ -66,9 +66,9 @@ ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStr m_view = (KisView*) parent; // Selection manager takes ownership? - TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); - TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); - TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection"); + TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQ_SLOT(slotGrowSelection()), actionCollection(), "growselection"); + TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQ_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); + TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQ_SLOT(slotBorderSelection()), actionCollection(), "borderselection"); TQ_CHECK_PTR(a); TQ_CHECK_PTR(b); diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp index 326d97272..d3dbbb9b7 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp @@ -51,11 +51,11 @@ DlgPerfTest::DlgPerfTest( TQWidget * parent, setMainWidget(m_page); resize(m_page->sizeHint()); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); - connect(m_page->btnSelectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllClicked())); - connect(m_page->btnDeselectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllClicked())); + connect(m_page->btnSelectAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAllClicked())); + connect(m_page->btnDeselectAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(deselectAllClicked())); } DlgPerfTest::~DlgPerfTest() diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cpp b/chalk/plugins/viewplugins/performancetest/perftest.cpp index fa5445516..b3fdcb445 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cpp +++ b/chalk/plugins/viewplugins/performancetest/perftest.cpp @@ -86,7 +86,7 @@ PerfTest::PerfTest(TQObject *parent, const char *name, const TQStringList &) setInstance(PerfTestFactory::instance()); setXMLFile(locate("data","chalkplugins/perftest.rc"), true); - (void) new TDEAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test"); + (void) new TDEAction(i18n("&Performance Test..."), 0, 0, this, TQ_SLOT(slotPerfTest()), actionCollection(), "perf_test"); m_view = (KisView*) parent; } diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp index e7c3a8ce9..550988a38 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp @@ -51,10 +51,10 @@ DlgRotateImage::DlgRotateImage( TQWidget * parent, setMainWidget(m_page); resize(m_page->sizeHint()); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); - connect( m_page->doubleCustom, TQT_SIGNAL( valueChanged ( double ) ), - this, TQT_SLOT( slotAngleValueChanged( double ) ) ); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); + connect( m_page->doubleCustom, TQ_SIGNAL( valueChanged ( double ) ), + this, TQ_SLOT( slotAngleValueChanged( double ) ) ); } diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp index ba5c48592..47bec8d91 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp @@ -59,16 +59,16 @@ RotateImage::RotateImage(TQObject *parent, const char *name, const TQStringList setInstance(RotateImageFactory::instance()); setXMLFile(locate("data","chalkplugins/rotateimage.rc"), true); m_view = (KisView*) parent; - (void) new TDEAction(i18n("&Rotate Image..."), 0, 0, this, TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); - (void) new TDEAction(i18n("Rotate Image CW"), "object-rotate-right", 0, this, TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); - (void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, this, TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); - (void) new TDEAction(i18n("Rotate Image CCW"), "object-rotate-left", 0, this, TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); + (void) new TDEAction(i18n("&Rotate Image..."), 0, 0, this, TQ_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); + (void) new TDEAction(i18n("Rotate Image CW"), "object-rotate-right", 0, this, TQ_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); + (void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, this, TQ_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); + (void) new TDEAction(i18n("Rotate Image CCW"), "object-rotate-left", 0, this, TQ_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); - (void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, this, TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); + (void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, this, TQ_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); - (void)new TDEAction(i18n("Rotate 1&80"), 0, m_view, TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); - (void)new TDEAction(i18n("Rotate CCW"), "object-rotate-left", 0, m_view, TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); - (void)new TDEAction(i18n("Rotate CW"), "object-rotate-right", 0, m_view, TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); + (void)new TDEAction(i18n("Rotate 1&80"), 0, m_view, TQ_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); + (void)new TDEAction(i18n("Rotate CCW"), "object-rotate-left", 0, m_view, TQ_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); + (void)new TDEAction(i18n("Rotate CW"), "object-rotate-right", 0, m_view, TQ_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); } } diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index dd28d9258..fd2680fe0 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -78,10 +78,10 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name) mainWidget->btnSave->hide(); mainWidget->btnPrint->hide(); - connect(mainWidget, TQT_SIGNAL(startImageDrag()), TQT_SLOT(slotDragSnapshot())); + connect(mainWidget, TQ_SIGNAL(startImageDrag()), TQ_SLOT(slotDragSnapshot())); - connect( mainWidget, TQT_SIGNAL( newClicked() ), TQT_SLOT( slotGrab() ) ); - connect( mainWidget, TQT_SIGNAL( printClicked() ), TQT_SLOT( slotPrint() ) ); + connect( mainWidget, TQ_SIGNAL( newClicked() ), TQ_SLOT( slotGrab() ) ); + connect( mainWidget, TQ_SIGNAL( printClicked() ), TQ_SLOT( slotPrint() ) ); grabber->show(); grabber->grabMouse( waitCursor ); @@ -97,16 +97,16 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name) mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); mainWidget->setIncludeDecorations(conf->readBoolEntry("includeDecorations",true)); - connect( &grabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( grabTimerDone() ) ); + connect( &grabTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( grabTimerDone() ) ); TDEAccel* accel = new TDEAccel(this); TQ_CHECK_PTR(accel); - accel->insert(TDEStdAccel::Print, this, TQT_SLOT(slotPrint())); - accel->insert(TDEStdAccel::New, this, TQT_SLOT(slotGrab())); + accel->insert(TDEStdAccel::Print, this, TQ_SLOT(slotPrint())); + accel->insert(TDEStdAccel::New, this, TQ_SLOT(slotGrab())); - accel->insert( "Print2", TQt::Key_P, this, TQT_SLOT(slotPrint())); - accel->insert( "New2", TQt::Key_N, this, TQT_SLOT(slotGrab())); - accel->insert( "New3", TQt::Key_Space, this, TQT_SLOT(slotGrab())); + accel->insert( "Print2", TQt::Key_P, this, TQ_SLOT(slotPrint())); + accel->insert( "New2", TQt::Key_N, this, TQ_SLOT(slotGrab())); + accel->insert( "New3", TQt::Key_Space, this, TQ_SLOT(slotGrab())); mainWidget->btnNew->setFocus(); @@ -181,8 +181,8 @@ void KSnapshot::slotGrab() { rgnGrab = new RegionGrabber(); TQ_CHECK_PTR(rgnGrab); - connect( rgnGrab, TQT_SIGNAL( regionGrabbed( const TQPixmap & ) ), - TQT_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); + connect( rgnGrab, TQ_SIGNAL( regionGrabbed( const TQPixmap & ) ), + TQ_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); } else { diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index a05ce3e2d..c44e71129 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -75,9 +75,9 @@ RegionGrabber::RegionGrabber() tipTimer = new TQTimer( this ); TQ_CHECK_PTR(tipTimer); - connect( tipTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateSizeTip() ) ); + connect( tipTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateSizeTip() ) ); - TQTimer::singleShot( 200, this, TQT_SLOT( initGrabber() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( initGrabber() ) ); } RegionGrabber::~RegionGrabber() diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp index e1d186054..c0a1a4d75 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp @@ -51,9 +51,9 @@ Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &) snapshot = new KSnapshot(); TQ_CHECK_PTR(snapshot); - connect( snapshot, TQT_SIGNAL( screenGrabbed() ), TQT_SLOT( slotScreenGrabbed() ) ); + connect( snapshot, TQ_SIGNAL( screenGrabbed() ), TQ_SLOT( slotScreenGrabbed() ) ); - (void) new TDEAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQT_SLOT(slotScreenshot()), actionCollection(), "screenshot"); + (void) new TDEAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQ_SLOT(slotScreenshot()), actionCollection(), "screenshot"); } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h index 0a8426cb1..a71cadd8c 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h @@ -49,7 +49,7 @@ class IteratorMemoryManager : public TQObject { IteratorMemoryManager(IteratorMemoryManaged* it) : m_it(it) { // Connect the Monitor to know when the invalidating of iterator is needed - connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(invalidateIterator())); + connect(KisScriptMonitor::instance(), TQ_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQ_SLOT(invalidateIterator())); } public slots: diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp index 3967ffe78..e7a94e932 100644 --- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp @@ -34,8 +34,8 @@ KisScriptMonitor::~KisScriptMonitor() void KisScriptMonitor::monitor(Kross::Api::ScriptGUIClient* guiClient) { - connect(guiClient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); - connect(guiClient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); + connect(guiClient, TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); + connect(guiClient, TQ_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQ_SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); } KisScriptMonitor* KisScriptMonitor::s_instance = 0; diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp index 5c317ad26..0642af52c 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cpp +++ b/chalk/plugins/viewplugins/scripting/scripting.cpp @@ -68,16 +68,16 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) // m_scriptguiclient ->setXMLFile(locate("data","chalkplugins/scripting.rc"), true); //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu setXMLFile(locate("data","chalkplugins/scripting.rc"), true); - new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); - new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts"); //END TODO TQWidget * w = new Kross::Api::WdgScriptsManager(m_scriptguiclient, m_view); m_view->canvasSubject()->paletteManager()->addWidget(w, "Scripts Manager", chalk::LAYERBOX, 10, PALETTE_DOCKER, false); - connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); - connect(m_scriptguiclient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionStarted(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQ_SLOT(executionFinished(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQ_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, TQ_SLOT(executionStarted(const Kross::Api::ScriptAction*))); KisScriptMonitor::instance()->monitor( m_scriptguiclient ); Kross::Api::Manager::scriptManager()->addTQObject(m_view->canvasSubject()->document(), "ChalkDocument"); diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp index 61d856344..b3ed5cf51 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp @@ -61,7 +61,7 @@ SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringLis setInstance(SelectOpaqueFactory::instance()); setXMLFile(locate("data","chalkplugins/selectopaque.rc"), true); m_view = dynamic_cast<KisView*>(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") ); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQ_SLOT(slotActivated()), actionCollection(), "selectopaque") ); } } diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp index d650a045a..ac30591e1 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp @@ -47,11 +47,11 @@ DlgSeparate::DlgSeparate( const TQString & imageCS, m_page->lblColormodel->setText(layerCS); m_page->grpOutput->hide(); - connect(m_page->grpSource, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSetColorSpaceLabel(int))); - connect(m_page->chkColors, TQT_SIGNAL(toggled(bool)), m_page->chkDownscale, TQT_SLOT(setDisabled(bool))); + connect(m_page->grpSource, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSetColorSpaceLabel(int))); + connect(m_page->chkColors, TQ_SIGNAL(toggled(bool)), m_page->chkDownscale, TQ_SLOT(setDisabled(bool))); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } DlgSeparate::~DlgSeparate() diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp index db356a164..ecf98d373 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp @@ -47,7 +47,7 @@ KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *parent, const cha setInstance(KGenericFactory<KisSeparateChannelsPlugin>::instance()); setXMLFile(locate("data","chalkplugins/imageseparate.rc"), true); m_view = (KisView*) parent; - (void) new TDEAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate"); + (void) new TDEAction(i18n("Separate Image..."), 0, 0, this, TQ_SLOT(slotSeparate()), actionCollection(), "separate"); } } diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp index d295493d0..4a56a45df 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp @@ -52,8 +52,8 @@ DlgShearImage::DlgShearImage( TQWidget * parent, setMainWidget(m_page); resize(m_page->sizeHint()); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cpp b/chalk/plugins/viewplugins/shearimage/shearimage.cpp index 2596e62ee..dca6a45d0 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.cpp +++ b/chalk/plugins/viewplugins/shearimage/shearimage.cpp @@ -59,8 +59,8 @@ ShearImage::ShearImage(TQObject *parent, const char *name, const TQStringList &) setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","chalkplugins/shearimage.rc"), true); - (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage"); - (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); + (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, TQ_SLOT(slotShearImage()), actionCollection(), "shearimage"); + (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, TQ_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); m_view = (KisView*) parent; } diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp b/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp index 78847f056..e3958c29c 100644 --- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp +++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp @@ -35,8 +35,8 @@ DlgSubstrate::DlgSubstrate( TQWidget * parent, setMainWidget(m_page); resize(m_page -> size()); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } DlgSubstrate::~DlgSubstrate() diff --git a/chalk/plugins/viewplugins/substrate/substrate.cpp b/chalk/plugins/viewplugins/substrate/substrate.cpp index ce13710be..9b6411d4c 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.cpp +++ b/chalk/plugins/viewplugins/substrate/substrate.cpp @@ -53,7 +53,7 @@ SubstratePlugin::SubstratePlugin(TQObject *parent, const char *name, const TQStr setInstance(SubstrateFactory::instance()); setXMLFile(locate("data","chalkplugins/substrate.rc"), true); - (void) new TDEAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); + (void) new TDEAction(i18n("&Substrate..."), 0, 0, this, TQ_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); m_view = (KisView*) parent; } diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cpp b/chalk/plugins/viewplugins/variations/dlg_variations.cpp index 4decbbd41..c086559b5 100644 --- a/chalk/plugins/viewplugins/variations/dlg_variations.cpp +++ b/chalk/plugins/viewplugins/variations/dlg_variations.cpp @@ -35,8 +35,8 @@ DlgVariations::DlgVariations( TQWidget * parent, setMainWidget(m_page); resize(m_page -> size()); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } DlgVariations::~DlgVariations() diff --git a/chalk/plugins/viewplugins/variations/variations.cpp b/chalk/plugins/viewplugins/variations/variations.cpp index 5e2d65ba8..4a4e06d62 100644 --- a/chalk/plugins/viewplugins/variations/variations.cpp +++ b/chalk/plugins/viewplugins/variations/variations.cpp @@ -57,7 +57,7 @@ Variations::Variations(TQObject *parent, const char *name, const TQStringList &) setInstance(VariationsFactory::instance()); setXMLFile(locate("data","chalkplugins/variations.rc"), true); - (void) new TDEAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations"); + (void) new TDEAction(i18n("&Variations..."), 0, 0, this, TQ_SLOT(slotVariationsActivated()), actionCollection(), "variations"); m_view = (KisView*) parent; } diff --git a/chalk/ui/kis_autobrush.cpp b/chalk/ui/kis_autobrush.cpp index c7127928d..a652b468d 100644 --- a/chalk/ui/kis_autobrush.cpp +++ b/chalk/ui/kis_autobrush.cpp @@ -36,18 +36,18 @@ KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& c linkFadeToggled(m_linkSize); linkSizeToggled(m_linkFade); - connect(bnLinkSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkSizeToggled( bool ))); - connect(bnLinkFade, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkFadeToggled( bool ))); + connect(bnLinkSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkSizeToggled( bool ))); + connect(bnLinkFade, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkFadeToggled( bool ))); - connect((TQObject*)comboBoxShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(paramChanged())); + connect((TQObject*)comboBoxShape, TQ_SIGNAL(activated(int)), this, TQ_SLOT(paramChanged())); spinBoxWidth->setMinValue(1); - connect(spinBoxWidth,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxWidthChanged(int))); + connect(spinBoxWidth,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxWidthChanged(int))); spinBoxHeight->setMinValue(1); - connect(spinBoxHeight,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHeightChanged(int))); + connect(spinBoxHeight,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHeightChanged(int))); spinBoxHorizontal->setMinValue(0); - connect(spinBoxHorizontal,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHorizontalChanged(int))); + connect(spinBoxHorizontal,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHorizontalChanged(int))); spinBoxVertical->setMinValue(0); - connect(spinBoxVertical,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxVerticalChanged(int))); + connect(spinBoxVertical,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxVerticalChanged(int))); m_brsh = new TQImage(1,1,32); TQ_CHECK_PTR(m_brsh); @@ -55,7 +55,7 @@ KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& c paramChanged(); - connect(brushPreview, TQT_SIGNAL(clicked()), TQT_SLOT(paramChanged())); + connect(brushPreview, TQ_SIGNAL(clicked()), TQ_SLOT(paramChanged())); } diff --git a/chalk/ui/kis_autogradient.cpp b/chalk/ui/kis_autogradient.cpp index bd5b80fb4..e6ca9608e 100644 --- a/chalk/ui/kis_autogradient.cpp +++ b/chalk/ui/kis_autogradient.cpp @@ -37,18 +37,18 @@ KisAutogradient::KisAutogradient(TQWidget *parent, const char* name, const TQStr setCaption(caption); m_autogradientResource = new KisAutogradientResource(); m_autogradientResource->createSegment( INTERP_LINEAR, COLOR_INTERP_RGB, 0.0, 1.0, 0.5, TQt::black, TQt::white ); - connect(gradientSlider, TQT_SIGNAL( sigSelectedSegment( KisGradientSegment* ) ), TQT_SLOT( slotSelectedSegment(KisGradientSegment*) )); - connect(gradientSlider, TQT_SIGNAL( sigChangedSegment(KisGradientSegment*) ), TQT_SLOT( slotChangedSegment(KisGradientSegment*) )); + connect(gradientSlider, TQ_SIGNAL( sigSelectedSegment( KisGradientSegment* ) ), TQ_SLOT( slotSelectedSegment(KisGradientSegment*) )); + connect(gradientSlider, TQ_SIGNAL( sigChangedSegment(KisGradientSegment*) ), TQ_SLOT( slotChangedSegment(KisGradientSegment*) )); gradientSlider->setGradientResource( m_autogradientResource ); - connect(comboBoxColorInterpolationType, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotChangedColorInterpolation(int) )); - connect(comboBoxInterpolationType, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotChangedInterpolation(int) )); - connect(leftColorButton, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( slotChangedLeftColor(const TQColor&) )); - connect(rightColorButton, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( slotChangedRightColor(const TQColor&) )); + connect(comboBoxColorInterpolationType, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotChangedColorInterpolation(int) )); + connect(comboBoxInterpolationType, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotChangedInterpolation(int) )); + connect(leftColorButton, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( slotChangedLeftColor(const TQColor&) )); + connect(rightColorButton, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( slotChangedRightColor(const TQColor&) )); // intNumInputLeftOpacity->setRange( 0, 100, false); - connect(intNumInputLeftOpacity, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChangedLeftOpacity(int) )); + connect(intNumInputLeftOpacity, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChangedLeftOpacity(int) )); // intNumInputRightOpacity->setRange( 0, 100, false); - connect(intNumInputRightOpacity, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChangedRightOpacity(int) )); + connect(intNumInputRightOpacity, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChangedRightOpacity(int) )); } diff --git a/chalk/ui/kis_birdeye_box.cpp b/chalk/ui/kis_birdeye_box.cpp index 2b816f9cb..090bbfe9b 100644 --- a/chalk/ui/kis_birdeye_box.cpp +++ b/chalk/ui/kis_birdeye_box.cpp @@ -192,8 +192,8 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) m_birdEyePanel = new KoBirdEyePanel(m_zoomAdapter, ktp, kpc, this); - connect(view, TQT_SIGNAL(cursorPosition( TQ_INT32, TQ_INT32 )), m_birdEyePanel, TQT_SLOT(cursorPosChanged( TQ_INT32, TQ_INT32 ))); - connect(view, TQT_SIGNAL(viewTransformationsChanged()), m_birdEyePanel, TQT_SLOT(slotViewTransformationChanged())); + connect(view, TQ_SIGNAL(cursorPosition( TQ_INT32, TQ_INT32 )), m_birdEyePanel, TQ_SLOT(cursorPosChanged( TQ_INT32, TQ_INT32 ))); + connect(view, TQ_SIGNAL(viewTransformationsChanged()), m_birdEyePanel, TQ_SLOT(slotViewTransformationChanged())); l->addWidget(m_birdEyePanel); @@ -213,17 +213,17 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) m_exposureDoubleWidget->setLineStep(0.1); m_exposureDoubleWidget->setPageStep(1); - connect(m_exposureDoubleWidget, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(exposureValueChanged(double))); - connect(m_exposureDoubleWidget, TQT_SIGNAL(sliderPressed()), TQT_SLOT(exposureSliderPressed())); - connect(m_exposureDoubleWidget, TQT_SIGNAL(sliderReleased()), TQT_SLOT(exposureSliderReleased())); + connect(m_exposureDoubleWidget, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(exposureValueChanged(double))); + connect(m_exposureDoubleWidget, TQ_SIGNAL(sliderPressed()), TQ_SLOT(exposureSliderPressed())); + connect(m_exposureDoubleWidget, TQ_SIGNAL(sliderReleased()), TQ_SLOT(exposureSliderReleased())); m_draggingExposureSlider = false; Q_ASSERT(m_subject->document() != 0); - connect(m_subject->document(), TQT_SIGNAL(sigCommandExecuted()), TQT_SLOT(slotDocCommandExecuted())); + connect(m_subject->document(), TQ_SIGNAL(sigCommandExecuted()), TQ_SLOT(slotDocCommandExecuted())); if (m_image) { - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotImageUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(slotImageUpdated(TQRect))); } } @@ -245,9 +245,9 @@ void KisBirdEyeBox::setImage(KisImageSP image) m_birdEyePanel->setThumbnailProvider(ktp); if (m_image) { - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotImageUpdated(TQRect))); - connect(m_image, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); - connect(m_image, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), TQT_SLOT(slotImageColorSpaceChanged(KisColorSpace *))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(slotImageUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_image, TQ_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), TQ_SLOT(slotImageColorSpaceChanged(KisColorSpace *))); m_birdEyePanel->slotUpdate(m_image->bounds()); slotImageColorSpaceChanged(m_image->colorSpace()); } diff --git a/chalk/ui/kis_brush_chooser.cpp b/chalk/ui/kis_brush_chooser.cpp index db9aba981..95b52705b 100644 --- a/chalk/ui/kis_brush_chooser.cpp +++ b/chalk/ui/kis_brush_chooser.cpp @@ -34,10 +34,10 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name) m_slSpacing = new KisDoubleWidget(0.0, 10, this, "double_widget"); m_slSpacing->setTickmarks(TQSlider::Below); m_slSpacing->setTickInterval(1); - TQObject::connect(m_slSpacing, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetItemSpacing(double))); + TQObject::connect(m_slSpacing, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotSetItemSpacing(double))); m_chkColorMask = new TQCheckBox(i18n("Use color as mask"), this); - TQObject::connect(m_chkColorMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetItemUseColorAsMask(bool))); + TQObject::connect(m_chkColorMask, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetItemUseColorAsMask(bool))); m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp index 2ec1a044a..38df814e3 100644 --- a/chalk/ui/kis_canvas.cpp +++ b/chalk/ui/kis_canvas.cpp @@ -1118,18 +1118,18 @@ void KisCanvas::createCanvasWidget(bool useOpenGL) selectTabletDeviceEvents(); #endif - connect(m_canvasWidget, TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent *)), TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotEnterEvent(TQEvent*)), TQT_SIGNAL(sigGotEnterEvent(TQEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotLeaveEvent(TQEvent*)), TQT_SIGNAL(sigGotLeaveEvent(TQEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotDropEvent(TQDropEvent*)), TQT_SIGNAL(sigGotDropEvent(TQDropEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent *)), TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *)), TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *)), TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *)), TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotPaintEvent(TQPaintEvent *)), TQ_SIGNAL(sigGotPaintEvent(TQPaintEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotEnterEvent(TQEvent*)), TQ_SIGNAL(sigGotEnterEvent(TQEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotLeaveEvent(TQEvent*)), TQ_SIGNAL(sigGotLeaveEvent(TQEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), TQ_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), TQ_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), TQ_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotDropEvent(TQDropEvent*)), TQ_SIGNAL(sigGotDropEvent(TQDropEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent *)), TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *)), TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *)), TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *)), TQ_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *))); } void KisCanvas::createTQPaintDeviceCanvas() diff --git a/chalk/ui/kis_clipboard.cpp b/chalk/ui/kis_clipboard.cpp index 1e8040cad..8ce675a99 100644 --- a/chalk/ui/kis_clipboard.cpp +++ b/chalk/ui/kis_clipboard.cpp @@ -52,8 +52,8 @@ KisClipboard::KisClipboard() clipboardDataChanged(); // Make sure we are notified when clipboard changes - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardDataChanged() ) ); } KisClipboard::~KisClipboard() diff --git a/chalk/ui/kis_cmb_composite.cpp b/chalk/ui/kis_cmb_composite.cpp index 631f602e9..55053b818 100644 --- a/chalk/ui/kis_cmb_composite.cpp +++ b/chalk/ui/kis_cmb_composite.cpp @@ -28,8 +28,8 @@ KisCmbComposite::KisCmbComposite(TQWidget * parent, const char * name) : super( false, parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpActivated(int))); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotOpHighlighted(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpActivated(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotOpHighlighted(int))); } KisCmbComposite::~KisCmbComposite() diff --git a/chalk/ui/kis_cmb_idlist.cpp b/chalk/ui/kis_cmb_idlist.cpp index 39937752a..1855087a6 100644 --- a/chalk/ui/kis_cmb_idlist.cpp +++ b/chalk/ui/kis_cmb_idlist.cpp @@ -29,8 +29,8 @@ KisCmbIDList::KisCmbIDList(TQWidget * parent, const char * name) : super( false, parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotIDActivated(int))); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotIDHighlighted(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotIDActivated(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotIDHighlighted(int))); } KisCmbIDList::~KisCmbIDList() diff --git a/chalk/ui/kis_color_cup.cpp b/chalk/ui/kis_color_cup.cpp index 751cfdda6..5b23ab59c 100644 --- a/chalk/ui/kis_color_cup.cpp +++ b/chalk/ui/kis_color_cup.cpp @@ -64,8 +64,8 @@ KisColorCup::KisColorCup(TQWidget * parent, const char * name) { m_color = TQt::black; m_popup = new KisColorPopup(m_color, this, "colorpopup"); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); - connect(m_popup, TQT_SIGNAL(changed( const TQColor &)), this, TQT_SLOT(setColor(const TQColor &))); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); + connect(m_popup, TQ_SIGNAL(changed( const TQColor &)), this, TQ_SLOT(setColor(const TQColor &))); } void KisColorCup::setColor(const TQColor & c) diff --git a/chalk/ui/kis_controlframe.cpp b/chalk/ui/kis_controlframe.cpp index 9c90c68fb..67abd3972 100644 --- a/chalk/ui/kis_controlframe.cpp +++ b/chalk/ui/kis_controlframe.cpp @@ -230,7 +230,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) KisAutobrush * m_autobrush = new KisAutobrush(m_brushesTab, "autobrush", i18n("Autobrush")); m_brushesTab->addTab( m_autobrush, i18n("Autobrush")); - connect(m_autobrush, TQT_SIGNAL(activatedResource(KisResource*)), m_view, TQT_SLOT(brushActivated( KisResource* ))); + connect(m_autobrush, TQ_SIGNAL(activatedResource(KisResource*)), m_view, TQ_SLOT(brushActivated( KisResource* ))); KisBrushChooser * m_brushChooser = new KisBrushChooser(m_brushesTab, "brush_chooser"); m_brushesTab->addTab( m_brushChooser, i18n("Predefined Brushes")); @@ -238,19 +238,19 @@ void KisControlFrame::createBrushesChooser(KisView * view) KisCustomBrush* customBrushes = new KisCustomBrush(m_brushesTab, "custombrush", i18n("Custom Brush"), m_view); m_brushesTab->addTab( customBrushes, i18n("Custom Brush")); - connect(customBrushes, TQT_SIGNAL(activatedResource(KisResource*)), - m_view, TQT_SLOT(brushActivated(KisResource*))); + connect(customBrushes, TQ_SIGNAL(activatedResource(KisResource*)), + m_view, TQ_SLOT(brushActivated(KisResource*))); #ifdef HAVE_TEXT_BRUSH KisTextBrush* textBrushes = new KisTextBrush(m_brushesTab, "textbrush", i18n("Text Brush")/*, m_view*/); m_brushesTab->addTab( textBrushes, i18n("Text Brush")); - connect(textBrushes, TQT_SIGNAL(activatedResource(KisResource*)), - m_view, TQT_SLOT(brushActivated(KisResource*))); + connect(textBrushes, TQ_SIGNAL(activatedResource(KisResource*)), + m_view, TQ_SLOT(brushActivated(KisResource*))); #endif m_brushChooser->setFont(m_font); m_brushMediator = new KisResourceMediator( m_brushChooser, this); - connect(m_brushMediator, TQT_SIGNAL(activatedResource(KisResource*)), m_view, TQT_SLOT(brushActivated(KisResource*))); + connect(m_brushMediator, TQ_SIGNAL(activatedResource(KisResource*)), m_view, TQ_SLOT(brushActivated(KisResource*))); KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("ImagePipeBrushServer"); @@ -258,7 +258,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) rServer = KisResourceServerRegistry::instance()->get("BrushServer"); m_brushMediator->connectServer(rServer); - KisControlFrame::connect(view, TQT_SIGNAL(brushChanged(KisBrush *)), this, TQT_SLOT(slotBrushChanged( KisBrush *))); + KisControlFrame::connect(view, TQ_SIGNAL(brushChanged(KisBrush *)), this, TQ_SLOT(slotBrushChanged( KisBrush *))); m_brushChooser->setCurrent( 0 ); m_brushMediator->setActiveItem( m_brushChooser->currentItem() ); customBrushes->setResourceServer(rServer); @@ -291,15 +291,15 @@ void KisControlFrame::createPatternsChooser(KisView * view) m_patternMediator = new KisResourceMediator( chooser, view); - connect( m_patternMediator, TQT_SIGNAL(activatedResource(KisResource*)), view, TQT_SLOT(patternActivated(KisResource*))); - connect(customPatterns, TQT_SIGNAL(activatedResource(KisResource*)), - view, TQT_SLOT(patternActivated(KisResource*))); + connect( m_patternMediator, TQ_SIGNAL(activatedResource(KisResource*)), view, TQ_SLOT(patternActivated(KisResource*))); + connect(customPatterns, TQ_SIGNAL(activatedResource(KisResource*)), + view, TQ_SLOT(patternActivated(KisResource*))); KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("PatternServer"); m_patternMediator->connectServer(rServer); - KisControlFrame::connect(view, TQT_SIGNAL(patternChanged(KisPattern *)), this, TQT_SLOT(slotPatternChanged( KisPattern *))); + KisControlFrame::connect(view, TQ_SIGNAL(patternChanged(KisPattern *)), this, TQ_SLOT(slotPatternChanged( KisPattern *))); chooser->setCurrent( 0 ); m_patternMediator->setActiveItem( chooser->currentItem() ); @@ -327,13 +327,13 @@ void KisControlFrame::createGradientsChooser(KisView * view) m_gradientTab->addTab( m_gradientChooser, i18n("Gradients")); m_gradientMediator = new KisResourceMediator( m_gradientChooser, view); - connect(m_gradientMediator, TQT_SIGNAL(activatedResource(KisResource*)), view, TQT_SLOT(gradientActivated(KisResource*))); + connect(m_gradientMediator, TQ_SIGNAL(activatedResource(KisResource*)), view, TQ_SLOT(gradientActivated(KisResource*))); KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("GradientServer"); m_gradientMediator->connectServer(rServer); - connect(view, TQT_SIGNAL(gradientChanged(KisGradient *)), this, TQT_SLOT(slotGradientChanged( KisGradient *))); + connect(view, TQ_SIGNAL(gradientChanged(KisGradient *)), this, TQ_SLOT(slotGradientChanged( KisGradient *))); m_gradientChooser->setCurrent( 0 ); m_gradientMediator->setActiveItem( m_gradientChooser->currentItem() ); } diff --git a/chalk/ui/kis_custom_brush.cpp b/chalk/ui/kis_custom_brush.cpp index 1802e6cfd..76f514e41 100644 --- a/chalk/ui/kis_custom_brush.cpp +++ b/chalk/ui/kis_custom_brush.cpp @@ -50,11 +50,11 @@ KisCustomBrush::KisCustomBrush(TQWidget *parent, const char* name, const TQStrin preview->setScaledContents(true); - connect(addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPredefined())); - connect(brushButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUseBrush())); -// connect(exportButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotExport())); - connect(style, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateCurrentBrush(int))); - connect(colorAsMask, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCurrentBrush(int))); + connect(addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPredefined())); + connect(brushButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUseBrush())); +// connect(exportButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotExport())); + connect(style, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdateCurrentBrush(int))); + connect(colorAsMask, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotUpdateCurrentBrush(int))); } KisCustomBrush::~KisCustomBrush() { diff --git a/chalk/ui/kis_custom_image_widget.cpp b/chalk/ui/kis_custom_image_widget.cpp index 93c829778..9f3b72e2d 100644 --- a/chalk/ui/kis_custom_image_widget.cpp +++ b/chalk/ui/kis_custom_image_widget.cpp @@ -52,9 +52,9 @@ KisCustomImageWidget::KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); cmbColorSpaces->setCurrentText(defColorSpaceName); - connect(cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbProfiles(const KisID &))); - connect (m_createButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT (buttonClicked()) ); + connect(cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbProfiles(const KisID &))); + connect (m_createButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT (buttonClicked()) ); m_createButton -> setDefault(true); fillCmbProfiles(cmbColorSpaces->currentItem()); diff --git a/chalk/ui/kis_custom_palette.cpp b/chalk/ui/kis_custom_palette.cpp index 8fb2a9dbe..b61725299 100644 --- a/chalk/ui/kis_custom_palette.cpp +++ b/chalk/ui/kis_custom_palette.cpp @@ -52,9 +52,9 @@ KisCustomPalette::KisCustomPalette(TQWidget *parent, const char* name, const TQS m_ownPalette = true; this->view->setPalette(m_palette); - connect(addColor, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddNew())); - connect(removeColor, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemoveCurrent())); - connect(addPalette, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPredefined())); + connect(addColor, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddNew())); + connect(removeColor, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotRemoveCurrent())); + connect(addPalette, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPredefined())); } KisCustomPalette::~KisCustomPalette() { diff --git a/chalk/ui/kis_custom_pattern.cpp b/chalk/ui/kis_custom_pattern.cpp index edf92be12..e8b3a12ac 100644 --- a/chalk/ui/kis_custom_pattern.cpp +++ b/chalk/ui/kis_custom_pattern.cpp @@ -47,9 +47,9 @@ KisCustomPattern::KisCustomPattern(TQWidget *parent, const char* name, const TQS preview->setScaledContents(true); - connect(addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPredefined())); - connect(patternButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUsePattern())); - connect(exportButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotExport())); + connect(addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPredefined())); + connect(patternButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUsePattern())); + connect(exportButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotExport())); } KisCustomPattern::~KisCustomPattern() { diff --git a/chalk/ui/kis_dlg_adj_layer_props.cpp b/chalk/ui/kis_dlg_adj_layer_props.cpp index f7d75310e..efcfe10e6 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cpp +++ b/chalk/ui/kis_dlg_adj_layer_props.cpp @@ -91,7 +91,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); m_preview->slotSetDevice( dev ); - connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + connect( m_preview, TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview())); layout->addWidget(m_preview, 1, 1); TQVBoxLayout *v1 = new TQVBoxLayout( layout ); @@ -104,7 +104,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, m_layerName->setText(layerName); m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); hl->addWidget(m_layerName, 0, 1); - connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_layerName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); if ( m_currentFilter ) { m_currentConfigWidget = m_currentFilter->createConfigurationWidget(page, dev); @@ -118,7 +118,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, } else { v1->addWidget( m_currentConfigWidget ); - connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); + connect(m_currentConfigWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged())); } refreshPreview(); diff --git a/chalk/ui/kis_dlg_adjustment_layer.cpp b/chalk/ui/kis_dlg_adjustment_layer.cpp index 34374356e..74b08552f 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cpp +++ b/chalk/ui/kis_dlg_adjustment_layer.cpp @@ -84,16 +84,16 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, m_layerName = new KLineEdit(page, "m_layerName"); grid->addWidget(m_layerName, 0, 1); - connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_layerName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); m_filtersList = new KisFiltersListView(m_dev, page, true, "dlgadjustment.filtersList"); - connect(m_filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); + connect(m_filtersList , TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(selectionHasChanged(TQIconViewItem* ))); grid->addMultiCellWidget(m_filtersList, 1, 2, 0, 0); m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); m_preview->slotSetDevice( m_dev ); - connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + connect( m_preview, TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview())); grid->addWidget(m_preview, 1, 1); m_configWidgetHolder = new TQGroupBox(i18n("Configuration"), page, "currentConfigWidget"); @@ -175,7 +175,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) { m_configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); - connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); + connect(m_currentConfigWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged())); } else { m_labelNoConfigWidget->show(); } diff --git a/chalk/ui/kis_dlg_image_properties.cpp b/chalk/ui/kis_dlg_image_properties.cpp index 00acde270..38cbacf2b 100644 --- a/chalk/ui/kis_dlg_image_properties.cpp +++ b/chalk/ui/kis_dlg_image_properties.cpp @@ -96,8 +96,8 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, m_page->cmbColor->hide(); m_page->lblColor->hide(); - connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbProfiles(const KisID &))); + connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbProfiles(const KisID &))); } diff --git a/chalk/ui/kis_dlg_layer_properties.cpp b/chalk/ui/kis_dlg_layer_properties.cpp index 832102c6d..e8d9b29b9 100644 --- a/chalk/ui/kis_dlg_layer_properties.cpp +++ b/chalk/ui/kis_dlg_layer_properties.cpp @@ -51,7 +51,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName, setMainWidget(m_page); m_page->editName->setText(deviceName); - connect( m_page->editName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_page->editName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); m_page->cmbColorSpaces->setCurrent(colorSpace->id()); m_page->cmbColorSpaces->setEnabled(false); diff --git a/chalk/ui/kis_dlg_new_layer.cpp b/chalk/ui/kis_dlg_new_layer.cpp index 91f53a751..634ff9aba 100644 --- a/chalk/ui/kis_dlg_new_layer.cpp +++ b/chalk/ui/kis_dlg_new_layer.cpp @@ -64,10 +64,10 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, // ColorSpace m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); m_page->cmbColorSpaces->setCurrentText(colorSpaceID.id()); - connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbProfiles(const KisID &))); - connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbComposite(const KisID &))); + connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbProfiles(const KisID &))); + connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbComposite(const KisID &))); // Init profiles fillCmbProfiles(m_page->cmbColorSpaces->currentItem()); @@ -77,7 +77,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, fillCmbComposite(m_page->cmbColorSpaces->currentItem()); /* - connect( m_page->editName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_page->editName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged( m_page->editName->text() ); */ diff --git a/chalk/ui/kis_dlg_preferences.cpp b/chalk/ui/kis_dlg_preferences.cpp index e35477dc5..c8396be2b 100644 --- a/chalk/ui/kis_dlg_preferences.cpp +++ b/chalk/ui/kis_dlg_preferences.cpp @@ -138,8 +138,8 @@ ColorSettingsTab::ColorSettingsTab(TQWidget *parent, const char *name ) m_page->grpPasteBehaviour->setButton(cfg.pasteBehaviour()); m_page->cmbMonitorIntent->setCurrentItem(cfg.renderIntent()); - connect(m_page->cmbPrintingColorSpace, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(refillPrintProfiles(const KisID &))); + connect(m_page->cmbPrintingColorSpace, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(refillPrintProfiles(const KisID &))); } void ColorSettingsTab::setDefault() @@ -527,9 +527,9 @@ TabletSettingsTab::DeviceSettings TabletSettingsTab::TabletDeviceSettingsDialog: void TabletSettingsTab::initTabletDevices() { - connect(cbTabletDevice, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivateDevice(int))); - connect(chkEnableTabletDevice, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetDeviceEnabled(bool))); - connect(btnConfigureTabletDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotConfigureDevice())); + connect(cbTabletDevice, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivateDevice(int))); + connect(chkEnableTabletDevice, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetDeviceEnabled(bool))); + connect(btnConfigureTabletDevice, TQ_SIGNAL(clicked()), TQ_SLOT(slotConfigureDevice())); KisCanvasWidget::X11XIDTabletDeviceMap& tabletDevices = KisCanvasWidget::tabletDeviceMap(); @@ -630,7 +630,7 @@ DisplaySettingsTab::DisplaySettingsTab( TQWidget *parent, const char *name) //cbUseOpenGLShaders->setEnabled(false); #endif - connect(cbUseOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUseOpenGLToggled(bool))); + connect(cbUseOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUseOpenGLToggled(bool))); } void DisplaySettingsTab::setDefault() @@ -666,10 +666,10 @@ GridSettingsTab::GridSettingsTab(TQWidget* parent) : WdgGridSettingsBase(parent) intOffsetY->setValue( cfg.getGridOffsetY()); linkSpacingToggled(true); - connect(bnLinkSpacing, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkSpacingToggled( bool ))); + connect(bnLinkSpacing, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkSpacingToggled( bool ))); - connect(intHSpacing, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHSpacingChanged(int))); - connect(intVSpacing, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxVSpacingChanged(int))); + connect(intHSpacing, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHSpacingChanged(int))); + connect(intVSpacing, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxVSpacingChanged(int))); } diff --git a/chalk/ui/kis_doc.cpp b/chalk/ui/kis_doc.cpp index 60dbbfdda..5db84839f 100644 --- a/chalk/ui/kis_doc.cpp +++ b/chalk/ui/kis_doc.cpp @@ -260,8 +260,8 @@ bool KisDoc::init() m_cmdHistory = new KoCommandHistory(actionCollection(), true); TQ_CHECK_PTR(m_cmdHistory); - connect(m_cmdHistory, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(slotDocumentRestored())); - connect(m_cmdHistory, TQT_SIGNAL(commandExecuted(KCommand *)), this, TQT_SLOT(slotCommandExecuted(KCommand *))); + connect(m_cmdHistory, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(slotDocumentRestored())); + connect(m_cmdHistory, TQ_SIGNAL(commandExecuted(KCommand *)), this, TQ_SLOT(slotCommandExecuted(KCommand *))); setUndo(true); m_nserver = new KisNameServer(i18n("Image %1"), 1); @@ -447,7 +447,7 @@ KisImageSP KisDoc::loadImage(const TQDomElement& element) img = new KisImage(this, width, height, cs, name); img->blockSignals(true); // Don't send out signals while we're building the image TQ_CHECK_PTR(img); - connect( img, TQT_SIGNAL( sigImageModified() ), this, TQT_SLOT( slotImageUpdated() )); + connect( img, TQ_SIGNAL( sigImageModified() ), this, TQ_SLOT( slotImageUpdated() )); img->setDescription(description); img->setResolution(xres, yres); @@ -859,7 +859,7 @@ KisImageSP KisDoc::newImage(const TQString& name, TQ_INT32 width, TQ_INT32 heigh KisImageSP img = new KisImage(this, width, height, colorstrategy, name); TQ_CHECK_PTR(img); - connect( img, TQT_SIGNAL( sigImageModified() ), this, TQT_SLOT( slotImageUpdated() )); + connect( img, TQ_SIGNAL( sigImageModified() ), this, TQ_SLOT( slotImageUpdated() )); KisPaintLayer *layer = new KisPaintLayer(img, img->nextLayerName(), OPACITY_OPAQUE,colorstrategy); TQ_CHECK_PTR(layer); @@ -898,7 +898,7 @@ bool KisDoc::newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, Kis img = new KisImage(this, width, height, cs, name); TQ_CHECK_PTR(img); - connect( img, TQT_SIGNAL( sigImageModified() ), this, TQT_SLOT( slotImageUpdated() )); + connect( img, TQ_SIGNAL( sigImageModified() ), this, TQ_SLOT( slotImageUpdated() )); img->setResolution(imgResolution, imgResolution); img->setDescription(imgDescription); img->setProfile(cs->getProfile()); diff --git a/chalk/ui/kis_double_widget.cpp b/chalk/ui/kis_double_widget.cpp index 37f2b862b..3a84bf3cd 100644 --- a/chalk/ui/kis_double_widget.cpp +++ b/chalk/ui/kis_double_widget.cpp @@ -46,12 +46,12 @@ KisDoubleWidget::~KisDoubleWidget() void KisDoubleWidget::init(double min, double max) { m_spinBox = new KDoubleSpinBox(min, max, 0.05, 0, 2, this, "spinbox"); - connect(m_spinBox, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(setSliderValue(double))); + connect(m_spinBox, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(setSliderValue(double))); m_slider = new TQSlider(static_cast<int>(min * 100 + 0.5), static_cast<int>(max * 100 + 0.5), 1, 0, TQt::Horizontal, this, "sld"); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged(int))); - connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); - connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged(int))); + connect(m_slider, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed())); + connect(m_slider, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased())); m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout"); diff --git a/chalk/ui/kis_filter_manager.cpp b/chalk/ui/kis_filter_manager.cpp index 848f99b73..2334acd1c 100644 --- a/chalk/ui/kis_filter_manager.cpp +++ b/chalk/ui/kis_filter_manager.cpp @@ -66,7 +66,7 @@ KisFilterManager::KisFilterManager(KisView * view, KisDoc * doc) m_filterMapper = new TQSignalMapper(this); - connect(m_filterMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotApplyFilter(int))); + connect(m_filterMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotApplyFilter(int))); } @@ -154,7 +154,7 @@ void KisFilterManager::setup(TDEActionCollection * ac) m_reapplyAction = new TDEAction(i18n("Apply Filter Again"), "Ctrl+Shift+F", - this, TQT_SLOT(slotApply()), + this, TQ_SLOT(slotApply()), ac, "filter_apply_again"); m_reapplyAction->setEnabled(false); @@ -167,7 +167,7 @@ void KisFilterManager::setup(TDEActionCollection * ac) if (!f) break; // Create action - TDEAction * a = new TDEAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac, + TDEAction * a = new TDEAction(f->menuEntry(), 0, m_filterMapper, TQ_SLOT(map()), ac, TQString("chalk_filter_%1").arg((*it) . id()).ascii()); // Add action to the right submenu @@ -349,11 +349,11 @@ void KisFilterManager::slotApplyFilter(int i) if( m_lastWidget != 0) { - connect(m_lastWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); + connect(m_lastWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged())); m_lastDialog->previewWidget()->slotSetDevice( dev ); - connect(m_lastDialog->previewWidget(), TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + connect(m_lastDialog->previewWidget(), TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview())); TQGridLayout *widgetLayout = new TQGridLayout((TQWidget *)m_lastDialog->container(), 1, 1); diff --git a/chalk/ui/kis_gradient_chooser.cpp b/chalk/ui/kis_gradient_chooser.cpp index 5022a28b9..927522415 100644 --- a/chalk/ui/kis_gradient_chooser.cpp +++ b/chalk/ui/kis_gradient_chooser.cpp @@ -37,7 +37,7 @@ KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * pare { m_page = new KisAutogradient(this, "autogradient", i18n("Custom Gradient")); setMainWidget(m_page); - connect(m_page, TQT_SIGNAL(activatedResource(KisResource *)), view, TQT_SLOT(gradientActivated(KisResource*))); + connect(m_page, TQ_SIGNAL(activatedResource(KisResource *)), view, TQ_SLOT(gradientActivated(KisResource*))); } KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const char *name) : super(parent, name) @@ -47,7 +47,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c m_customGradient = new TQPushButton(i18n("Custom Gradient..."), this, "custom gradient button"); KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient"); - connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show())); + connect(m_customGradient, TQ_SIGNAL(clicked()), autogradient, TQ_SLOT(show())); TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); diff --git a/chalk/ui/kis_gradient_slider_widget.cpp b/chalk/ui/kis_gradient_slider_widget.cpp index 939c654e6..365e64d84 100644 --- a/chalk/ui/kis_gradient_slider_widget.cpp +++ b/chalk/ui/kis_gradient_slider_widget.cpp @@ -43,7 +43,7 @@ KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *parent, const char* n m_segmentMenu->insertItem(i18n("Duplicate Segment"), DUPLICATE_SEGMENT); m_segmentMenu->insertItem(i18n("Mirror Segment"), MIRROR_SEGMENT); m_segmentMenu->insertItem(i18n("Remove Segment"), REMOVE_SEGMENT); - connect( m_segmentMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotMenuAction(int) ) ); + connect( m_segmentMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotMenuAction(int) ) ); } void KisGradientSliderWidget::setGradientResource( KisAutogradientResource* agr) diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp index 1852438d5..71ed71bb4 100644 --- a/chalk/ui/kis_grid_manager.cpp +++ b/chalk/ui/kis_grid_manager.cpp @@ -53,17 +53,17 @@ KisGridManager::~KisGridManager() void KisGridManager::setup(TDEActionCollection * collection) { - m_toggleGrid = new TDEToggleAction(i18n("Show Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_grid"); + m_toggleGrid = new TDEToggleAction(i18n("Show Grid"), "", this, TQ_SLOT(toggleGrid()), collection, "view_toggle_grid"); m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Grid"))); m_toggleGrid->setChecked(false); // Fast grid config - m_gridFastConfig1x1 = new TDEAction(i18n("1x1"), 0, "", this, TQT_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1"); - m_gridFastConfig2x2 = new TDEAction(i18n("2x2"), 0, "", this, TQT_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2"); - m_gridFastConfig5x5 = new TDEAction(i18n("5x5"), 0, "", this, TQT_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5"); - m_gridFastConfig10x10 = new TDEAction(i18n("10x10"), 0, "", this, TQT_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10"); - m_gridFastConfig20x20 = new TDEAction(i18n("20x20"), 0, "", this, TQT_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20"); - m_gridFastConfig40x40 = new TDEAction(i18n("40x40"), 0, "", this, TQT_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40"); + m_gridFastConfig1x1 = new TDEAction(i18n("1x1"), 0, "", this, TQ_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1"); + m_gridFastConfig2x2 = new TDEAction(i18n("2x2"), 0, "", this, TQ_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2"); + m_gridFastConfig5x5 = new TDEAction(i18n("5x5"), 0, "", this, TQ_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5"); + m_gridFastConfig10x10 = new TDEAction(i18n("10x10"), 0, "", this, TQ_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10"); + m_gridFastConfig20x20 = new TDEAction(i18n("20x20"), 0, "", this, TQ_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20"); + m_gridFastConfig40x40 = new TDEAction(i18n("40x40"), 0, "", this, TQ_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40"); } void KisGridManager::updateGUI() diff --git a/chalk/ui/kis_import_catcher.cpp b/chalk/ui/kis_import_catcher.cpp index 26040309b..23f113591 100644 --- a/chalk/ui/kis_import_catcher.cpp +++ b/chalk/ui/kis_import_catcher.cpp @@ -37,7 +37,7 @@ KisImportCatcher::KisImportCatcher(KURL url, KisImageSP image) slotLoadingFinished(); } else { - connect(m_doc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); + connect(m_doc, TQ_SIGNAL(loadingFinished()), this, TQ_SLOT(slotLoadingFinished())); } } diff --git a/chalk/ui/kis_int_spinbox.cpp b/chalk/ui/kis_int_spinbox.cpp index 9e561287e..9a70eb94d 100644 --- a/chalk/ui/kis_int_spinbox.cpp +++ b/chalk/ui/kis_int_spinbox.cpp @@ -100,12 +100,12 @@ void KisIntSpinbox::init(int val) setFocusProxy(d->m_numinput); layout(); - connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int))); - connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); - connect(d->m_slider, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); - connect(d->m_slider, TQT_SIGNAL(aboutToHide()), TQT_SLOT(slotAboutToHide())); + connect(d->m_numinput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinboxValueChanged(int))); + connect(d->m_slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int))); + connect(d->m_slider, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); + connect(d->m_slider, TQ_SIGNAL(aboutToHide()), TQ_SLOT(slotAboutToHide())); - connect(&(d->m_timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&(d->m_timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } void KisIntSpinbox::spinboxValueChanged(int val) diff --git a/chalk/ui/kis_int_spinbox.h b/chalk/ui/kis_int_spinbox.h index 939312fab..06db18700 100644 --- a/chalk/ui/kis_int_spinbox.h +++ b/chalk/ui/kis_int_spinbox.h @@ -44,7 +44,7 @@ public: m_slider = new TQSlider(minValue, maxValue, pageStep, value, orientation, this, name); //m_slider->setTracking(false); insertItem(m_slider); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int))); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(valueChanged(int))); } void setTickInterval(int i) { m_slider->setTickInterval(i); } void setRange(int minValue, int maxValue) { m_slider->setRange(minValue, maxValue); } diff --git a/chalk/ui/kis_itemchooser.cpp b/chalk/ui/kis_itemchooser.cpp index d33c38738..661ef284d 100644 --- a/chalk/ui/kis_itemchooser.cpp +++ b/chalk/ui/kis_itemchooser.cpp @@ -30,7 +30,7 @@ KisItemChooser::KisItemChooser(TQWidget *parent, const char *name) : super(paren /* m_frame = new TQVBox(this); m_frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);*/ m_chooser = new KoIconChooser(TQSize(30,30), this, "icon_chooser", true); - TQObject::connect(m_chooser, TQT_SIGNAL(selected(KoIconItem*)), this, TQT_SLOT(slotItemSelected(KoIconItem*))); + TQObject::connect(m_chooser, TQ_SIGNAL(selected(KoIconItem*)), this, TQ_SLOT(slotItemSelected(KoIconItem*))); } KisItemChooser::~KisItemChooser() diff --git a/chalk/ui/kis_label_progress.cpp b/chalk/ui/kis_label_progress.cpp index 0caadcbba..383b8254d 100644 --- a/chalk/ui/kis_label_progress.cpp +++ b/chalk/ui/kis_label_progress.cpp @@ -58,7 +58,7 @@ KisLabelProgress::KisLabelProgress(TQWidget *parent, const char *name, WFlags f) m_cancelButton = new EscapeButton(this, "cancel_button"); m_cancelButton->setIconSet(cancelIconSet); TQToolTip::add(m_cancelButton, i18n("Cancel")); - connect(m_cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancelPressed())); + connect(m_cancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(cancelPressed())); m_bar = new KProgress(100, this); } @@ -75,11 +75,11 @@ void KisLabelProgress::setSubject(KisProgressSubject *subject, bool modal, bool m_subject = subject; m_modal = modal; - connect(subject, TQT_SIGNAL(notifyProgress(int)), this, TQT_SLOT(update(int))); - connect(subject, TQT_SIGNAL(notifyProgressStage(const TQString&, int)), this, TQT_SLOT(updateStage(const TQString&, int))); - connect(subject, TQT_SIGNAL(notifyProgressDone()), this, TQT_SLOT(done())); - connect(subject, TQT_SIGNAL(notifyProgressError()), this, TQT_SLOT(error())); - connect(subject, TQT_SIGNAL(destroyed()), this, TQT_SLOT(subjectDestroyed())); + connect(subject, TQ_SIGNAL(notifyProgress(int)), this, TQ_SLOT(update(int))); + connect(subject, TQ_SIGNAL(notifyProgressStage(const TQString&, int)), this, TQ_SLOT(updateStage(const TQString&, int))); + connect(subject, TQ_SIGNAL(notifyProgressDone()), this, TQ_SLOT(done())); + connect(subject, TQ_SIGNAL(notifyProgressError()), this, TQ_SLOT(error())); + connect(subject, TQ_SIGNAL(destroyed()), this, TQ_SLOT(subjectDestroyed())); show(); diff --git a/chalk/ui/kis_layerbox.cpp b/chalk/ui/kis_layerbox.cpp index 7e924f5ab..56462859f 100644 --- a/chalk/ui/kis_layerbox.cpp +++ b/chalk/ui/kis_layerbox.cpp @@ -95,27 +95,27 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char loadPixmap("unlocked.png", il, TDEIcon::SizeSmallMedium)); - connect(list()->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); - connect(list(), TQT_SIGNAL(activated(LayerItem*)), - TQT_SLOT(slotLayerActivated(LayerItem*))); - connect(list(), TQT_SIGNAL(displayNameChanged(LayerItem*, const TQString&)), - TQT_SLOT(slotLayerDisplayNameChanged(LayerItem*, const TQString&))); - connect(list(), TQT_SIGNAL(propertyChanged(LayerItem*, const TQString&, bool)), - TQT_SLOT(slotLayerPropertyChanged(LayerItem*, const TQString&, bool))); - connect(list(), TQT_SIGNAL(layerMoved(LayerItem*, LayerItem*, LayerItem*)), - TQT_SLOT(slotLayerMoved(LayerItem*, LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewLayer(LayerItem*, LayerItem*)), - TQT_SLOT(slotRequestNewLayer(LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewFolder(LayerItem*, LayerItem*)), - TQT_SLOT(slotRequestNewFolder(LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewAdjustmentLayer(LayerItem*, LayerItem*)), - TQT_SLOT(slotRequestNewAdjustmentLayer(LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&)), - TQT_SLOT(slotRequestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&))); - connect(list(), TQT_SIGNAL(requestRemoveLayer(LayerItem*)), - TQT_SLOT(slotRequestRemoveLayer(LayerItem*))); - connect(list(), TQT_SIGNAL(requestLayerProperties(LayerItem*)), - TQT_SLOT(slotRequestLayerProperties(LayerItem*))); + connect(list()->contextMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); + connect(list(), TQ_SIGNAL(activated(LayerItem*)), + TQ_SLOT(slotLayerActivated(LayerItem*))); + connect(list(), TQ_SIGNAL(displayNameChanged(LayerItem*, const TQString&)), + TQ_SLOT(slotLayerDisplayNameChanged(LayerItem*, const TQString&))); + connect(list(), TQ_SIGNAL(propertyChanged(LayerItem*, const TQString&, bool)), + TQ_SLOT(slotLayerPropertyChanged(LayerItem*, const TQString&, bool))); + connect(list(), TQ_SIGNAL(layerMoved(LayerItem*, LayerItem*, LayerItem*)), + TQ_SLOT(slotLayerMoved(LayerItem*, LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewLayer(LayerItem*, LayerItem*)), + TQ_SLOT(slotRequestNewLayer(LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewFolder(LayerItem*, LayerItem*)), + TQ_SLOT(slotRequestNewFolder(LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewAdjustmentLayer(LayerItem*, LayerItem*)), + TQ_SLOT(slotRequestNewAdjustmentLayer(LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&)), + TQ_SLOT(slotRequestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&))); + connect(list(), TQ_SIGNAL(requestRemoveLayer(LayerItem*)), + TQ_SLOT(slotRequestRemoveLayer(LayerItem*))); + connect(list(), TQ_SIGNAL(requestLayerProperties(LayerItem*)), + TQ_SLOT(slotRequestLayerProperties(LayerItem*))); m_newLayerMenu = new TDEPopupMenu(this); m_lst->bnAdd->setPopup(m_newLayerMenu); @@ -125,22 +125,22 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char m_newLayerMenu->insertItem( SmallIconSet( "tool_filter" ), i18n( "New &Adjustment Layer..." ), ADJUSTMENT_LAYER ); m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", this ); m_partLayerAction->plug( m_newLayerMenu ); - connect(m_partLayerAction, TQT_SIGNAL(activated()), this, TQT_SLOT(slotAddMenuActivated())); - connect(m_newLayerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAddMenuActivated(int))); + connect(m_partLayerAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotAddMenuActivated())); + connect(m_newLayerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAddMenuActivated(int))); - connect(m_lst->bnDelete, TQT_SIGNAL(clicked()), TQT_SLOT(slotRmClicked())); - connect(m_lst->bnRaise, TQT_SIGNAL(clicked()), TQT_SLOT(slotRaiseClicked())); - connect(m_lst->bnLower, TQT_SIGNAL(clicked()), TQT_SLOT(slotLowerClicked())); - connect(m_lst->bnProperties, TQT_SIGNAL(clicked()), TQT_SLOT(slotPropertiesClicked())); - connect(m_lst->intOpacity, TQT_SIGNAL(valueChanged(int, bool)), TQT_SIGNAL(sigOpacityChanged(int, bool))); - connect(m_lst->intOpacity, TQT_SIGNAL(finishedChanging(int, int)), TQT_SIGNAL(sigOpacityFinishedChanging(int, int))); - connect(m_lst->cmbComposite, TQT_SIGNAL(activated(const KisCompositeOp&)), TQT_SIGNAL(sigItemComposite(const KisCompositeOp&))); + connect(m_lst->bnDelete, TQ_SIGNAL(clicked()), TQ_SLOT(slotRmClicked())); + connect(m_lst->bnRaise, TQ_SIGNAL(clicked()), TQ_SLOT(slotRaiseClicked())); + connect(m_lst->bnLower, TQ_SIGNAL(clicked()), TQ_SLOT(slotLowerClicked())); + connect(m_lst->bnProperties, TQ_SIGNAL(clicked()), TQ_SLOT(slotPropertiesClicked())); + connect(m_lst->intOpacity, TQ_SIGNAL(valueChanged(int, bool)), TQ_SIGNAL(sigOpacityChanged(int, bool))); + connect(m_lst->intOpacity, TQ_SIGNAL(finishedChanging(int, int)), TQ_SIGNAL(sigOpacityFinishedChanging(int, int))); + connect(m_lst->cmbComposite, TQ_SIGNAL(activated(const KisCompositeOp&)), TQ_SIGNAL(sigItemComposite(const KisCompositeOp&))); Q_ASSERT(subject->document() != 0); if (subject->document()) { - connect(subject->document(), TQT_SIGNAL(sigCommandExecuted()), TQT_SLOT(updateThumbnails())); + connect(subject->document(), TQ_SIGNAL(sigCommandExecuted()), TQ_SLOT(updateThumbnails())); } } @@ -165,16 +165,16 @@ void KisLayerBox::setImage(KisImageSP img) if (img) { - connect(img, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayerAdded(KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(slotLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), - this, TQT_SLOT(slotLayerPropertiesChanged(KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(slotLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged(KisGroupLayerSP))); - connect(img, TQT_SIGNAL(sigLayerUpdated(KisLayerSP, TQRect)), this, TQT_SLOT(slotLayerUpdated(KisLayerSP, TQRect))); + connect(img, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQ_SLOT(slotLayerAdded(KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(slotLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), + this, TQ_SLOT(slotLayerPropertiesChanged(KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(slotLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQ_SLOT(slotLayersChanged(KisGroupLayerSP))); + connect(img, TQ_SIGNAL(sigLayerUpdated(KisLayerSP, TQRect)), this, TQ_SLOT(slotLayerUpdated(KisLayerSP, TQRect))); slotLayersChanged(img->rootLayer()); updateThumbnails(); } diff --git a/chalk/ui/kis_load_visitor.h b/chalk/ui/kis_load_visitor.h index bdac5e82b..5a1d2eed3 100644 --- a/chalk/ui/kis_load_visitor.h +++ b/chalk/ui/kis_load_visitor.h @@ -51,7 +51,7 @@ public: } virtual bool visit(KisPaintLayer *layer) - { //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); + { //connect(*layer->paintDevice(), TQ_SIGNAL(ioProgress(TQ_INT8)), m_img, TQ_SLOT(slotIOProgress(TQ_INT8))); TQString location = m_external ? TQString() : m_uri; location += m_img->name() + "/layers/" + m_layerFilenames[layer]; @@ -138,7 +138,7 @@ public: virtual bool visit(KisAdjustmentLayer* layer) { - //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); + //connect(*layer->paintDevice(), TQ_SIGNAL(ioProgress(TQ_INT8)), m_img, TQ_SLOT(slotIOProgress(TQ_INT8))); // The selection -- if present. If not, we simply cannot open the dratted thing. TQString location = m_external ? TQString() : m_uri; diff --git a/chalk/ui/kis_multi_bool_filter_widget.cpp b/chalk/ui/kis_multi_bool_filter_widget.cpp index e02695049..731527332 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.cpp +++ b/chalk/ui/kis_multi_bool_filter_widget.cpp @@ -48,7 +48,7 @@ KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * parent, const char m_boolWidgets[i] = new TQCheckBox( this, iwparam[i].name.ascii()); m_boolWidgets[i]->setChecked( iwparam[i].initvalue ); m_boolWidgets[i]->setText( iwparam[i].label ); - connect(m_boolWidgets[i], TQT_SIGNAL(toggled( bool ) ), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect(m_boolWidgets[i], TQ_SIGNAL(toggled( bool ) ), TQ_SIGNAL(sigPleaseUpdatePreview())); widgetLayout->add( m_boolWidgets[i]); } // TQSpacerItem * sp = new TQSpacerItem(1, 1); diff --git a/chalk/ui/kis_multi_double_filter_widget.cpp b/chalk/ui/kis_multi_double_filter_widget.cpp index 9491f2218..b8afe8303 100644 --- a/chalk/ui/kis_multi_double_filter_widget.cpp +++ b/chalk/ui/kis_multi_double_filter_widget.cpp @@ -30,8 +30,8 @@ KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, cons : KDoubleNumInput(parent, name) { m_timer = new TQTimer(this, name); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(slotTimeToUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(slotTimeToUpdate())); } void KisDelayedActionDoubleInput::slotTimeToUpdate() @@ -78,7 +78,7 @@ KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * parent, const m_doubleWidgets[i]->setValue( dwparam[i].initvalue ); m_doubleWidgets[i]->cancelDelayedSignal(); - connect(m_doubleWidgets[i], TQT_SIGNAL(valueChangedDelayed(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect(m_doubleWidgets[i], TQ_SIGNAL(valueChangedDelayed(double)), TQ_SIGNAL(sigPleaseUpdatePreview())); TQLabel* lbl = new TQLabel(dwparam[i].label+":", this); widgetLayout->addWidget( lbl, i , 0); diff --git a/chalk/ui/kis_multi_integer_filter_widget.cpp b/chalk/ui/kis_multi_integer_filter_widget.cpp index aef29d2cb..b0289e6c1 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.cpp +++ b/chalk/ui/kis_multi_integer_filter_widget.cpp @@ -29,8 +29,8 @@ KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, co : KIntNumInput(parent, name) { m_timer = new TQTimer(this, name); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); - connect(this, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotTimeToUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotTimeToUpdate())); } void KisDelayedActionIntegerInput::slotTimeToUpdate() @@ -78,7 +78,7 @@ KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * parent, m_integerWidgets[i]->setValue( iwparam[i].initvalue ); m_integerWidgets[i]->cancelDelayedSignal(); - connect(m_integerWidgets[i], TQT_SIGNAL(valueChangedDelayed( int )), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect(m_integerWidgets[i], TQ_SIGNAL(valueChangedDelayed( int )), TQ_SIGNAL(sigPleaseUpdatePreview())); TQLabel* lbl = new TQLabel(iwparam[i].label+":", this); widgetLayout->addWidget( lbl, i , 0); diff --git a/chalk/ui/kis_opengl_image_context.cpp b/chalk/ui/kis_opengl_image_context.cpp index 6a302192b..c016ab83a 100644 --- a/chalk/ui/kis_opengl_image_context.cpp +++ b/chalk/ui/kis_opengl_image_context.cpp @@ -98,10 +98,10 @@ KisOpenGLImageContext::KisOpenGLImageContext(KisImageSP image, KisProfile *monit createImageTextureTiles(); - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), - TQT_SLOT(slotImageUpdated(TQRect))); - connect(m_image, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), - TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), + TQ_SLOT(slotImageUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), + TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); updateImageTextureTiles(m_image->bounds()); } diff --git a/chalk/ui/kis_paintop_box.cpp b/chalk/ui/kis_paintop_box.cpp index 57ed7a736..e0aa92854 100644 --- a/chalk/ui/kis_paintop_box.cpp +++ b/chalk/ui/kis_paintop_box.cpp @@ -64,8 +64,8 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam m_layout = new TQHBoxLayout(this, 1, 1); m_layout->addWidget(m_cmbPaintops); - connect(this, TQT_SIGNAL(selected(const KisID &, const KisPaintOpSettings *)), view, TQT_SLOT(paintopActivated(const KisID &, const KisPaintOpSettings *))); - connect(m_cmbPaintops, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotItemSelected(int))); + connect(this, TQ_SIGNAL(selected(const KisID &, const KisPaintOpSettings *)), view, TQ_SLOT(paintopActivated(const KisID &, const KisPaintOpSettings *))); + connect(m_cmbPaintops, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotItemSelected(int))); // XXX: Let's see... Are all paintops loaded and ready? KisIDList keys = KisPaintOpRegistry::instance()->listKeys(); @@ -74,10 +74,10 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam addItem(*it); } - connect(view, TQT_SIGNAL(currentColorSpaceChanged(KisColorSpace*)), - this, TQT_SLOT(colorSpaceChanged(KisColorSpace*))); - connect(view, TQT_SIGNAL(sigInputDeviceChanged(const KisInputDevice&)), - this, TQT_SLOT(slotInputDeviceChanged(const KisInputDevice&))); + connect(view, TQ_SIGNAL(currentColorSpaceChanged(KisColorSpace*)), + this, TQ_SLOT(colorSpaceChanged(KisColorSpace*))); + connect(view, TQ_SIGNAL(sigInputDeviceChanged(const KisInputDevice&)), + this, TQ_SLOT(slotInputDeviceChanged(const KisInputDevice&))); setCurrentPaintop(defaultPaintop(m_canvasController->currentInputDevice())); } diff --git a/chalk/ui/kis_palette_view.cpp b/chalk/ui/kis_palette_view.cpp index 2e17f651a..56b0e407b 100644 --- a/chalk/ui/kis_palette_view.cpp +++ b/chalk/ui/kis_palette_view.cpp @@ -114,11 +114,11 @@ void KisPaletteView::setPalette(KisPalette* palette) m_cells->setColor( i, c ); } - connect(m_cells, TQT_SIGNAL(colorSelected(int)), - TQT_SLOT(slotColorCellSelected(int))); + connect(m_cells, TQ_SIGNAL(colorSelected(int)), + TQ_SLOT(slotColorCellSelected(int))); - connect(m_cells, TQT_SIGNAL(colorDoubleClicked(int)), - TQT_SLOT(slotColorCellDoubleClicked(int)) ); + connect(m_cells, TQ_SIGNAL(colorDoubleClicked(int)), + TQ_SLOT(slotColorCellDoubleClicked(int)) ); addChild( m_cells ); m_cells->show(); diff --git a/chalk/ui/kis_palette_widget.cpp b/chalk/ui/kis_palette_widget.cpp index 4fe899e27..e401e94fe 100644 --- a/chalk/ui/kis_palette_widget.cpp +++ b/chalk/ui/kis_palette_widget.cpp @@ -78,14 +78,14 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) //setFixedSize(sizeHint()); - connect(combo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotSetPalette(const TQString &))); - connect(m_view, TQT_SIGNAL(colorSelected(const KisColor &)), - this, TQT_SIGNAL(colorSelected(const KisColor &))); - connect(m_view, TQT_SIGNAL(colorSelected(const TQColor &)), - this, TQT_SIGNAL(colorSelected(const TQColor &))); - connect(m_view, TQT_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &)), - this, TQT_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &))); + connect(combo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotSetPalette(const TQString &))); + connect(m_view, TQ_SIGNAL(colorSelected(const KisColor &)), + this, TQ_SIGNAL(colorSelected(const KisColor &))); + connect(m_view, TQ_SIGNAL(colorSelected(const TQColor &)), + this, TQ_SIGNAL(colorSelected(const TQColor &))); + connect(m_view, TQ_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &)), + this, TQ_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &))); } KisPaletteWidget::~KisPaletteWidget() diff --git a/chalk/ui/kis_part_layer.cpp b/chalk/ui/kis_part_layer.cpp index 4c05360eb..167d5b3eb 100644 --- a/chalk/ui/kis_part_layer.cpp +++ b/chalk/ui/kis_part_layer.cpp @@ -86,8 +86,8 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) TQPtrList<KoView> views = child->parentDocument()->views(); Q_ASSERT(views.count()); // XXX iterate over views - connect(views.at(0), TQT_SIGNAL(activated(bool)), - this, TQT_SLOT(childDeactivated(bool))); + connect(views.at(0), TQ_SIGNAL(activated(bool)), + this, TQ_SLOT(childDeactivated(bool))); } } @@ -99,7 +99,7 @@ void KisPartLayerImpl::childDeactivated(bool activated) if (m_activated && !activated /* no clue, but debugging suggests it is false here */) { TQPtrList<KoView> views = m_doc->parentDocument()->views(); Q_ASSERT(views.count()); - views.at(0)->disconnect(TQT_SIGNAL(activated(bool))); + views.at(0)->disconnect(TQ_SIGNAL(activated(bool))); m_activated = false; setDirty(m_doc->geometry()); } @@ -240,10 +240,10 @@ bool KisConnectPartLayerVisitor::visit(KisGroupLayer *layer) { bool KisConnectPartLayerVisitor::visit(KisPartLayer *layer) { if (m_connect) { - TQObject::connect(m_view, TQT_SIGNAL(childActivated(KoDocumentChild*)), - layer, TQT_SLOT(childActivated(KoDocumentChild*))); + TQObject::connect(m_view, TQ_SIGNAL(childActivated(KoDocumentChild*)), + layer, TQ_SLOT(childActivated(KoDocumentChild*))); } else { - TQObject::disconnect(m_view, TQT_SIGNAL(childActivated(KoDocumentChild*)), layer, 0 ); + TQObject::disconnect(m_view, TQ_SIGNAL(childActivated(KoDocumentChild*)), layer, 0 ); } return true; diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp index d128f2209..91a21d55a 100644 --- a/chalk/ui/kis_perspective_grid_manager.cpp +++ b/chalk/ui/kis_perspective_grid_manager.cpp @@ -57,10 +57,10 @@ void KisPerspectiveGridManager::updateGUI() void KisPerspectiveGridManager::setup(TDEActionCollection * collection) { kdDebug() << "KisPerspectiveGridManager::setup(TDEActionCollection * collection)" << endl; - m_toggleGrid = new TDEToggleAction(i18n("Show Perspective Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid"); + m_toggleGrid = new TDEToggleAction(i18n("Show Perspective Grid"), "", this, TQ_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid"); m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Perspective Grid"))); m_toggleGrid->setChecked(false); - m_gridClear = new TDEAction(i18n("Clear Perspective Grid"), 0, "", this, TQT_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid"); + m_gridClear = new TDEAction(i18n("Clear Perspective Grid"), 0, "", this, TQ_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid"); } void KisPerspectiveGridManager::setGridVisible(bool t) diff --git a/chalk/ui/kis_previewwidget.cpp b/chalk/ui/kis_previewwidget.cpp index f2fe0bb7a..011d0b98b 100644 --- a/chalk/ui/kis_previewwidget.cpp +++ b/chalk/ui/kis_previewwidget.cpp @@ -86,17 +86,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name ) , m_firstZoom(true) { btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-in", TDEIcon::MainToolbar, 16 )); - connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn())); + connect(btnZoomIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomIn())); btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-out", TDEIcon::MainToolbar, 16 )); - connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut())); + connect(btnZoomOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomOut())); btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", TDEIcon::MainToolbar, 16 )); - connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate())); + connect(btnUpdate, TQ_SIGNAL(clicked()), this, TQ_SLOT(forceUpdate())); - connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool))); + connect(radioBtnPreview, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setPreviewDisplayed(bool))); - connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool))); + connect(checkBoxAutoUpdate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetAutoUpdate(bool))); btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-original", TDEIcon::MainToolbar, 16 )); - connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne())); + connect(btnZoomOneToOne, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomOneToOne())); m_progress = new KisLabelProgress(frmProgress); m_progress->setMaximumHeight(fontMetrics().height() ); @@ -104,18 +104,18 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name ) vbox->addWidget(m_progress); m_progress->hide(); - connect(m_zoomTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateZoom())); - connect(m_filterTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(runFilterHelper())); + connect(m_zoomTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateZoom())); + connect(m_filterTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(runFilterHelper())); /* kToolBar1->insertLineSeparator(); kToolBar1->insertButton("reload",2, true, i18n("Update")); - connect(kToolBar1->getButton(2),TQT_SIGNAL(clicked()),this,TQT_SLOT(forceUpdate())); + connect(kToolBar1->getButton(2),TQ_SIGNAL(clicked()),this,TQ_SLOT(forceUpdate())); kToolBar1->insertButton("",3, true, i18n("Auto Update")); - connect(kToolBar1->getButton(3),TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleAutoUpdate())); + connect(kToolBar1->getButton(3),TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleAutoUpdate())); kToolBar1->insertButton("",4, true, i18n("Switch")); - connect(kToolBar1->getButton(4),TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleImageDisplayed()));*/ + connect(kToolBar1->getButton(4),TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleImageDisplayed()));*/ // these currently don't yet work, reenable when they do work :) (TZ-12-2005) // TODO reenable these // kToolBar1->insertButton("",5, true, i18n("Popup Original and Preview")); diff --git a/chalk/ui/kis_resource_mediator.cpp b/chalk/ui/kis_resource_mediator.cpp index ddecf85a6..baea3e9e9 100644 --- a/chalk/ui/kis_resource_mediator.cpp +++ b/chalk/ui/kis_resource_mediator.cpp @@ -32,7 +32,7 @@ KisResourceMediator::KisResourceMediator(KisItemChooser *chooser, Q_ASSERT(chooser); m_activeItem = 0; - connect(m_chooser, TQT_SIGNAL(selected(KoIconItem*)), TQT_SLOT(setActiveItem(KoIconItem*))); + connect(m_chooser, TQ_SIGNAL(selected(KoIconItem*)), TQ_SLOT(setActiveItem(KoIconItem*))); } KisResourceMediator::~KisResourceMediator() @@ -48,8 +48,8 @@ void KisResourceMediator::connectServer(KisResourceServerBase* rServer) rServerAddedResource( *it ); // And connect to the server permanently, so that we may recieve updates afterwards - connect(rServer, TQT_SIGNAL(resourceAdded(KisResource*)), - this, TQT_SLOT(rServerAddedResource(KisResource*))); + connect(rServer, TQ_SIGNAL(resourceAdded(KisResource*)), + this, TQ_SLOT(rServerAddedResource(KisResource*))); } KisResource *KisResourceMediator::currentResource() const diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h index de98548cd..e66cd3f0f 100644 --- a/chalk/ui/kis_save_visitor.h +++ b/chalk/ui/kis_save_visitor.h @@ -47,7 +47,7 @@ public: virtual bool visit(KisPaintLayer *layer) { - //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); + //connect(*layer->paintDevice(), TQ_SIGNAL(ioProgress(TQ_INT8)), m_img, TQ_SLOT(slotIOProgress(TQ_INT8))); TQString location = m_external ? TQString() : m_uri; location += m_img->name() + TQString("/layers/layer%1").arg(m_count); diff --git a/chalk/ui/kis_selection_manager.cpp b/chalk/ui/kis_selection_manager.cpp index 7d001586a..e01e36f2c 100644 --- a/chalk/ui/kis_selection_manager.cpp +++ b/chalk/ui/kis_selection_manager.cpp @@ -102,142 +102,142 @@ void KisSelectionManager::setup(TDEActionCollection * collection) // XXX: setup shortcuts! m_cut = KStdAction::cut(this, - TQT_SLOT(cut()), + TQ_SLOT(cut()), collection, "cut"); m_copy = KStdAction::copy(this, - TQT_SLOT(copy()), + TQ_SLOT(copy()), collection, "copy"); m_paste = KStdAction::paste(this, - TQT_SLOT(paste()), + TQ_SLOT(paste()), collection, "paste"); m_pasteNew = new TDEAction(i18n("Paste into &New Image"), 0, 0, - this, TQT_SLOT(pasteNew()), + this, TQ_SLOT(pasteNew()), collection, "paste_new"); m_selectAll = KStdAction::selectAll(this, - TQT_SLOT(selectAll()), + TQ_SLOT(selectAll()), collection, "select_all"); m_deselect = KStdAction::deselect(this, - TQT_SLOT(deselect()), + TQ_SLOT(deselect()), collection, "deselect"); m_clear = KStdAction::clear(this, - TQT_SLOT(clear()), + TQ_SLOT(clear()), collection, "clear"); m_reselect = new TDEAction(i18n("&Reselect"), 0, "Ctrl+Shift+D", - this, TQT_SLOT(reselect()), + this, TQ_SLOT(reselect()), collection, "reselect"); m_invert = new TDEAction(i18n("&Invert"), 0, "Ctrl+I", - this, TQT_SLOT(invert()), + this, TQ_SLOT(invert()), collection, "invert"); m_toNewLayer = new TDEAction(i18n("Copy Selection to New Layer"), 0, "Ctrl+J", - this, TQT_SLOT(copySelectionToNewLayer()), + this, TQ_SLOT(copySelectionToNewLayer()), collection, "copy_selection_to_new_layer"); m_cutToNewLayer = new TDEAction(i18n("Cut Selection to New Layer"), 0, "Ctrl+Shift+J", - this, TQT_SLOT(cutToNewLayer()), + this, TQ_SLOT(cutToNewLayer()), collection, "cut_selection_to_new_layer"); m_feather = new TDEAction(i18n("Feather"), 0, "Ctrl+Alt+D", - this, TQT_SLOT(feather()), + this, TQ_SLOT(feather()), collection, "feather"); m_fillForegroundColor = new TDEAction(i18n("Fill with Foreground Color"), "Alt+backspace", this, - TQT_SLOT(fillForegroundColor()), + TQ_SLOT(fillForegroundColor()), collection, "fill_selection_foreground_color"); m_fillBackgroundColor = new TDEAction(i18n("Fill with Background Color"), "backspace", this, - TQT_SLOT(fillBackgroundColor()), + TQ_SLOT(fillBackgroundColor()), collection, "fill_selection_background_color"); m_fillPattern = new TDEAction(i18n("Fill with Pattern"), 0, this, - TQT_SLOT(fillPattern()), + TQ_SLOT(fillPattern()), collection, "fill_selection_pattern"); - m_toggleDisplaySelection = new TDEToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQT_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection"); + m_toggleDisplaySelection = new TDEToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQ_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection"); m_toggleDisplaySelection->setCheckedState(KGuiItem(i18n("Hide Selection"))); m_toggleDisplaySelection->setChecked(true); m_border = new TDEAction(i18n("Border..."), 0, 0, - this, TQT_SLOT(border()), + this, TQ_SLOT(border()), collection, "border"); m_expand = new TDEAction(i18n("Expand..."), 0, 0, - this, TQT_SLOT(expand()), + this, TQ_SLOT(expand()), collection, "expand"); m_smooth = new TDEAction(i18n("Smooth..."), 0, 0, - this, TQT_SLOT(smooth()), + this, TQ_SLOT(smooth()), collection, "smooth"); m_contract = new TDEAction(i18n("Contract..."), 0, 0, - this, TQT_SLOT(contract()), + this, TQ_SLOT(contract()), collection, "contract"); m_similar = new TDEAction(i18n("Similar"), 0, 0, - this, TQT_SLOT(similar()), + this, TQ_SLOT(similar()), collection, "similar"); m_transform = new TDEAction(i18n("Transform..."), 0, 0, - this, TQT_SLOT(transform()), + this, TQ_SLOT(transform()), collection, "transform_selection"); // m_load // = new TDEAction(i18n("Load..."), // 0, 0, -// this, TQT_SLOT(load()), +// this, TQ_SLOT(load()), // collection, "load_selection"); // // // m_save // = new TDEAction(i18n("Save As..."), // 0, 0, -// this, TQT_SLOT(save()), +// this, TQ_SLOT(save()), // collection, "save_selection"); TQClipboard *cb = TQApplication::clipboard(); - connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged())); + connect(cb, TQ_SIGNAL(dataChanged()), TQ_SLOT(clipboardDataChanged())); } void KisSelectionManager::clipboardDataChanged() diff --git a/chalk/ui/kis_selection_options.cpp b/chalk/ui/kis_selection_options.cpp index 8593d22ae..6c23b817d 100644 --- a/chalk/ui/kis_selection_options.cpp +++ b/chalk/ui/kis_selection_options.cpp @@ -42,7 +42,7 @@ KisSelectionOptions::KisSelectionOptions(TQWidget *parent, KisCanvasSubject * su TQVBoxLayout * l = new TQVBoxLayout(this); l->addWidget(m_page); - connect(m_page->cmbAction, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(actionChanged(int))); + connect(m_page->cmbAction, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(actionChanged(int))); } KisSelectionOptions::~KisSelectionOptions() diff --git a/chalk/ui/kis_text_brush.cpp b/chalk/ui/kis_text_brush.cpp index 8666f1a19..1a1564778 100644 --- a/chalk/ui/kis_text_brush.cpp +++ b/chalk/ui/kis_text_brush.cpp @@ -48,8 +48,8 @@ KisTextBrush::KisTextBrush(TQWidget *parent, const char* name, const TQString& c m_textBrushResource(new KisTextBrushResource()) { setCaption(caption); - connect((TQObject*)lineEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(rebuildTextBrush())); - connect((TQObject*)bnFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(getFont())); + connect((TQObject*)lineEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rebuildTextBrush())); + connect((TQObject*)bnFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(getFont())); m_font = font(); rebuildTextBrush(); } diff --git a/chalk/ui/kis_tool_dummy.cpp b/chalk/ui/kis_tool_dummy.cpp index de4ac0808..ed4f09fe1 100644 --- a/chalk/ui/kis_tool_dummy.cpp +++ b/chalk/ui/kis_tool_dummy.cpp @@ -87,7 +87,7 @@ void KisToolDummy::setup(TDEActionCollection *collection) m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new TDERadioAction(i18n("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT(activate()), collection, name()); m_action->setExclusiveGroup("tools"); m_ownAction = true; } diff --git a/chalk/ui/kis_tool_manager.cpp b/chalk/ui/kis_tool_manager.cpp index 043880586..3531370da 100644 --- a/chalk/ui/kis_tool_manager.cpp +++ b/chalk/ui/kis_tool_manager.cpp @@ -242,7 +242,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev for (vKisTool::iterator it = oldTools.begin(); it != oldTools.end(); ++it) { KisTool *tool = *it; TDEAction *toolAction = tool->action(); - toolAction->disconnect(TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); + toolAction->disconnect(TQ_SIGNAL(activated()), tool, TQ_SLOT(activate())); } } KisTool *oldTool = currentTool(); @@ -262,7 +262,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev for (vKisTool::iterator it = tools.begin(); it != tools.end(); ++it) { KisTool *tool = *it; TDEAction *toolAction = tool->action(); - connect(toolAction, TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); + connect(toolAction, TQ_SIGNAL(activated()), tool, TQ_SLOT(activate())); } } diff --git a/chalk/ui/kis_tool_paint.cpp b/chalk/ui/kis_tool_paint.cpp index 34fc77302..063021b3a 100644 --- a/chalk/ui/kis_tool_paint.cpp +++ b/chalk/ui/kis_tool_paint.cpp @@ -124,11 +124,11 @@ TQWidget* KisToolPaint::createOptionWidget(TQWidget* parent) m_slOpacity = new KisIntSpinbox( m_optionWidget, "int_m_optionwidget"); m_slOpacity->setRange( 0, 100); m_slOpacity->setValue(m_opacity / OPACITY_OPAQUE * 100); - connect(m_slOpacity, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetOpacity(int))); + connect(m_slOpacity, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetOpacity(int))); m_lbComposite = new TQLabel(i18n("Mode:"), m_optionWidget); m_cmbComposite = new KisCmbComposite(m_optionWidget); - connect(m_cmbComposite, TQT_SIGNAL(activated(const KisCompositeOp&)), this, TQT_SLOT(slotSetCompositeMode(const KisCompositeOp&))); + connect(m_cmbComposite, TQ_SIGNAL(activated(const KisCompositeOp&)), this, TQ_SLOT(slotSetCompositeMode(const KisCompositeOp&))); TQVBoxLayout* verticalLayout = new TQVBoxLayout(m_optionWidget); verticalLayout->setMargin(0); @@ -146,7 +146,7 @@ TQWidget* KisToolPaint::createOptionWidget(TQWidget* parent) if (!quickHelp().isEmpty()) { TQPushButton* push = new TQPushButton(SmallIconSet( "help" ), "", m_optionWidget); - connect(push, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPopupQuickHelp())); + connect(push, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPopupQuickHelp())); TQHBoxLayout* hLayout = new TQHBoxLayout(m_optionWidget); hLayout->addWidget(push); diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp index 08cbcd05d..79246afc4 100644 --- a/chalk/ui/kis_view.cpp +++ b/chalk/ui/kis_view.cpp @@ -257,7 +257,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c m_tabletEventTimer.start(); m_inputDevice = KisInputDevice::mouse(); - connect(&m_initialZoomTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotInitialZoomTimeout())); + connect(&m_initialZoomTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotInitialZoomTimeout())); m_paletteManager = new KoPaletteManager(this, actionCollection(), "Chalk palette manager"); if (cfg.fixDockerWidth()) m_paletteManager->setFixedWidth( 360 ); @@ -288,7 +288,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c else setXMLFile("chalk.rc"); - KStdAction::keyBindings( mainWindow()->guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::keyBindings( mainWindow()->guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); createLayerBox(); @@ -302,7 +302,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c dcopObject(); - connect(this, TQT_SIGNAL(autoScroll(const TQPoint &)), TQT_SLOT(slotAutoScroll(const TQPoint &))); + connect(this, TQ_SIGNAL(autoScroll(const TQPoint &)), TQ_SLOT(slotAutoScroll(const TQPoint &))); setMouseTracking(true); @@ -340,7 +340,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c { slotLoadingFinished(); } else { - connect(doc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); + connect(doc, TQ_SIGNAL(loadingFinished()), this, TQ_SLOT(slotLoadingFinished())); } setFocus(); @@ -426,20 +426,20 @@ void KisView::createLayerBox() m_layerBox = new KisLayerBox(this); m_layerBox->setCaption(i18n("Layers")); - connect(m_layerBox, TQT_SIGNAL(sigRequestLayer(KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(addLayer(KisGroupLayerSP, KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigRequestGroupLayer(KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigRequestAdjustmentLayer(KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigRequestPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)), - this, TQT_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&))); - connect(m_layerBox, TQT_SIGNAL(sigRequestLayerProperties(KisLayerSP)), - this, TQT_SLOT(showLayerProperties(KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigOpacityChanged(int, bool)), this, TQT_SLOT(layerOpacity(int, bool))); - connect(m_layerBox, TQT_SIGNAL(sigOpacityFinishedChanging(int, int)), - this, TQT_SLOT(layerOpacityFinishedChanging(int, int))); - connect(m_layerBox, TQT_SIGNAL(sigItemComposite(const KisCompositeOp&)), this, TQT_SLOT(layerCompositeOp(const KisCompositeOp&))); + connect(m_layerBox, TQ_SIGNAL(sigRequestLayer(KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(addLayer(KisGroupLayerSP, KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigRequestGroupLayer(KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigRequestAdjustmentLayer(KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigRequestPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)), + this, TQ_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&))); + connect(m_layerBox, TQ_SIGNAL(sigRequestLayerProperties(KisLayerSP)), + this, TQ_SLOT(showLayerProperties(KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigOpacityChanged(int, bool)), this, TQ_SLOT(layerOpacity(int, bool))); + connect(m_layerBox, TQ_SIGNAL(sigOpacityFinishedChanging(int, int)), + this, TQ_SLOT(layerOpacityFinishedChanging(int, int))); + connect(m_layerBox, TQ_SIGNAL(sigItemComposite(const KisCompositeOp&)), this, TQ_SLOT(layerCompositeOp(const KisCompositeOp&))); paletteManager()->addWidget(m_layerBox, "layerbox", chalk::LAYERBOX, 0); @@ -468,8 +468,8 @@ void KisView::setupScrollBars() m_hScroll->setGeometry(20, height() - 16, width() - 36, 16); m_hScroll->setValue(0); m_vScroll->setValue(0); - TQObject::connect(m_vScroll, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollV(int))); - TQObject::connect(m_hScroll, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollH(int))); + TQObject::connect(m_vScroll, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollV(int))); + TQObject::connect(m_hScroll, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollH(int))); } void KisView::setupRulers() @@ -601,85 +601,85 @@ void KisView::setupActions() m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this ); - connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_fullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); - m_imgProperties = new TDEAction(i18n("Image Properties"), 0, this, TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties"); + m_imgProperties = new TDEAction(i18n("Image Properties"), 0, this, TQ_SLOT(slotImageProperties()), actionCollection(), "img_properties"); m_imgScan = 0; // How the hell do I get a TDEAction to the scan plug-in?!? - m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, this, TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); + m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, this, TQ_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); // view actions - m_zoomIn = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); - m_zoomOut = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); - m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", this, TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels"); - m_actualSize = KStdAction::actualSize(this, TQT_SLOT(slotActualSize()), actionCollection(), "actual_size"); + m_zoomIn = KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); + m_zoomOut = KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); + m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", this, TQ_SLOT(slotActualPixels()), actionCollection(), "actual_pixels"); + m_actualSize = KStdAction::actualSize(this, TQ_SLOT(slotActualSize()), actionCollection(), "actual_size"); m_actualSize->setEnabled(false); - m_fitToCanvas = KStdAction::fitToPage(this, TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas"); + m_fitToCanvas = KStdAction::fitToPage(this, TQ_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas"); // layer actions - m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", this, TQT_SLOT(layerAdd()), actionCollection(), "insert_layer"); + m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", this, TQ_SLOT(layerAdd()), actionCollection(), "insert_layer"); m_actionPartLayer = new KoPartSelectAction( i18n( "&Object Layer" ), "frame_query", - this, TQT_SLOT( addPartLayer() ), + this, TQ_SLOT( addPartLayer() ), actionCollection(), "insert_part_layer" ); m_actionAdjustmentLayer = new TDEAction( i18n( "&Adjustment Layer" ), 0, - this, TQT_SLOT( addAdjustmentLayer() ), + this, TQ_SLOT( addAdjustmentLayer() ), actionCollection(), "insert_adjustment_layer" ); - m_layerRm = new TDEAction(i18n("&Remove"), 0, this, TQT_SLOT(layerRemove()), actionCollection(), "remove_layer"); - m_layerDup = new TDEAction(i18n("Duplicate"), 0, this, TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); - m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, this, TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); + m_layerRm = new TDEAction(i18n("&Remove"), 0, this, TQ_SLOT(layerRemove()), actionCollection(), "remove_layer"); + m_layerDup = new TDEAction(i18n("Duplicate"), 0, this, TQ_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); + m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, this, TQ_SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); m_layerHide->setCheckedState(KGuiItem(i18n("&Show"))); m_layerHide->setChecked(false); - m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", this, TQT_SLOT(layerRaise()), actionCollection(), "raiselayer"); - m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", this, TQT_SLOT(layerLower()), actionCollection(), "lowerlayer"); - m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", this, TQT_SLOT(layerFront()), actionCollection(), "toplayer"); - m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", this, TQT_SLOT(layerBack()), actionCollection(), "bottomlayer"); - m_layerProperties = new TDEAction(i18n("Properties"), 0, this, TQT_SLOT(layerProperties()), actionCollection(), "layer_properties"); - (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, this, TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); - m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", this, TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); - (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, this, TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); - (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, this, TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); + m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", this, TQ_SLOT(layerRaise()), actionCollection(), "raiselayer"); + m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", this, TQ_SLOT(layerLower()), actionCollection(), "lowerlayer"); + m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", this, TQ_SLOT(layerFront()), actionCollection(), "toplayer"); + m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", this, TQ_SLOT(layerBack()), actionCollection(), "bottomlayer"); + m_layerProperties = new TDEAction(i18n("Properties"), 0, this, TQ_SLOT(layerProperties()), actionCollection(), "layer_properties"); + (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, this, TQ_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); + m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", this, TQ_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); + (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, this, TQ_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); + (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, this, TQ_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); m_createMask = new TDEAction(i18n("Create Mask"), 0, this, - TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask"); + TQ_SLOT(slotCreateMask()), actionCollection(), "create_mask"); m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, this, - TQT_SLOT(slotMaskFromSelection()), actionCollection(), + TQ_SLOT(slotMaskFromSelection()), actionCollection(), "mask_fromsel"); m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, this, - TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); - m_applyMask = new TDEAction(i18n("Apply Mask"), 0, this, TQT_SLOT(slotApplyMask()), + TQ_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); + m_applyMask = new TDEAction(i18n("Apply Mask"), 0, this, TQ_SLOT(slotApplyMask()), actionCollection(), "apply_mask"); m_removeMask = new TDEAction(i18n("Remove Mask"), 0, this, - TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); + TQ_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, this, - TQT_SLOT(slotShowMask()), actionCollection(), "show_mask"); + TQ_SLOT(slotShowMask()), actionCollection(), "show_mask"); m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, this, - TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask"); + TQ_SLOT(slotEditMask()), actionCollection(), "edit_mask"); // image actions - m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", this, TQT_SLOT(flattenImage()), actionCollection(), "flatten_image"); - m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", this, TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer"); + m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", this, TQ_SLOT(flattenImage()), actionCollection(), "flatten_image"); + m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", this, TQ_SLOT(mergeLayer()), actionCollection(), "merge_layer"); // setting actions - KStdAction::preferences(this, TQT_SLOT(preferences()), actionCollection(), "preferences"); + KStdAction::preferences(this, TQ_SLOT(preferences()), actionCollection(), "preferences"); - m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", this, TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" ); + m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", this, TQ_SLOT( showRuler() ), actionCollection(), "view_ruler" ); m_RulerAction->setChecked(cfg.showRulers()); m_RulerAction->setCheckedState(i18n("Hide Rulers")); m_RulerAction->setWhatsThis( i18n("The rulers show the horizontal and vertical positions of the mouse on the image " "and can be used to position your mouse at the right place on the canvas. <p>Uncheck this to disable " "the rulers from being displayed." ) ); - //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, this, TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); + //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, this, TQ_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); // Add new palette - new TDEAction(i18n("Add New Palette..."), 0, this, TQT_SLOT(slotAddPalette()), + new TDEAction(i18n("Add New Palette..."), 0, this, TQ_SLOT(slotAddPalette()), actionCollection(), "add_palette"); - new TDEAction(i18n("Edit Palette..."), 0, this, TQT_SLOT(slotEditPalette()), + new TDEAction(i18n("Edit Palette..."), 0, this, TQ_SLOT(slotEditPalette()), actionCollection(), "edit_palette"); // XXX: This triggers a repaint of the image, but way too early @@ -2788,26 +2788,26 @@ void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDoc delete m_partHandler; // Only one at a time m_partHandler = new KisPartLayerHandler(this, entry, parent, above); - disconnect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0); - disconnect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0); - disconnect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, 0); - disconnect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, 0); - connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), - m_partHandler, TQT_SLOT(gotButtonPressEvent(KisButtonPressEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), - m_partHandler, TQT_SLOT(gotButtonReleaseEvent(KisButtonReleaseEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - m_partHandler, TQT_SLOT(gotMoveEvent(KisMoveEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - m_partHandler, TQT_SLOT(gotKeyPressEvent(TQKeyEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), + m_partHandler, TQ_SLOT(gotButtonPressEvent(KisButtonPressEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), + m_partHandler, TQ_SLOT(gotButtonReleaseEvent(KisButtonReleaseEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), + m_partHandler, TQ_SLOT(gotMoveEvent(KisMoveEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), + m_partHandler, TQ_SLOT(gotKeyPressEvent(TQKeyEvent*))); - connect(m_partHandler, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); - connect(m_partHandler, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); - connect(m_partHandler, TQT_SIGNAL(handlerDone()), - this, TQT_SLOT(reconnectAfterPartInsert())); + connect(m_partHandler, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), + this, TQ_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + connect(m_partHandler, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), + this, TQ_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + connect(m_partHandler, TQ_SIGNAL(handlerDone()), + this, TQ_SLOT(reconnectAfterPartInsert())); } void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, @@ -2835,14 +2835,14 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, } void KisView::reconnectAfterPartInsert() { - connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), - this, TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), - this, TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), + this, TQ_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), + this, TQ_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), + this, TQ_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), + this, TQ_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); delete m_partHandler; m_partHandler = 0; @@ -3162,52 +3162,52 @@ void KisView::setupCanvas() { m_canvas = new KisCanvas(this, "kis_canvas"); m_canvas->setFocusPolicy( TQWidget::StrongFocus ); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), this, TQT_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent*)), this, TQT_SLOT(canvasGotPaintEvent(TQPaintEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotEnterEvent(TQEvent*)), this, TQT_SLOT(canvasGotEnterEvent(TQEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotLeaveEvent(TQEvent*)), this, TQT_SLOT(canvasGotLeaveEvent(TQEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), this, TQT_SLOT(canvasGotMouseWheelEvent(TQWheelEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), this, TQT_SLOT(canvasGotKeyReleaseEvent(TQKeyEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), this, TQT_SLOT(canvasGotDragEnterEvent(TQDragEnterEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDropEvent(TQDropEvent*)), this, TQT_SLOT(canvasGotDropEvent(TQDropEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, TQ_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, TQ_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), this, TQ_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, TQ_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotPaintEvent(TQPaintEvent*)), this, TQ_SLOT(canvasGotPaintEvent(TQPaintEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotEnterEvent(TQEvent*)), this, TQ_SLOT(canvasGotEnterEvent(TQEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotLeaveEvent(TQEvent*)), this, TQ_SLOT(canvasGotLeaveEvent(TQEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), this, TQ_SLOT(canvasGotMouseWheelEvent(TQWheelEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, TQ_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), this, TQ_SLOT(canvasGotKeyReleaseEvent(TQKeyEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), this, TQ_SLOT(canvasGotDragEnterEvent(TQDragEnterEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotDropEvent(TQDropEvent*)), this, TQ_SLOT(canvasGotDropEvent(TQDropEvent*))); } void KisView::connectCurrentImg() { if (m_image) { - connect(m_image, TQT_SIGNAL(sigActiveSelectionChanged(KisImageSP)), m_selectionManager, TQT_SLOT(imgSelectionChanged(KisImageSP))); - connect(m_image, TQT_SIGNAL(sigActiveSelectionChanged(KisImageSP)), this, TQT_SLOT(updateCanvas())); - connect(m_image, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), this, TQT_SLOT(updateStatusBarProfileLabel())); - connect(m_image, TQT_SIGNAL(sigProfileChanged(KisProfile * )), TQT_SLOT(profileChanged(KisProfile * ))); - - connect(m_image, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(maskUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), TQT_SLOT(updateCanvas())); - connect(m_image, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), TQT_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigActiveSelectionChanged(KisImageSP)), m_selectionManager, TQ_SLOT(imgSelectionChanged(KisImageSP))); + connect(m_image, TQ_SIGNAL(sigActiveSelectionChanged(KisImageSP)), this, TQ_SLOT(updateCanvas())); + connect(m_image, TQ_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), this, TQ_SLOT(updateStatusBarProfileLabel())); + connect(m_image, TQ_SIGNAL(sigProfileChanged(KisProfile * )), TQ_SLOT(profileChanged(KisProfile * ))); + + connect(m_image, TQ_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigMaskInfoChanged()), TQ_SLOT(maskUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), TQ_SLOT(updateCanvas())); + connect(m_image, TQ_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), TQ_SLOT(layersUpdated())); KisConnectPartLayerVisitor v(m_image, this, true); m_image->rootLayer()->accept(v); - connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), - TQT_SLOT(handlePartLayerAdded(KisLayerSP))); + connect(m_image, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), + TQ_SLOT(handlePartLayerAdded(KisLayerSP))); maskUpdated(); #ifdef HAVE_GL if (m_OpenGLImageContext != 0) { - connect(m_OpenGLImageContext, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotOpenGLImageUpdated(TQRect))); - connect(m_OpenGLImageContext, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_OpenGLImageContext, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(slotOpenGLImageUpdated(TQRect))); + connect(m_OpenGLImageContext, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); } else #endif { - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(imgUpdated(TQRect))); - connect(m_image, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(imgUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); } } @@ -3239,8 +3239,8 @@ void KisView::handlePartLayerAdded(KisLayerSP layer) if (!l) return; - connect(this, TQT_SIGNAL(childActivated(KoDocumentChild*)), - layer, TQT_SLOT(childActivated(KoDocumentChild*))); + connect(this, TQ_SIGNAL(childActivated(KoDocumentChild*)), + layer, TQ_SLOT(childActivated(KoDocumentChild*))); } void KisView::imgUpdated(TQRect rc) @@ -3811,26 +3811,26 @@ void KisView::createDockers() m_hsvwidget = new KoHSVWidget(this, "hsv"); m_hsvwidget->setCaption(i18n("HSV")); - connect(m_hsvwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_hsvwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setBgColor(const TQColor &))); + connect(m_hsvwidget, TQ_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_hsvwidget, TQ_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetBGQColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigFGQColorChanged(const TQColor &)), m_hsvwidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigBGQColorChanged(const TQColor &)), m_hsvwidget, TQ_SLOT(setBgColor(const TQColor &))); m_paletteManager->addWidget( m_hsvwidget, "hsvwidget", chalk::COLORBOX, 0, PALETTE_DOCKER, true); m_rgbwidget = new KoRGBWidget(this, "rgb"); m_rgbwidget->setCaption(i18n("RGB")); - connect(m_rgbwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_rgbwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setBgColor(const TQColor &))); + connect(m_rgbwidget, TQ_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_rgbwidget, TQ_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetBGQColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigFGQColorChanged(const TQColor &)), m_rgbwidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigBGQColorChanged(const TQColor &)), m_rgbwidget, TQ_SLOT(setBgColor(const TQColor &))); m_paletteManager->addWidget( m_rgbwidget, "rgbwidget", chalk::COLORBOX); m_graywidget = new KoGrayWidget(this, "gray"); m_graywidget->setCaption(i18n("Gray")); - connect(m_graywidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_graywidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setBgColor(const TQColor &))); + connect(m_graywidget, TQ_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_graywidget, TQ_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetBGQColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigFGQColorChanged(const TQColor &)), m_graywidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigBGQColorChanged(const TQColor &)), m_graywidget, TQ_SLOT(setBgColor(const TQColor &))); m_paletteManager->addWidget( m_graywidget, "graywidget", chalk::COLORBOX); //make sure the color chooser get right default values @@ -3839,8 +3839,8 @@ void KisView::createDockers() m_palettewidget = new KisPaletteWidget(this); m_palettewidget->setCaption(i18n("Palettes")); - connect(m_palettewidget, TQT_SIGNAL(colorSelected(const TQColor &)), - this, TQT_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_palettewidget, TQ_SIGNAL(colorSelected(const TQColor &)), + this, TQ_SLOT(slotSetFGQColor(const TQColor &))); // No BGColor or reverse slotFGChanged->palette connections, since that's not useful here KisResourceServerBase* rServer; @@ -3850,7 +3850,7 @@ void KisView::createDockers() for ( it = resources.begin(); it != resources.end(); ++it ) { m_palettewidget->slotAddPalette( *it ); } - connect(m_palettewidget, TQT_SIGNAL(colorSelected(const KisColor &)), this, TQT_SLOT(slotSetFGColor(const KisColor &))); + connect(m_palettewidget, TQ_SIGNAL(colorSelected(const KisColor &)), this, TQ_SLOT(slotSetFGColor(const KisColor &))); m_paletteManager->addWidget( m_palettewidget, "palettewidget", chalk::COLORBOX, 10, PALETTE_DOCKER, true); } @@ -3880,7 +3880,7 @@ TQPoint KisView::reverseViewTransformations(const TQPoint& p) const { void KisView::canvasAddChild(KoViewChild *child) { super::canvasAddChild(child); - connect(this, TQT_SIGNAL(viewTransformationsChanged()), child, TQT_SLOT(reposition())); + connect(this, TQ_SIGNAL(viewTransformationsChanged()), child, TQ_SLOT(reposition())); m_vScroll->raise(); m_hScroll->raise(); m_vScroll->raise(); @@ -3894,7 +3894,7 @@ void KisView::slotLoadingFinished() setCurrentImage(document()->currentImage()); m_paletteManager->showWidget( "layerbox" ); m_canvas->show(); - disconnect(document(), TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); + disconnect(document(), TQ_SIGNAL(loadingFinished()), this, TQ_SLOT(slotLoadingFinished())); m_imageLoaded = true; startInitialZoomTimerIfReady(); diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 683caeba9..8087c15b1 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -71,14 +71,14 @@ KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener, m_page->view->installEventFilter(this); m_page->view->setBackgroundMode(TQt::NoBackground); - m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, this, TQT_SLOT(zoomPlus()), this, "zoomIn" ); - m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, this, TQT_SLOT(zoomMinus()), this, "zoomOut" ); + m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, this, TQ_SLOT(zoomPlus()), this, "zoomIn" ); + m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, this, TQ_SLOT(zoomMinus()), this, "zoomOut" ); l->addWidget(m_page); - connect(m_page->zoom, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(zoomValueChanged(int))); - connect(m_page->bn100, TQT_SIGNAL(clicked()), TQT_SLOT(zoom100())); - connect(m_page->slZoom, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderChanged( int ))); + connect(m_page->zoom, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(zoomValueChanged(int))); + connect(m_page->bn100, TQ_SIGNAL(clicked()), TQ_SLOT(zoom100())); + connect(m_page->slZoom, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderChanged( int ))); } KoBirdEyePanel::~KoBirdEyePanel() diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 9bcf12cec..56cf628c7 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -119,7 +119,7 @@ public: m_list( list ) { TQFrame::setPalette( TQToolTip::palette() ); - connect( &m_timer, TQT_SIGNAL( timeout() ), m_list, TQT_SLOT( hideTip() ) ); + connect( &m_timer, TQ_SIGNAL( timeout() ), m_list, TQ_SLOT( hideTip() ) ); tqApp->installEventFilter( this ); } @@ -302,12 +302,12 @@ LayerList::LayerList( TQWidget *parent, const char *name ) setNumRows( 2 ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - TQT_SLOT( slotItemRenamed( TQListViewItem*, const TQString&, int ) ) ); - connect( this, TQT_SIGNAL( moved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ), - TQT_SLOT( slotItemMoved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem* ) ), TQT_SLOT( hideTip() ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( hideTip() ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + TQ_SLOT( slotItemRenamed( TQListViewItem*, const TQString&, int ) ) ); + connect( this, TQ_SIGNAL( moved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ), + TQ_SLOT( slotItemMoved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem* ) ), TQ_SLOT( hideTip() ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( hideTip() ) ); } LayerList::~LayerList() @@ -1174,7 +1174,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e ) { if ( !(e->state() & TQt::ControlButton) && !(e->state() & TQt::ShiftButton) ) setActive(); - TQTimer::singleShot( 0, listView(), TQT_SLOT( showContextMenu() ) ); + TQTimer::singleShot( 0, listView(), TQ_SLOT( showContextMenu() ) ); return false; } diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 6656e35da..0723fe630 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -64,10 +64,10 @@ SqueezedComboBox::SqueezedComboBox( TQWidget *parent, const char *name ) m_timer = new TQTimer(this); m_tooltip = new SqueezedComboBoxTip( listBox()->viewport(), this ); - connect(m_timer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotTimeOut())); - connect(this, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotUpdateToolTip( int ))); + connect(m_timer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotTimeOut())); + connect(this, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotUpdateToolTip( int ))); } SqueezedComboBox::~SqueezedComboBox() diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook index e041576ef..2e592be11 100644 --- a/doc/chalk/developers-plugins.docbook +++ b/doc/chalk/developers-plugins.docbook @@ -385,8 +385,8 @@ View plugins do not have to register themselves, and they get access to a setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","chalkplugins/shearimage.rc"), true); - (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, SLOT(slotShearImage()), actionCollection(), "shearimage"); - (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, SLOT(slotShearLayer()), actionCollection(), "shearlayer"); + (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, TQ_SLOT(slotShearImage()), actionCollection(), "shearimage"); + (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, TQ_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); m_view = (KisView*) parent; } @@ -1072,7 +1072,7 @@ void KisToolStar::setup(TDEActionCollection *collection) "tool_star", shortcut, this, - SLOT(activate()), + TQ_SLOT(activate()), collection, name()); TQ_CHECK_PTR(m_action); diff --git a/example/example_view.cpp b/example/example_view.cpp index 1a8e07e19..a0ab2bdb3 100644 --- a/example/example_view.cpp +++ b/example/example_view.cpp @@ -36,10 +36,10 @@ ExampleView::ExampleView( ExamplePart* part, TQWidget* parent, const char* name setXMLFile( "example_readonly.rc" ); // simplified GUI else setXMLFile( "example.rc" ); - KStdAction::copy(this, TQT_SLOT( copy() ), actionCollection(), "copy" ); - KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); + KStdAction::copy(this, TQ_SLOT( copy() ), actionCollection(), "copy" ); + KStdAction::cut(this, TQ_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQ_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/filters/chalk/pdf/kis_pdf_import_widget.cpp b/filters/chalk/pdf/kis_pdf_import_widget.cpp index 572efbd5a..bca53d126 100644 --- a/filters/chalk/pdf/kis_pdf_import_widget.cpp +++ b/filters/chalk/pdf/kis_pdf_import_widget.cpp @@ -41,14 +41,14 @@ KisPDFImportWidget::KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * par listPages->insertItem(TQString::number( i ) ); } - connect(intWidth, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateHRes() ) ); - connect(intHeight, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateHVer() ) ); - connect(intHorizontal, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateWidth() ) ); - connect(intVertical, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateHeight() ) ); - connect(boolAllPages, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( selectAllPages( bool ) ) ); - connect(boolFirstPage, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( selectFirstPage( bool ) ) ); - connect(boolSelectionPage, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( selectSelectionOfPages( bool ) ) ); - connect(listPages, TQT_SIGNAL(selectionChanged () ), this, TQT_SLOT(updateSelectionOfPages())); + connect(intWidth, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateHRes() ) ); + connect(intHeight, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateHVer() ) ); + connect(intHorizontal, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateWidth() ) ); + connect(intVertical, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateHeight() ) ); + connect(boolAllPages, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( selectAllPages( bool ) ) ); + connect(boolFirstPage, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( selectFirstPage( bool ) ) ); + connect(boolSelectionPage, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( selectSelectionOfPages( bool ) ) ); + connect(listPages, TQ_SIGNAL(selectionChanged () ), this, TQ_SLOT(updateSelectionOfPages())); } diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index 873fdf2be..2a0097928 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -86,9 +86,9 @@ KisRawImport::KisRawImport(KoFilter *, const char *, const TQStringList&) m_page = new WdgRawImport(m_dialog); m_dialog -> setMainWidget(m_page); - connect(m_page->bnPreview, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdatePreview())); - connect(m_page->grpColorSpace, TQT_SIGNAL(clicked( int )), this, TQT_SLOT(slotFillCmbProfiles())); - connect(m_page->grpChannelDepth, TQT_SIGNAL(clicked( int )), this, TQT_SLOT(slotFillCmbProfiles())); + connect(m_page->bnPreview, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpdatePreview())); + connect(m_page->grpColorSpace, TQ_SIGNAL(clicked( int )), this, TQ_SLOT(slotFillCmbProfiles())); + connect(m_page->grpChannelDepth, TQ_SIGNAL(clicked( int )), this, TQ_SLOT(slotFillCmbProfiles())); KisConfig cfg; TQString monitorProfileName = cfg.monitorProfile(); @@ -185,7 +185,7 @@ KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQ m_progress -> setTotalSteps(0); m_progress -> setCancelButton(0); TQTimer timer; - connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(incrementProgress())); + connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(incrementProgress())); timer.start(200); doc -> undoAdapter() -> setUndo(false); @@ -421,9 +421,9 @@ void KisRawImport::getImageData( TQStringList arguments ) } process.setUseShell(true); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedStderr(TDEProcess *, char *, int))); - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessDone())); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedStdout(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedStderr(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessDone())); kdDebug(41008) << "Starting process\n"; diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index 70e679387..43857e9b4 100644 --- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp +++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp @@ -35,8 +35,8 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name) { optionswdg = new KisWdgOptionsTIFF(this); activated(0); - connect(optionswdg->kComboBoxCompressionType, TQT_SIGNAL(activated ( int )), this, TQT_SLOT(activated ( int ) )); - connect(optionswdg->flatten, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(flattenToggled( bool) ) ); + connect(optionswdg->kComboBoxCompressionType, TQ_SIGNAL(activated ( int )), this, TQ_SLOT(activated ( int ) )); + connect(optionswdg->flatten, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(flattenToggled( bool) ) ); setMainWidget(optionswdg); kapp->restoreOverrideCursor(); setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); diff --git a/filters/kformula/png/pngexportdia.cpp b/filters/kformula/png/pngexportdia.cpp index 938fed782..c63d276d0 100644 --- a/filters/kformula/png/pngexportdia.cpp +++ b/filters/kformula/png/pngexportdia.cpp @@ -63,8 +63,8 @@ PNGExportDia::PNGExportDia( const TQDomDocument &dom, const TQString &outFile, T percHeightEdit->setValue( 100 ); connectAll(); - connect( proportional, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( proportionalClicked() ) ); + connect( proportional, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( proportionalClicked() ) ); } PNGExportDia::~PNGExportDia() @@ -74,26 +74,26 @@ PNGExportDia::~PNGExportDia() void PNGExportDia::connectAll() { - connect( widthEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( widthChanged( int ) ) ); - connect( heightEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( heightChanged( int ) ) ); - connect( percWidthEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentWidthChanged( double ) ) ); - connect( percHeightEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentHeightChanged(double ) ) ); + connect( widthEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( widthChanged( int ) ) ); + connect( heightEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( heightChanged( int ) ) ); + connect( percWidthEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentWidthChanged( double ) ) ); + connect( percHeightEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentHeightChanged(double ) ) ); } void PNGExportDia::disconnectAll() { - disconnect( widthEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( widthChanged( int ) ) ); - disconnect( heightEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( heightChanged( int ) ) ); - disconnect( percWidthEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentWidthChanged( double ) ) ); - disconnect( percHeightEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentHeightChanged(double ) ) ); + disconnect( widthEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( widthChanged( int ) ) ); + disconnect( heightEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( heightChanged( int ) ) ); + disconnect( percWidthEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentWidthChanged( double ) ) ); + disconnect( percHeightEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentHeightChanged(double ) ) ); } void PNGExportDia::widthChanged( int width ) diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 1e721d165..ed65970d4 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -90,24 +90,24 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* m_dialog->m_sheet->setSelectionMode( TQTable::Multi ); - connect(m_dialog->m_formatComboBox, TQT_SIGNAL(activated( const TQString& )), - this, TQT_SLOT(formatChanged( const TQString& ))); - connect(m_dialog->m_delimiterBox, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(delimiterClicked(int))); - connect(m_dialog->m_delimiterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(returnPressed())); - connect(m_dialog->m_delimiterEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(formatChanged ( const TQString & ) )); - connect(m_dialog->m_comboQuote, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(textquoteSelected(const TQString &))); - connect(m_dialog->m_sheet, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(currentCellChanged(int, int))); - connect(m_dialog->m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(ignoreDuplicatesChanged(int))); - connect(m_dialog->m_updateButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(updateClicked())); - connect(m_dialog->comboBoxEncoding, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(encodingChanged ( const TQString & ) )); + connect(m_dialog->m_formatComboBox, TQ_SIGNAL(activated( const TQString& )), + this, TQ_SLOT(formatChanged( const TQString& ))); + connect(m_dialog->m_delimiterBox, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(delimiterClicked(int))); + connect(m_dialog->m_delimiterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(returnPressed())); + connect(m_dialog->m_delimiterEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(formatChanged ( const TQString & ) )); + connect(m_dialog->m_comboQuote, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(textquoteSelected(const TQString &))); + connect(m_dialog->m_sheet, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(currentCellChanged(int, int))); + connect(m_dialog->m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(ignoreDuplicatesChanged(int))); + connect(m_dialog->m_updateButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(updateClicked())); + connect(m_dialog->comboBoxEncoding, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(encodingChanged ( const TQString & ) )); } CSVDialog::~CSVDialog() diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index 3b95ef5d7..10a692c9a 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -79,16 +79,16 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent ) m_delimiterValidator = new TQRegExpValidator( rx, m_dialog->m_delimiterBox ); m_dialog->m_delimiterEdit->setValidator( m_delimiterValidator ); - connect( m_dialog->m_delimiterBox, TQT_SIGNAL( clicked(int) ), - this, TQT_SLOT( delimiterClicked( int ) ) ); - connect( m_dialog->m_delimiterEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( returnPressed() ) ); - connect( m_dialog->m_delimiterEdit, TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT(textChanged ( const TQString & ) ) ); - connect( m_dialog->m_comboQuote, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( textquoteSelected( const TQString & ) ) ); - connect( m_dialog->m_selectionOnly, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( selectionOnlyChanged( bool ) ) ); + connect( m_dialog->m_delimiterBox, TQ_SIGNAL( clicked(int) ), + this, TQ_SLOT( delimiterClicked( int ) ) ); + connect( m_dialog->m_delimiterEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( returnPressed() ) ); + connect( m_dialog->m_delimiterEdit, TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT(textChanged ( const TQString & ) ) ); + connect( m_dialog->m_comboQuote, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( textquoteSelected( const TQString & ) ) ); + connect( m_dialog->m_selectionOnly, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( selectionOnlyChanged( bool ) ) ); loadSettings(); } diff --git a/filters/kspread/html/exportdialog.cpp b/filters/kspread/html/exportdialog.cpp index 8df7e0ce2..f0dd28d25 100644 --- a/filters/kspread/html/exportdialog.cpp +++ b/filters/kspread/html/exportdialog.cpp @@ -37,11 +37,11 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name ) { kapp->restoreOverrideCursor(); - connect( m_mainwidget->mCustomButton, TQT_SIGNAL( toggled( bool ) ), - m_mainwidget->mCustomURL, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_mainwidget->mSelectAllButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAll() ) ); - connect( m_mainwidget->mDeselectAllButton, TQT_SIGNAL( clicked() ), - m_mainwidget->mSheets, TQT_SLOT( clearSelection() ) ); + connect( m_mainwidget->mCustomButton, TQ_SIGNAL( toggled( bool ) ), + m_mainwidget->mCustomURL, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_mainwidget->mSelectAllButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectAll() ) ); + connect( m_mainwidget->mDeselectAllButton, TQ_SIGNAL( clicked() ), + m_mainwidget->mSheets, TQ_SLOT( clearSelection() ) ); m_mainwidget->mEncodingBox->insertItem( i18n( "Recommended: UTF-8" ) ); m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( TDEGlobal::locale()->codecForEncoding()->name() ) ); diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cpp b/filters/kspread/kexi/kspread_kexiimportdialog.cpp index 0e15acbe7..9f1fd4759 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cpp +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cpp @@ -61,8 +61,8 @@ KSpreadKexiImportDialog::KSpreadKexiImportDialog(TQWidget* parent, const char* name) : KSpreadKexiImportDialogBase(parent,name) { - connect(this->m_insertButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); - connect(this->m_cancelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(this->m_insertButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); + connect(this->m_cancelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); } /** diff --git a/filters/kword/html/export/ExportDialog.cpp b/filters/kword/html/export/ExportDialog.cpp index 5fc3fdc59..2da909347 100644 --- a/filters/kword/html/export/ExportDialog.cpp +++ b/filters/kword/html/export/ExportDialog.cpp @@ -54,10 +54,10 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent) m_dialog->KURL_ExternalCSS->setMode( KFile::ExistingOnly ); - connect(m_dialog->radioModeEnhanced, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setCSSEnabled( bool ) ) ); - connect(m_dialog->checkExternalCSS, TQT_SIGNAL( toggled( bool ) ), - m_dialog->KURL_ExternalCSS, TQT_SLOT( setEnabled( bool ) ) ); + connect(m_dialog->radioModeEnhanced, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setCSSEnabled( bool ) ) ); + connect(m_dialog->checkExternalCSS, TQ_SIGNAL( toggled( bool ) ), + m_dialog->KURL_ExternalCSS, TQ_SLOT( setEnabled( bool ) ) ); setMainWidget(m_dialog); } diff --git a/filters/kword/html/import/tdehtmlreader.cpp b/filters/kword/html/import/tdehtmlreader.cpp index e800820aa..523bd672e 100644 --- a/filters/kword/html/import/tdehtmlreader.cpp +++ b/filters/kword/html/import/tdehtmlreader.cpp @@ -47,7 +47,7 @@ void tqt_leave_modal( TQWidget *widget ); bool TDEHTMLReader::filter(KURL url) { kdDebug(30503) << "TDEHTMLReader::filter" << endl; - TQObject::connect(_html,TQT_SIGNAL(completed()),this,TQT_SLOT(completed())); + TQObject::connect(_html,TQ_SIGNAL(completed()),this,TQ_SLOT(completed())); _state.clear(); _list_depth=0; diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp index 2e20b999d..7cd82e1b8 100644 --- a/filters/kword/msword/document.cpp +++ b/filters/kword/msword/document.cpp @@ -52,12 +52,12 @@ Document::Document( const std::string& fileName, TQDomDocument& mainDocument, TQ if ( m_parser ) // 0 in case of major error (e.g. unsupported format) { m_textHandler = new KWordTextHandler( m_parser ); - connect( m_textHandler, TQT_SIGNAL( subDocFound( const wvWare::FunctorBase*, int ) ), - this, TQT_SLOT( slotSubDocFound( const wvWare::FunctorBase*, int ) ) ); - connect( m_textHandler, TQT_SIGNAL( tableFound( const KWord::Table& ) ), - this, TQT_SLOT( slotTableFound( const KWord::Table& ) ) ); - connect( m_textHandler, TQT_SIGNAL( pictureFound( const TQString&, const TQString&, const wvWare::FunctorBase* ) ), - this, TQT_SLOT( slotPictureFound( const TQString&, const TQString&, const wvWare::FunctorBase* ) ) ); + connect( m_textHandler, TQ_SIGNAL( subDocFound( const wvWare::FunctorBase*, int ) ), + this, TQ_SLOT( slotSubDocFound( const wvWare::FunctorBase*, int ) ) ); + connect( m_textHandler, TQ_SIGNAL( tableFound( const KWord::Table& ) ), + this, TQ_SLOT( slotTableFound( const KWord::Table& ) ) ); + connect( m_textHandler, TQ_SIGNAL( pictureFound( const TQString&, const TQString&, const wvWare::FunctorBase* ) ), + this, TQ_SLOT( slotPictureFound( const TQString&, const TQString&, const wvWare::FunctorBase* ) ) ); m_parser->setSubDocumentHandler( this ); m_parser->setTextHandler( m_textHandler ); m_parser->setTableHandler( m_tableHandler ); @@ -67,10 +67,10 @@ Document::Document( const std::string& fileName, TQDomDocument& mainDocument, TQ m_parser->setInlineReplacementHandler( m_replacementHandler ); processStyles(); processAssociatedStrings(); - connect( m_tableHandler, TQT_SIGNAL( sigTableCellStart( int, int, int, int, const KoRect&, const TQString&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::SHD& ) ), - this, TQT_SLOT( slotTableCellStart( int, int, int, int, const KoRect&, const TQString&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::SHD& ) ) ); - connect( m_tableHandler, TQT_SIGNAL( sigTableCellEnd() ), - this, TQT_SLOT( slotTableCellEnd() ) ); + connect( m_tableHandler, TQ_SIGNAL( sigTableCellStart( int, int, int, int, const KoRect&, const TQString&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::SHD& ) ), + this, TQ_SLOT( slotTableCellStart( int, int, int, int, const KoRect&, const TQString&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::BRC&, const wvWare::Word97::SHD& ) ) ); + connect( m_tableHandler, TQ_SIGNAL( sigTableCellEnd() ), + this, TQ_SLOT( slotTableCellEnd() ) ); } } @@ -236,16 +236,16 @@ void Document::bodyStart() createInitialFrame( mainFramesetElement, 29, 798, 42, 566, false, Reconnect ); m_textHandler->setFrameSetElement( mainFramesetElement ); - connect( m_textHandler, TQT_SIGNAL( firstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ), - this, TQT_SLOT( slotFirstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ) ); + connect( m_textHandler, TQ_SIGNAL( firstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ), + this, TQ_SLOT( slotFirstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ) ); m_bodyFound = true; } void Document::bodyEnd() { kdDebug(30513) << k_funcinfo << endl; - disconnect( m_textHandler, TQT_SIGNAL( firstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ), - this, TQT_SLOT( slotFirstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ) ); + disconnect( m_textHandler, TQ_SIGNAL( firstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ), + this, TQ_SLOT( slotFirstSectionFound( wvWare::SharedPtr<const wvWare::Word97::SEP> ) ) ); } diff --git a/filters/kword/mswrite/ImportDialog.cpp b/filters/kword/mswrite/ImportDialog.cpp index cb9834913..f5ca040f7 100644 --- a/filters/kword/mswrite/ImportDialog.cpp +++ b/filters/kword/mswrite/ImportDialog.cpp @@ -48,8 +48,8 @@ MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent) setMainWidget(m_dialog); - connect(m_dialog->comboBoxEncoding, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(comboBoxEncodingActivated(int))); + connect(m_dialog->comboBoxEncoding, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(comboBoxEncodingActivated(int))); } MSWriteImportDialog :: ~MSWriteImportDialog(void) diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp index 032549392..2020baea9 100644 --- a/filters/kword/pdf/dialog.cpp +++ b/filters/kword/pdf/dialog.cpp @@ -136,8 +136,8 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget) _group->insert(_rangeButton); _range = new KLineEdit(hbox); _range->setFocus(); - connect(_range, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(rangeChanged(const TQString &))); + connect(_range, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(rangeChanged(const TQString &))); // options _images = new TQCheckBox(i18n("Import images"), plainPage()); diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp index a4a152175..6c455e04b 100644 --- a/filters/libdialogfilter/exportsizedia.cpp +++ b/filters/libdialogfilter/exportsizedia.cpp @@ -53,8 +53,8 @@ ExportSizeDia::ExportSizeDia( int width, int height, m_percHeightEdit->setValue( 100 ); connectAll(); - connect( m_proportional, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( proportionalClicked() ) ); + connect( m_proportional, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( proportionalClicked() ) ); } @@ -221,27 +221,27 @@ void ExportSizeDia::proportionalClicked() void ExportSizeDia::connectAll() { - connect( m_widthEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( widthChanged( int ) ) ); - connect( m_heightEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( heightChanged( int ) ) ); - connect( m_percWidthEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentWidthChanged( double ) ) ); - connect( m_percHeightEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentHeightChanged(double ) ) ); + connect( m_widthEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( widthChanged( int ) ) ); + connect( m_heightEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( heightChanged( int ) ) ); + connect( m_percWidthEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentWidthChanged( double ) ) ); + connect( m_percHeightEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentHeightChanged(double ) ) ); } void ExportSizeDia::disconnectAll() { - disconnect( m_widthEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( widthChanged( int ) ) ); - disconnect( m_heightEdit, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( heightChanged( int ) ) ); - disconnect( m_percWidthEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentWidthChanged( double ) ) ); - disconnect( m_percHeightEdit, TQT_SIGNAL( valueChanged(double) ), - this, TQT_SLOT( percentHeightChanged(double ) ) ); + disconnect( m_widthEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( widthChanged( int ) ) ); + disconnect( m_heightEdit, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( heightChanged( int ) ) ); + disconnect( m_percWidthEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentWidthChanged( double ) ) ); + disconnect( m_percHeightEdit, TQ_SIGNAL( valueChanged(double) ), + this, TQ_SLOT( percentHeightChanged(double ) ) ); } diff --git a/filters/olefilters/olefilter.cpp b/filters/olefilters/olefilter.cpp index ae0395a94..67511bc12 100644 --- a/filters/olefilters/olefilter.cpp +++ b/filters/olefilters/olefilter.cpp @@ -370,8 +370,8 @@ void OLEFilter::convert( const TQCString& mimeTypeHint ) myFilter=new WordFilter(main, table0, table1, data); // forward the internal communication calls - connect( this, TQT_SIGNAL( internalCommShapeID( unsigned int& ) ), myFilter, TQT_SIGNAL( internalCommShapeID( unsigned int& ) ) ); - connect( this, TQT_SIGNAL( internalCommDelayStream( const char* ) ), myFilter, TQT_SIGNAL( internalCommDelayStream( const char* ) ) ); + connect( this, TQ_SIGNAL( internalCommShapeID( unsigned int& ) ), myFilter, TQ_SIGNAL( internalCommShapeID( unsigned int& ) ) ); + connect( this, TQ_SIGNAL( internalCommDelayStream( const char* ) ), myFilter, TQ_SIGNAL( internalCommDelayStream( const char* ) ) ); } } else if ( mimeType == "application/x-kspread" ) { @@ -477,27 +477,27 @@ void OLEFilter::convert( const TQCString& mimeTypeHint ) void OLEFilter::connectCommon(FilterBase **myFilter) { TQObject::connect( *myFilter, - TQT_SIGNAL(signalSaveDocumentInformation(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(signalSaveDocumentInformation(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)), this, - TQT_SLOT(slotSaveDocumentInformation(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &))); + TQ_SLOT(slotSaveDocumentInformation(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &))); TQObject::connect( *myFilter, - TQT_SIGNAL(signalSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *)), + TQ_SIGNAL(signalSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *)), this, - TQT_SLOT(slotSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *))); + TQ_SLOT(slotSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *))); TQObject::connect( *myFilter, - TQT_SIGNAL(signalSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *)), + TQ_SIGNAL(signalSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *)), this, - TQT_SLOT(slotSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *))); - TQObject::connect(*myFilter, TQT_SIGNAL(signalPart(const TQString&, TQString &, TQString &)), - this, TQT_SLOT(slotPart(const TQString&, TQString &, TQString &))); - TQObject::connect(*myFilter, TQT_SIGNAL(signalGetStream(const int &, myFile &)), this, - TQT_SLOT(slotGetStream(const int &, myFile &))); - TQObject::connect(*myFilter, TQT_SIGNAL(signalGetStream(const TQString &, myFile &)), this, - TQT_SLOT(slotGetStream(const TQString &, myFile &))); - TQObject::connect(*myFilter, TQT_SIGNAL(sigProgress(int)), this, TQT_SIGNAL(sigProgress(int))); + TQ_SLOT(slotSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *))); + TQObject::connect(*myFilter, TQ_SIGNAL(signalPart(const TQString&, TQString &, TQString &)), + this, TQ_SLOT(slotPart(const TQString&, TQString &, TQString &))); + TQObject::connect(*myFilter, TQ_SIGNAL(signalGetStream(const int &, myFile &)), this, + TQ_SLOT(slotGetStream(const int &, myFile &))); + TQObject::connect(*myFilter, TQ_SIGNAL(signalGetStream(const TQString &, myFile &)), this, + TQ_SLOT(slotGetStream(const TQString &, myFile &))); + TQObject::connect(*myFilter, TQ_SIGNAL(sigProgress(int)), this, TQ_SIGNAL(sigProgress(int))); } TQCString OLEFilter::mimeTypeHelper() diff --git a/filters/olefilters/powerpoint97/powerpointfilter.cpp b/filters/olefilters/powerpoint97/powerpointfilter.cpp index 5359dd985..c0ce4b3e9 100644 --- a/filters/olefilters/powerpoint97/powerpointfilter.cpp +++ b/filters/olefilters/powerpoint97/powerpointfilter.cpp @@ -32,25 +32,25 @@ PowerPointFilter::PowerPointFilter( connect( m_tree, - TQT_SIGNAL(signalPart(const TQString&, TQString &, TQString &)), + TQ_SIGNAL(signalPart(const TQString&, TQString &, TQString &)), this, - TQT_SIGNAL(signalPart(const TQString&, TQString &, TQString &))); + TQ_SIGNAL(signalPart(const TQString&, TQString &, TQString &))); // Hook up the embedded picture support. connect( m_tree, - TQT_SIGNAL(signalSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *)), + TQ_SIGNAL(signalSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *)), this, - TQT_SIGNAL(signalSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *))); + TQ_SIGNAL(signalSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *))); // Hook up the embedded part support. connect( m_tree, - TQT_SIGNAL(signalSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *)), + TQ_SIGNAL(signalSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *)), this, - TQT_SIGNAL(signalSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *))); + TQ_SIGNAL(signalSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *))); } PowerPointFilter::~PowerPointFilter() diff --git a/karbon/commands/vcommand.cpp b/karbon/commands/vcommand.cpp index fe5e9adaf..1738e5f1c 100644 --- a/karbon/commands/vcommand.cpp +++ b/karbon/commands/vcommand.cpp @@ -31,8 +31,8 @@ VCommandHistory::VCommandHistory( KarbonPart* part ) { m_commands.setAutoDelete( true ); - m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), m_part->actionCollection(), "koffice_undo" ); - m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), m_part->actionCollection(), "koffice_redo" ); + m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), m_part->actionCollection(), "koffice_undo" ); + m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), m_part->actionCollection(), "koffice_redo" ); clear(); } diff --git a/karbon/dialogs/vcolortab.cpp b/karbon/dialogs/vcolortab.cpp index fc8f4eac5..78b89cba2 100644 --- a/karbon/dialogs/vcolortab.cpp +++ b/karbon/dialogs/vcolortab.cpp @@ -44,7 +44,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mColorSelector = new KHSSelector( mRGBWidget ); mColorSelector->setMinimumHeight( 165 ); mColorSelector->setMinimumWidth( 165 ); - connect( mColorSelector, TQT_SIGNAL( valueChanged( int, int ) ), this, TQT_SLOT( slotHSChanged( int, int ) ) ); + connect( mColorSelector, TQ_SIGNAL( valueChanged( int, int ) ), this, TQ_SLOT( slotHSChanged( int, int ) ) ); mainLayout->addMultiCellWidget(mColorSelector, 0, 2, 0, 0 ); //Selector @@ -52,7 +52,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mSelector->setColors( TQColor( "white" ), TQColor( "black" ) ); mSelector->setMinimumWidth( 20 ); //TODO: Make it autochange color if the solid-filled object is selected (also for TQSpinBoxes) - connect( mSelector, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotVChanged( int ) ) ); + connect( mSelector, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotVChanged( int ) ) ); mainLayout->addMultiCellWidget( mSelector, 0, 2, 1, 1 ); //Reference @@ -77,9 +77,9 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mRed = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); mGreen = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); mBlue = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); - connect( mRed, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromRGBSpinBoxes() ) ); - connect( mGreen, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromRGBSpinBoxes() ) ); - connect( mBlue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromRGBSpinBoxes() ) ); + connect( mRed, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromRGBSpinBoxes() ) ); + connect( mGreen, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromRGBSpinBoxes() ) ); + connect( mBlue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromRGBSpinBoxes() ) ); //--->HSV new TQLabel( i18n( "Hue:", "H:" ), cgroupbox ); @@ -88,9 +88,9 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mHue = new KIntSpinBox( 0, 359, 1, 0, 10, cgroupbox ); mSaturation = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); mValue = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); - connect( mHue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromHSVSpinBoxes() ) ); - connect( mSaturation, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromHSVSpinBoxes() ) ); - connect( mValue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromHSVSpinBoxes() ) ); + connect( mHue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromHSVSpinBoxes() ) ); + connect( mSaturation, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromHSVSpinBoxes() ) ); + connect( mValue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromHSVSpinBoxes() ) ); mainLayout->addWidget( cgroupbox, 1, 2 ); //--->Opacity diff --git a/karbon/dialogs/vconfiguredlg.cpp b/karbon/dialogs/vconfiguredlg.cpp index 3736f738a..5870139de 100644 --- a/karbon/dialogs/vconfiguredlg.cpp +++ b/karbon/dialogs/vconfiguredlg.cpp @@ -67,14 +67,14 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent ) m_gridPage = new VConfigGridPage( parent, page ); - connect( m_miscPage, TQT_SIGNAL( unitChanged( int ) ), m_gridPage, TQT_SLOT( slotUnitChanged( int ) ) ); + connect( m_miscPage, TQ_SIGNAL( unitChanged( int ) ), m_gridPage, TQ_SLOT( slotUnitChanged( int ) ) ); page = addVBoxPage( i18n( "Document" ), i18n( "Document Settings" ), BarIcon( "text-x-generic", TDEIcon::SizeMedium ) ); m_defaultDocPage = new VConfigDefaultPage( parent, page ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApply() ) ); } void VConfigureDlg::slotApply() @@ -249,7 +249,7 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name ) grid->addWidget( m_unit, 1, 1 ); m_oldUnit = KoUnit::unit( unitType ); m_unit->setCurrentItem( m_oldUnit ); - connect( m_unit, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( unitChanged( int ) ) ); + connect( m_unit, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( unitChanged( int ) ) ); } void VConfigMiscPage::apply() @@ -328,8 +328,8 @@ VConfigGridPage::VConfigGridPage( KarbonView* view, TQVBox* page, char* name ) 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 VConfigGridPage::setMaxHorizSnap( double v ) diff --git a/karbon/dialogs/vstrokedlg.cpp b/karbon/dialogs/vstrokedlg.cpp index 27009bf21..5611beaf4 100644 --- a/karbon/dialogs/vstrokedlg.cpp +++ b/karbon/dialogs/vstrokedlg.cpp @@ -71,7 +71,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) m_typeOption->insert( button ); m_typeOption->setTitle( i18n( "Type" ) ); mainLayout->addWidget( m_typeOption ); - connect( m_typeOption, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_typeOption, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotTypeChanged( int ) ) ); m_capOption = new TQVButtonGroup ( mainWidget ); //button = new TQRadioButton ( i18n( "Butt" ), m_capOption ); @@ -86,7 +86,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) m_capOption->insert( button ); m_capOption->setTitle( i18n( "Cap" ) ); mainLayout->addWidget( m_capOption ); - connect( m_capOption, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); + connect( m_capOption, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); m_joinOption = new TQVButtonGroup ( mainWidget ); button = new TQRadioButton ( m_joinOption ); @@ -100,7 +100,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) m_joinOption->insert( button ); m_joinOption->setTitle( i18n( "Join" ) ); mainLayout->addWidget( m_joinOption ); - connect( m_joinOption, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_joinOption, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); VSelection *sel = part->document().selection(); if( sel && sel->objects().count() > 0 ) // there is a selection, so take the stroke of first selected object @@ -126,7 +126,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) setMainWidget( m_colortab ); disableResize(); - connect (this, TQT_SIGNAL( okClicked( void ) ), this, TQT_SLOT( slotOKClicked ( void ) ) ); + connect (this, TQ_SIGNAL( okClicked( void ) ), this, TQ_SLOT( slotOKClicked ( void ) ) ); } void VStrokeDlg::slotTypeChanged( int ID ) diff --git a/karbon/dockers/vcolordocker.cpp b/karbon/dockers/vcolordocker.cpp index 328f4f3ff..0c77a88d7 100644 --- a/karbon/dockers/vcolordocker.cpp +++ b/karbon/dockers/vcolordocker.cpp @@ -66,32 +66,32 @@ VColorDocker::VColorDocker( KarbonPart* part, KarbonView* parent, const char* /* /* ##### HSV WIDGET ##### */ mHSVWidget = new KoHSVWidget( mTabWidget ); - connect( mHSVWidget, TQT_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQT_SLOT( updateFgColor( const TQColor &) ) ); - connect( mHSVWidget, TQT_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQT_SLOT( updateBgColor( const TQColor &) ) ); - connect(this, TQT_SIGNAL(fgColorChanged(const TQColor &)), mHSVWidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(bgColorChanged(const TQColor &)), mHSVWidget, TQT_SLOT(setBgColor(const TQColor &))); - connect( mHSVWidget, TQT_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQT_SLOT( updateMode( KDualColorButton::DualColor ) ) ); + connect( mHSVWidget, TQ_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQ_SLOT( updateFgColor( const TQColor &) ) ); + connect( mHSVWidget, TQ_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQ_SLOT( updateBgColor( const TQColor &) ) ); + connect(this, TQ_SIGNAL(fgColorChanged(const TQColor &)), mHSVWidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(bgColorChanged(const TQColor &)), mHSVWidget, TQ_SLOT(setBgColor(const TQColor &))); + connect( mHSVWidget, TQ_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQ_SLOT( updateMode( KDualColorButton::DualColor ) ) ); mTabWidget->addTab( mHSVWidget, i18n( "HSV" ) ); /* ##### RGB WIDGET ##### */ mRGBWidget = new KoRGBWidget( mTabWidget ); - connect( mRGBWidget, TQT_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQT_SLOT( updateFgColor( const TQColor &) ) ); - connect( mRGBWidget, TQT_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQT_SLOT( updateBgColor( const TQColor &) ) ); - connect(this, TQT_SIGNAL(fgColorChanged(const TQColor &)), mRGBWidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(bgColorChanged(const TQColor &)), mRGBWidget, TQT_SLOT(setBgColor(const TQColor &))); - connect( mRGBWidget, TQT_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQT_SLOT( updateMode( KDualColorButton::DualColor ) ) ); + connect( mRGBWidget, TQ_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQ_SLOT( updateFgColor( const TQColor &) ) ); + connect( mRGBWidget, TQ_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQ_SLOT( updateBgColor( const TQColor &) ) ); + connect(this, TQ_SIGNAL(fgColorChanged(const TQColor &)), mRGBWidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(bgColorChanged(const TQColor &)), mRGBWidget, TQ_SLOT(setBgColor(const TQColor &))); + connect( mRGBWidget, TQ_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQ_SLOT( updateMode( KDualColorButton::DualColor ) ) ); mTabWidget->addTab( mRGBWidget, i18n( "RGB" ) ); /* ##### CMYK WIDGET ##### */ /*mCMYKWidget = new KoCMYKWidget( mTabWidget ); - connect( mCMYKWidget, TQT_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQT_SLOT( updateFgColor( const TQColor &) ) ); - connect( mCMYKWidget, TQT_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQT_SLOT( updateBgColor( const TQColor &) ) ); + connect( mCMYKWidget, TQ_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQ_SLOT( updateFgColor( const TQColor &) ) ); + connect( mCMYKWidget, TQ_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQ_SLOT( updateBgColor( const TQColor &) ) ); mTabWidget->addTab( mCMYKWidget, i18n( "CMYK" ) );*/ //Opacity mOpacity = new VColorSlider( i18n( "Opacity:" ), TQColor( "white" ), TQColor( "black" ), 0, 100, 100, this ); //TODO: Make "white" a transparent color - connect( mOpacity, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateOpacity() ) ); + connect( mOpacity, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateOpacity() ) ); TQToolTip::add( mOpacity, i18n( "Alpha (opacity)" ) ); TQVBoxLayout *mainWidgetLayout = new TQVBoxLayout( this, 3 ); diff --git a/karbon/dockers/vdocumentdocker.cpp b/karbon/dockers/vdocumentdocker.cpp index c999a0599..c54dd3378 100644 --- a/karbon/dockers/vdocumentdocker.cpp +++ b/karbon/dockers/vdocumentdocker.cpp @@ -252,10 +252,10 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent ) m_layers->setAlignment( AlignRight ); m_format->setAlignment( AlignRight ); - connect( view->part()->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) ); - connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); - connect( view, TQT_SIGNAL( pageLayoutChanged() ), this, TQT_SLOT( slotCommandExecuted() ) ); - connect( view->canvasWidget(), TQT_SIGNAL( viewportChanged() ), this, TQT_SLOT( slotViewportChanged() ) ); + connect( view->part()->commandHistory(), TQ_SIGNAL( commandAdded( VCommand* ) ), this, TQ_SLOT( slotCommandAdded( VCommand* ) ) ); + connect( view->part()->commandHistory(), TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( slotCommandExecuted() ) ); + connect( view, TQ_SIGNAL( pageLayoutChanged() ), this, TQ_SLOT( slotCommandExecuted() ) ); + connect( view->canvasWidget(), TQ_SIGNAL( viewportChanged() ), this, TQ_SLOT( slotViewportChanged() ) ); updateDocumentInfo(); } // VDocumentTab::VDocumentTab @@ -490,12 +490,12 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) m_layersListView->setRootIsDecorated( true ); m_layersListView->setSelectionMode( TQListView::Extended ); - connect( m_layersListView, TQT_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( itemClicked( TQListViewItem*, const TQPoint&, int ) ) ); - connect( m_layersListView, TQT_SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( renameItem( TQListViewItem*, const TQPoint&, int ) ) ); - connect( m_layersListView, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( selectionChangedFromList() ) ); - connect( m_view, TQT_SIGNAL( selectionChange() ), this, TQT_SLOT( selectionChangedFromTool() ) ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); - connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) ); + connect( m_layersListView, TQ_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( itemClicked( TQListViewItem*, const TQPoint&, int ) ) ); + connect( m_layersListView, TQ_SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( renameItem( TQListViewItem*, const TQPoint&, int ) ) ); + connect( m_layersListView, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( selectionChangedFromList() ) ); + connect( m_view, TQ_SIGNAL( selectionChange() ), this, TQ_SLOT( selectionChangedFromTool() ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotButtonClicked( int ) ) ); + connect( view->part()->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand*) ), this, TQ_SLOT( slotCommandExecuted( VCommand* ) ) ); layout->activate(); updateLayers(); @@ -1243,17 +1243,17 @@ VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent ) } m_history->sort(); - connect( m_history, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( commandClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( m_groupCommands, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( groupingChanged( int ) ) ); - connect( part->commandHistory(), TQT_SIGNAL( historyCleared() ), this, TQT_SLOT( historyCleared() ) ); - connect( part->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) ); - connect( part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), this, TQT_SLOT( commandExecuted( VCommand* ) ) ); - connect( part->commandHistory(), TQT_SIGNAL( firstCommandRemoved() ), this, TQT_SLOT( removeFirstCommand() ) ); - connect( part->commandHistory(), TQT_SIGNAL( lastCommandRemoved() ), this, TQT_SLOT( removeLastCommand() ) ); - connect( this, TQT_SIGNAL( undoCommand( VCommand* ) ), part->commandHistory(), TQT_SLOT( undo( VCommand* ) ) ); - connect( this, TQT_SIGNAL( redoCommand( VCommand* ) ), part->commandHistory(), TQT_SLOT( redo( VCommand* ) ) ); - connect( this, TQT_SIGNAL( undoCommandsTo( VCommand* ) ), part->commandHistory(), TQT_SLOT( undoAllTo( VCommand* ) ) ); - connect( this, TQT_SIGNAL( redoCommandsTo( VCommand* ) ), part->commandHistory(), TQT_SLOT( redoAllTo( VCommand* ) ) ); + connect( m_history, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( commandClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( m_groupCommands, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( groupingChanged( int ) ) ); + connect( part->commandHistory(), TQ_SIGNAL( historyCleared() ), this, TQ_SLOT( historyCleared() ) ); + connect( part->commandHistory(), TQ_SIGNAL( commandAdded( VCommand* ) ), this, TQ_SLOT( slotCommandAdded( VCommand* ) ) ); + connect( part->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand* ) ), this, TQ_SLOT( commandExecuted( VCommand* ) ) ); + connect( part->commandHistory(), TQ_SIGNAL( firstCommandRemoved() ), this, TQ_SLOT( removeFirstCommand() ) ); + connect( part->commandHistory(), TQ_SIGNAL( lastCommandRemoved() ), this, TQ_SLOT( removeLastCommand() ) ); + connect( this, TQ_SIGNAL( undoCommand( VCommand* ) ), part->commandHistory(), TQ_SLOT( undo( VCommand* ) ) ); + connect( this, TQ_SIGNAL( redoCommand( VCommand* ) ), part->commandHistory(), TQ_SLOT( redo( VCommand* ) ) ); + connect( this, TQ_SIGNAL( undoCommandsTo( VCommand* ) ), part->commandHistory(), TQ_SLOT( undoAllTo( VCommand* ) ) ); + connect( this, TQ_SIGNAL( redoCommandsTo( VCommand* ) ), part->commandHistory(), TQ_SLOT( redoAllTo( VCommand* ) ) ); } // VHistoryTab::VHistoryTab VHistoryTab::~VHistoryTab() diff --git a/karbon/dockers/vstrokedocker.cpp b/karbon/dockers/vstrokedocker.cpp index 13fe44c16..ea2ec0e10 100644 --- a/karbon/dockers/vstrokedocker.cpp +++ b/karbon/dockers/vstrokedocker.cpp @@ -55,7 +55,7 @@ VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* m_setLineWidth->setUnit( part->unit() ); TQToolTip::add( m_setLineWidth, i18n( "Set line width of actual selection" ) ); mainLayout->addWidget ( m_setLineWidth, 0, 1 ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); TQLabel* capLabel = new TQLabel( i18n ( "Cap:" ), this ); mainLayout->addWidget( capLabel, 1, 0 ); @@ -79,7 +79,7 @@ VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* TQToolTip::add( button, i18n( "Square cap" ) ); m_capGroup->insert( button ); mainLayout->addWidget( m_capGroup, 1, 1 ); - connect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); + connect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); TQLabel* joinLabel = new TQLabel( i18n ( "Join:" ), this ); mainLayout->addWidget( joinLabel, 2, 0 ); @@ -104,7 +104,7 @@ VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* TQToolTip::add( button, i18n( "Bevel join" ) ); m_joinGroup->insert( button ); mainLayout->addWidget( m_joinGroup, 2, 1 ); - connect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); mainLayout->setRowStretch( 3, 1 ); mainLayout->setColStretch( 1, 1 ); @@ -149,9 +149,9 @@ void VStrokeDocker::slotJoinChanged( int ID ) void VStrokeDocker::updateDocker() { - disconnect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - disconnect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - disconnect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + disconnect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + disconnect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + disconnect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); switch( m_stroke.lineCap() ) { @@ -175,9 +175,9 @@ void VStrokeDocker::updateDocker() m_setLineWidth->changeValue( m_stroke.lineWidth() ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - connect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - connect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + connect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + connect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); } void VStrokeDocker::widthChanged() @@ -197,15 +197,15 @@ void VStrokeDocker::setStroke( const VStroke &stroke ) void VStrokeDocker::setUnit( KoUnit::Unit unit ) { - disconnect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - disconnect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - disconnect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + disconnect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + disconnect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + disconnect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); m_setLineWidth->setUnit( unit ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - connect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - connect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + connect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + connect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); } #include "vstrokedocker.moc" diff --git a/karbon/dockers/vstyledocker.cpp b/karbon/dockers/vstyledocker.cpp index 9f3d12e6f..ff41f72d9 100644 --- a/karbon/dockers/vstyledocker.cpp +++ b/karbon/dockers/vstyledocker.cpp @@ -83,9 +83,9 @@ VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* parent, const char* /* KoPatternChooser *pPatternChooser = new KoPatternChooser( KarbonFactory::rServer()->patterns(), mTabWidget ); pPatternChooser->setCaption( i18n( "Patterns" ) ); - connect( pPatternChooser, TQT_SIGNAL(selected( KoIconItem * ) ), this, TQT_SLOT( slotItemSelected( KoIconItem * ))); - connect( KarbonFactory::rServer(), TQT_SIGNAL( patternAdded( KoIconItem * )), pPatternChooser, TQT_SLOT( addPattern( KoIconItem * ))); - connect( KarbonFactory::rServer(), TQT_SIGNAL( patternRemoved( KoIconItem * )), pPatternChooser, TQT_SLOT( removePattern( KoIconItem * ))); + connect( pPatternChooser, TQ_SIGNAL(selected( KoIconItem * ) ), this, TQ_SLOT( slotItemSelected( KoIconItem * ))); + connect( KarbonFactory::rServer(), TQ_SIGNAL( patternAdded( KoIconItem * )), pPatternChooser, TQ_SLOT( addPattern( KoIconItem * ))); + connect( KarbonFactory::rServer(), TQ_SIGNAL( patternRemoved( KoIconItem * )), pPatternChooser, TQ_SLOT( removePattern( KoIconItem * ))); mTabWidget->addTab( pPatternChooser, i18n( "Patterns" ) ); //Clipart @@ -147,9 +147,9 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP //setFrameStyle( Box | Sunken ); layout->setMargin( 3 ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); - //connect( m_deleteClipartButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteClipart() ) ); - connect( m_clipartChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( clipartSelected( KoIconItem* ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotButtonClicked( int ) ) ); + //connect( m_deleteClipartButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteClipart() ) ); + connect( m_clipartChooser, TQ_SIGNAL( selected( KoIconItem* ) ), this, TQ_SLOT( clipartSelected( KoIconItem* ) ) ); m_clipartChooser->setAutoDelete( false ); VClipartIconItem* item = 0L; diff --git a/karbon/dockers/vtransformdocker.cpp b/karbon/dockers/vtransformdocker.cpp index 69c9a87cb..d3a5514ff 100644 --- a/karbon/dockers/vtransformdocker.cpp +++ b/karbon/dockers/vtransformdocker.cpp @@ -106,23 +106,23 @@ VTransformDocker::enableSignals( bool enable ) { if( enable ) { - connect( m_x, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - connect( m_y, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - connect( m_width, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - connect( m_height, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - connect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); - connect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); - connect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + connect( m_x, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + connect( m_y, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + connect( m_width, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + connect( m_height, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + connect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); + connect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); + connect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); } else { - disconnect( m_x, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - disconnect( m_y, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - disconnect( m_width, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - disconnect( m_height, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - disconnect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); - disconnect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); - disconnect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + disconnect( m_x, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + disconnect( m_y, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + disconnect( m_width, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + disconnect( m_height, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + disconnect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); + disconnect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); + disconnect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); } } @@ -220,9 +220,9 @@ VTransformDocker::shearX() VShearCmd *cmd = new VShearCmd( &m_view->part()->document(), rect.center(), shear, 0 ); m_view->part()->addCommand( cmd ); m_part->repaintAllViews( true ); - disconnect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); + disconnect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); m_shearX->changeValue(0.0); - connect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); + connect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); } } @@ -238,9 +238,9 @@ VTransformDocker::shearY() VShearCmd *cmd = new VShearCmd( &m_view->part()->document(), rect.center(), 0, shear ); m_view->part()->addCommand( cmd ); m_part->repaintAllViews( true ); - disconnect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); + disconnect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); m_shearY->changeValue(0.0); - connect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); + connect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); } } @@ -255,9 +255,9 @@ VTransformDocker::rotate() VRotateCmd *cmd = new VRotateCmd( &m_view->part()->document(), center, angle ); m_view->part()->addCommand( cmd ); m_part->repaintAllViews( true ); - disconnect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + disconnect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); m_rotate->setValue(0.0); - connect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + connect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); } } diff --git a/karbon/karbon_part.cpp b/karbon/karbon_part.cpp index e3abb2012..527a80f00 100644 --- a/karbon/karbon_part.cpp +++ b/karbon/karbon_part.cpp @@ -67,8 +67,8 @@ KarbonPart::KarbonPart( TQWidget* parentWidget, const char* widgetName, dcop = 0L; m_commandHistory = new VCommandHistory( this ); - connect( m_commandHistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) ); - connect( m_commandHistory, TQT_SIGNAL( commandExecuted( VCommand * ) ), this, TQT_SLOT( slotCommandExecuted( VCommand * ) ) ); + connect( m_commandHistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( slotDocumentRestored() ) ); + connect( m_commandHistory, TQ_SIGNAL( commandExecuted( VCommand * ) ), this, TQ_SLOT( slotCommandExecuted( VCommand * ) ) ); initConfig(); @@ -659,7 +659,7 @@ KarbonPart::mergeNativeFormat( const TQString &file ) void KarbonPart::addShell( KoMainWindow *shell ) { - connect( shell, TQT_SIGNAL( documentSaved() ), m_commandHistory, TQT_SLOT( documentSaved() ) ); + connect( shell, TQ_SIGNAL( documentSaved() ), m_commandHistory, TQ_SLOT( documentSaved() ) ); KoDocument::addShell( shell ); } diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp index c5c02d665..a9535429a 100644 --- a/karbon/karbon_view.cpp +++ b/karbon/karbon_view.cpp @@ -159,19 +159,19 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) reorganizeGUI(); - connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( p, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); // widgets: m_horizRuler = new VRuler( TQt::Horizontal, this ); m_horizRuler->setUnit(p->unit()); - connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_horizRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( p, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_horizRuler, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); m_vertRuler = new VRuler( TQt::Vertical, this ); m_vertRuler->setUnit(p->unit()); - connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_vertRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( p, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_vertRuler, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); m_canvas = new VCanvas( this, this, p ); - connect( m_canvas, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( canvasContentsMoving( int, int ) ) ); + connect( m_canvas, TQ_SIGNAL( contentsMoving( int, int ) ), this, TQ_SLOT( canvasContentsMoving( int, int ) ) ); m_canvas->show(); @@ -262,27 +262,27 @@ KarbonView::createContainer( TQWidget *parent, int index, const TQDomElement &el mainWindow()->addDockWindow( m_toolbox, dock, false); mainWindow()->moveDockWindow( m_toolbox, dock, false, 0, 0 ); - //connect( m_toolbox, TQT_SIGNAL( activeToolChanged( VTool * ) ), this, TQT_SLOT( slotActiveToolChanged( VTool * ) ) ); + //connect( m_toolbox, TQ_SIGNAL( activeToolChanged( VTool * ) ), this, TQ_SLOT( slotActiveToolChanged( VTool * ) ) ); if( shell() ) { m_strokeFillPreview = new VStrokeFillPreview( part(), m_toolbox ); m_typeButtonBox = new VTypeButtonBox( part(), m_toolbox ); - connect( m_strokeFillPreview, TQT_SIGNAL( fillSelected() ), m_typeButtonBox, TQT_SLOT( setFill() ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( strokeSelected() ), m_typeButtonBox, TQT_SLOT( setStroke() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( fillSelected() ), m_typeButtonBox, TQ_SLOT( setFill() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( strokeSelected() ), m_typeButtonBox, TQ_SLOT( setStroke() ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( strokeChanged( const VStroke & ) ), this, TQT_SLOT( slotStrokeChanged( const VStroke & ) ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( fillChanged( const VFill & ) ), this, TQT_SLOT( slotFillChanged( const VFill & ) ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( strokeChanged( const VStroke & ) ), this, TQ_SLOT( slotStrokeChanged( const VStroke & ) ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( fillChanged( const VFill & ) ), this, TQ_SLOT( slotFillChanged( const VFill & ) ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( strokeSelected() ), m_ColorManager, TQT_SLOT( setStrokeDocker() ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( fillSelected( ) ), m_ColorManager, TQT_SLOT( setFillDocker() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( strokeSelected() ), m_ColorManager, TQ_SLOT( setStrokeDocker() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( fillSelected( ) ), m_ColorManager, TQ_SLOT( setFillDocker() ) ); - connect( m_part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), this, TQT_SLOT( commandExecuted( VCommand* ) ) ); + connect( m_part->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand* ) ), this, TQ_SLOT( commandExecuted( VCommand* ) ) ); - connect( m_ColorManager, TQT_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQT_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); - connect( m_ColorManager, TQT_SIGNAL(bgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); - connect( m_ColorManager, TQT_SIGNAL(fgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); + connect( m_ColorManager, TQ_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQ_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); + connect( m_ColorManager, TQ_SIGNAL(bgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); + connect( m_ColorManager, TQ_SIGNAL(fgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); selectionChanged(); //create toolbars @@ -303,10 +303,10 @@ KarbonView::removeContainer( TQWidget *container, TQWidget *parent, if( shell() && container == m_toolbox ) { - disconnect( m_part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), this, TQT_SLOT( commandExecuted( VCommand* ) ) ); - disconnect( m_ColorManager, TQT_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQT_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); - disconnect( m_ColorManager, TQT_SIGNAL(bgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); - disconnect( m_ColorManager, TQT_SIGNAL(fgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); + disconnect( m_part->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand* ) ), this, TQ_SLOT( commandExecuted( VCommand* ) ) ); + disconnect( m_ColorManager, TQ_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQ_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); + disconnect( m_ColorManager, TQ_SIGNAL(bgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); + disconnect( m_ColorManager, TQ_SIGNAL(fgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); delete m_toolbox; m_toolbox = 0L; m_toolController->youAintGotNoToolBox(); @@ -941,11 +941,11 @@ KarbonView::initActions() // view -----> m_viewAction = new TDESelectAction( i18n( "View &Mode" ), 0, this, - TQT_SLOT( viewModeChanged() ), actionCollection(), "view_mode" ); + TQ_SLOT( viewModeChanged() ), actionCollection(), "view_mode" ); m_zoomAction = new TDESelectAction( i18n( "&Zoom" ), "viewmag", 0, this, - TQT_SLOT( zoomChanged() ), actionCollection(), "view_zoom" ); + TQ_SLOT( zoomChanged() ), actionCollection(), "view_zoom" ); TQStringList mstl; mstl << i18n( "Normal" ) << i18n( "Wireframe" ); @@ -975,11 +975,11 @@ KarbonView::initActions() m_zoomAction->setEditable( true ); m_zoomAction->setCurrentItem( 7 ); - KStdAction::zoomIn( this, TQT_SLOT( viewZoomIn() ), actionCollection(), "view_zoom_in" ); - KStdAction::zoomOut( this, TQT_SLOT( viewZoomOut() ), actionCollection(), "view_zoom_out" ); + KStdAction::zoomIn( this, TQ_SLOT( viewZoomIn() ), actionCollection(), "view_zoom_in" ); + KStdAction::zoomOut( this, TQ_SLOT( viewZoomOut() ), actionCollection(), "view_zoom_out" ); m_showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "view_show_margins" ); - connect( m_showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool))); + connect( m_showPageMargins, TQ_SIGNAL(toggled(bool)), TQ_SLOT(togglePageMargins(bool))); #if KDE_IS_VERSION(3,2,90) m_showPageMargins->setCheckedState(i18n("Hide Page Margins")); #endif @@ -990,132 +990,132 @@ KarbonView::initActions() // edit -----> KStdAction::cut( this, - TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); + TQ_SLOT( editCut() ), actionCollection(), "edit_cut" ); KStdAction::copy( this, - TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + TQ_SLOT( editCopy() ), actionCollection(), "edit_copy" ); KStdAction::paste( this, - TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_select_all" ); - KStdAction::deselect( this, TQT_SLOT( editDeselectAll() ), actionCollection(), "edit_deselect_all" ); + TQ_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + KStdAction::selectAll( this, TQ_SLOT( editSelectAll() ), actionCollection(), "edit_select_all" ); + KStdAction::deselect( this, TQ_SLOT( editDeselectAll() ), actionCollection(), "edit_deselect_all" ); new TDEAction( i18n( "&Import Graphic..." ), 0, 0, this, - TQT_SLOT( fileImportGraphic() ), actionCollection(), "file_import" ); + TQ_SLOT( fileImportGraphic() ), actionCollection(), "file_import" ); m_deleteSelectionAction = new TDEAction( i18n( "D&elete" ), "edit-delete", TQKeySequence( "Del" ), this, - TQT_SLOT( editDeleteSelection() ), actionCollection(), "edit_delete" ); + TQ_SLOT( editDeleteSelection() ), actionCollection(), "edit_delete" ); new TDEAction( i18n( "&History" ), 0, 0, this, - TQT_SLOT( editPurgeHistory() ), actionCollection(), "edit_purge_history" ); + TQ_SLOT( editPurgeHistory() ), actionCollection(), "edit_purge_history" ); // edit <----- // object -----> new TDEAction( i18n( "&Duplicate" ), "duplicate", TQKeySequence( "Ctrl+D" ), this, - TQT_SLOT( selectionDuplicate() ), actionCollection(), "object_duplicate" ); + TQ_SLOT( selectionDuplicate() ), actionCollection(), "object_duplicate" ); new TDEAction( i18n( "Bring to &Front" ), "bring_forward", TQKeySequence( "Ctrl+Shift+]" ), this, - TQT_SLOT( selectionBringToFront() ), actionCollection(), "object_move_totop" ); + TQ_SLOT( selectionBringToFront() ), actionCollection(), "object_move_totop" ); new TDEAction( i18n( "&Raise" ), "raise", TQKeySequence( "Ctrl+]" ), this, - TQT_SLOT( selectionMoveUp() ), actionCollection(), "object_move_up" ); + TQ_SLOT( selectionMoveUp() ), actionCollection(), "object_move_up" ); new TDEAction( i18n( "&Lower" ), "lower", TQKeySequence( "Ctrl+[" ), this, - TQT_SLOT( selectionMoveDown() ), actionCollection(), "object_move_down" ); + TQ_SLOT( selectionMoveDown() ), actionCollection(), "object_move_down" ); new TDEAction( i18n( "Send to &Back" ), "send_backward", TQKeySequence( "Ctrl+Shift+[" ), this, - TQT_SLOT( selectionSendToBack() ), actionCollection(), "object_move_tobottom" ); + TQ_SLOT( selectionSendToBack() ), actionCollection(), "object_move_tobottom" ); new TDEAction( i18n( "Align Left" ), "aoleft", 0, this, - TQT_SLOT( selectionAlignHorizontalLeft() ), + TQ_SLOT( selectionAlignHorizontalLeft() ), actionCollection(), "object_align_horizontal_left" ); new TDEAction( i18n( "Align Center (Horizontal)" ), "aocenterh", 0, this, - TQT_SLOT( selectionAlignHorizontalCenter() ), + TQ_SLOT( selectionAlignHorizontalCenter() ), actionCollection(), "object_align_horizontal_center" ); new TDEAction( i18n( "Align Right" ), "aoright", 0, this, - TQT_SLOT( selectionAlignHorizontalRight() ), + TQ_SLOT( selectionAlignHorizontalRight() ), actionCollection(), "object_align_horizontal_right" ); new TDEAction( i18n( "Align Top" ), "aotop", 0, this, - TQT_SLOT( selectionAlignVerticalTop() ), + TQ_SLOT( selectionAlignVerticalTop() ), actionCollection(), "object_align_vertical_top" ); new TDEAction( i18n( "Align Middle (Vertical)" ), "aocenterv", 0, this, - TQT_SLOT( selectionAlignVerticalCenter() ), + TQ_SLOT( selectionAlignVerticalCenter() ), actionCollection(), "object_align_vertical_center" ); new TDEAction( i18n( "Align Bottom" ), "aobottom", 0, this, - TQT_SLOT( selectionAlignVerticalBottom() ), + TQ_SLOT( selectionAlignVerticalBottom() ), actionCollection(), "object_align_vertical_bottom" ); new TDEAction( i18n( "Distribute Center (Horizontal)" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalCenter() ), + TQ_SLOT( selectionDistributeHorizontalCenter() ), actionCollection(), "object_distribute_horizontal_center" ); new TDEAction( i18n( "Distribute Gaps (Horizontal)" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalGap() ), + TQ_SLOT( selectionDistributeHorizontalGap() ), actionCollection(), "object_distribute_horizontal_gap" ); new TDEAction( i18n( "Distribute Left Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalLeft() ), + TQ_SLOT( selectionDistributeHorizontalLeft() ), actionCollection(), "object_distribute_horizontal_left" ); new TDEAction( i18n( "Distribute Right Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalRight() ), + TQ_SLOT( selectionDistributeHorizontalRight() ), actionCollection(), "object_distribute_horizontal_right" ); new TDEAction( i18n( "Distribute Center (Vertical)" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalCenter() ), + TQ_SLOT( selectionDistributeVerticalCenter() ), actionCollection(), "object_distribute_vertical_center" ); new TDEAction( i18n( "Distribute Gaps (Vertical)" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalGap() ), + TQ_SLOT( selectionDistributeVerticalGap() ), actionCollection(), "object_distribute_vertical_gap" ); new TDEAction( i18n( "Distribute Bottom Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalBottom() ), + TQ_SLOT( selectionDistributeVerticalBottom() ), actionCollection(), "object_distribute_vertical_bottom" ); new TDEAction( i18n( "Distribute Top Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalTop() ), + TQ_SLOT( selectionDistributeVerticalTop() ), actionCollection(), "object_distribute_vertical_top" ); - m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, this, TQT_SLOT( showRuler() ), actionCollection(), "view_show_ruler" ); + m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, this, TQ_SLOT( showRuler() ), actionCollection(), "view_show_ruler" ); #if KDE_IS_VERSION(3,2,90) m_showRulerAction->setCheckedState(i18n("Hide Rulers")); #endif m_showRulerAction->setToolTip( i18n( "Shows or hides rulers." ) ); m_showRulerAction->setChecked( false ); - m_showGridAction = new TDEToggleAction( i18n( "Show Grid" ), "view_grid", this, TQT_SLOT( showGrid() ), actionCollection(), "view_show_grid" ); + m_showGridAction = new TDEToggleAction( i18n( "Show Grid" ), "view_grid", this, TQ_SLOT( showGrid() ), actionCollection(), "view_show_grid" ); #if KDE_IS_VERSION(3,2,90) m_showGridAction->setCheckedState(i18n("Hide Grid")); #endif m_showGridAction->setToolTip( i18n( "Shows or hides grid." ) ); //m_showGridAction->setChecked( true ); - m_snapGridAction = new TDEToggleAction( i18n( "Snap to Grid" ), 0, this, TQT_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" ); + m_snapGridAction = new TDEToggleAction( i18n( "Snap to Grid" ), 0, this, TQ_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" ); m_snapGridAction->setToolTip( i18n( "Snaps to grid." ) ); //m_snapGridAction->setChecked( true ); m_groupObjects = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), this, - TQT_SLOT( groupSelection() ), actionCollection(), "selection_group" ); + TQ_SLOT( groupSelection() ), actionCollection(), "selection_group" ); m_ungroupObjects = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), this, - TQT_SLOT( ungroupSelection() ), actionCollection(), "selection_ungroup" ); + TQ_SLOT( ungroupSelection() ), actionCollection(), "selection_ungroup" ); m_closePath = new TDEAction( i18n( "&Close Path" ), TQKeySequence( "Ctrl+U" ), this, - TQT_SLOT( closePath() ), actionCollection(), "close_path" ); + TQ_SLOT( closePath() ), actionCollection(), "close_path" ); // object <----- // line style (dashes) - m_lineStyleAction = new KoLineStyleAction( i18n( "Line Style" ), "linestyle", this, TQT_SLOT( setLineStyle( int ) ), actionCollection(), "setLineStyle" ); + m_lineStyleAction = new KoLineStyleAction( i18n( "Line Style" ), "linestyle", this, TQ_SLOT( setLineStyle( int ) ), actionCollection(), "setLineStyle" ); // line width m_setLineWidth = new KoUnitDoubleSpinComboBox( this, 0.0, 1000.0, 0.5, 1.0, KoUnit::U_PT, 1 ); - new KWidgetAction( m_setLineWidth, i18n( "Set Line Width" ), 0, this, TQT_SLOT( setLineWidth() ), actionCollection(), "setLineWidth" ); + new KWidgetAction( m_setLineWidth, i18n( "Set Line Width" ), 0, this, TQ_SLOT( setLineWidth() ), actionCollection(), "setLineWidth" ); m_setLineWidth->insertItem( 0.25 ); m_setLineWidth->insertItem( 0.5 ); m_setLineWidth->insertItem( 0.75 ); @@ -1126,14 +1126,14 @@ KarbonView::initActions() m_setLineWidth->insertItem( 5.0 ); m_setLineWidth->insertItem( 10.0 ); m_setLineWidth->insertItem( 20.0 ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setLineWidth() ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setLineWidth() ) ); m_configureAction = new TDEAction( i18n( "Configure Karbon..." ), "configure", 0, this, - TQT_SLOT( configure() ), actionCollection(), "configure" ); + TQ_SLOT( configure() ), actionCollection(), "configure" ); new TDEAction( i18n( "Page &Layout..." ), 0, this, - TQT_SLOT( pageLayout() ), actionCollection(), "page_layout" ); + TQ_SLOT( pageLayout() ), actionCollection(), "page_layout" ); m_contextHelpAction = new KoContextHelpAction( actionCollection(), this ); } @@ -1470,7 +1470,7 @@ void KarbonView::createDocumentTabDock() m_DocumentTab = new VDocumentTab(this, this); m_DocumentTab->setCaption(i18n("Document")); paletteManager()->addWidget(m_DocumentTab, "DocumentTabDock", "DocumentPanel"); - connect( m_part, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_DocumentTab, TQT_SLOT( updateDocumentInfo() ) ); + connect( m_part, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_DocumentTab, TQ_SLOT( updateDocumentInfo() ) ); } void KarbonView::createLayersTabDock() @@ -1493,7 +1493,7 @@ void KarbonView::createStrokeDock() m_strokeDocker->setCaption(i18n("Stroke Properties")); paletteManager()->addWidget(m_strokeDocker, "StrokeTabDock", "StrokePanel"); - connect( part(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_strokeDocker, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( part(), TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_strokeDocker, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); } void KarbonView::createColorDock() @@ -1502,7 +1502,7 @@ void KarbonView::createColorDock() //m_ColorManager->setCaption(i18n("Stroke Properties")); paletteManager()->addWidget(m_ColorManager, "ColorTabDock", "ColorPanel"); - connect( this, TQT_SIGNAL( selectionChange() ), m_ColorManager, TQT_SLOT( update() ) ); + connect( this, TQ_SIGNAL( selectionChange() ), m_ColorManager, TQ_SLOT( update() ) ); } void KarbonView::createTransformDock() @@ -1511,8 +1511,8 @@ void KarbonView::createTransformDock() m_TransformDocker->setCaption(i18n("Transform")); paletteManager()->addWidget(m_TransformDocker, "TransformTabDock", "TransformPanel"); - connect( this, TQT_SIGNAL( selectionChange() ), m_TransformDocker, TQT_SLOT( update() ) ); - connect( part(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_TransformDocker, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( this, TQ_SIGNAL( selectionChange() ), m_TransformDocker, TQ_SLOT( update() ) ); + connect( part(), TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_TransformDocker, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); } void KarbonView::createResourceDock() diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cpp b/karbon/plugins/flattenpath/flattenpathplugin.cpp index 4dbb2b5e5..a19b3f2fd 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.cpp +++ b/karbon/plugins/flattenpath/flattenpathplugin.cpp @@ -38,7 +38,7 @@ FlattenPathPlugin::FlattenPathPlugin( KarbonView *parent, const char* name, cons { new TDEAction( i18n( "&Flatten Path..." ), "14_flatten", 0, this, - TQT_SLOT( slotFlattenPath() ), actionCollection(), "path_flatten" ); + TQ_SLOT( slotFlattenPath() ), actionCollection(), "path_flatten" ); m_flattenPathDlg = new VFlattenDlg(); m_flattenPathDlg->setFlatness( 0.2 ); @@ -62,8 +62,8 @@ VFlattenDlg::VFlattenDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/imagetool/vimagetool.cpp b/karbon/plugins/imagetool/vimagetool.cpp index 749e07a1f..000aa7766 100644 --- a/karbon/plugins/imagetool/vimagetool.cpp +++ b/karbon/plugins/imagetool/vimagetool.cpp @@ -123,7 +123,7 @@ VImageTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Image Tool" ), "14_image", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Image Tool" ), "14_image", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Image" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/plugins/insertknots/insertknotsplugin.cpp b/karbon/plugins/insertknots/insertknotsplugin.cpp index a40b65dab..dcf8ef85e 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.cpp +++ b/karbon/plugins/insertknots/insertknotsplugin.cpp @@ -37,7 +37,7 @@ InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, cons { new TDEAction( i18n( "&Insert Knots..." ), "14_insertknots", 0, this, - TQT_SLOT( slotInsertKnots() ), actionCollection(), "path_insert_knots" ); + TQ_SLOT( slotInsertKnots() ), actionCollection(), "path_insert_knots" ); m_insertKnotsDlg = new VInsertKnotsDlg(); } @@ -62,8 +62,8 @@ VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cpp b/karbon/plugins/roundcorners/roundcornersplugin.cpp index f703728f5..fc435a438 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.cpp +++ b/karbon/plugins/roundcorners/roundcornersplugin.cpp @@ -36,7 +36,7 @@ VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, { new TDEAction( i18n( "&Round Corners..." ), "14_roundcorners", 0, this, - TQT_SLOT( slotRoundCorners() ), actionCollection(), "path_round_corners" ); + TQ_SLOT( slotRoundCorners() ), actionCollection(), "path_round_corners" ); m_roundCornersDlg = new VRoundCornersDlg(); m_roundCornersDlg->setRadius( 10.0 ); @@ -66,8 +66,8 @@ VRoundCornersDlg::VRoundCornersDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp index 04d6ae689..259206915 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp @@ -42,7 +42,7 @@ ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *parent, const char* name, co { new TDEAction( i18n( "&Shadow Effect..." ), "shadowRB", 0, this, - TQT_SLOT( slotShadowEffect() ), actionCollection(), "object_shadow" ); + TQ_SLOT( slotShadowEffect() ), actionCollection(), "object_shadow" ); m_shadowEffectDlg = new VShadowEffectDlg(); m_shadowEffectDlg->setDistance( 2 ); @@ -78,8 +78,8 @@ VShadowEffectDlg::VShadowEffectDlg( TQWidget* parent, const char* name ) m_opacity->setSuffix(i18n("%")); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); } diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp index d4565752e..13b2afe59 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp @@ -42,7 +42,7 @@ WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *parent, const char* name, const { new TDEAction( i18n( "&Whirl/Pinch..." ), "14_whirl", 0, this, - TQT_SLOT( slotWhirlPinch() ), actionCollection(), "path_whirlpinch" ); + TQ_SLOT( slotWhirlPinch() ), actionCollection(), "path_whirlpinch" ); m_whirlPinchDlg = new VWhirlPinchDlg(); m_whirlPinchDlg->setAngle( 20.0 ); @@ -73,8 +73,8 @@ VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/zoomtool/vzoomtool.cpp b/karbon/plugins/zoomtool/vzoomtool.cpp index 1cecb94a8..cbd15d173 100644 --- a/karbon/plugins/zoomtool/vzoomtool.cpp +++ b/karbon/plugins/zoomtool/vzoomtool.cpp @@ -161,7 +161,7 @@ VZoomTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Zoom Tool" ), "14_zoom", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Zoom Tool" ), "14_zoom", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Zoom" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vellipsetool.cpp b/karbon/tools/vellipsetool.cpp index a22e28b7d..624c6d91a 100644 --- a/karbon/tools/vellipsetool.cpp +++ b/karbon/tools/vellipsetool.cpp @@ -44,7 +44,7 @@ VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent m_type->insertItem( i18n( "Section" ), VEllipse::section ); m_type->insertItem( i18n( "Pie" ), VEllipse::cut ); m_type->insertItem( i18n( "Arc" ), VEllipse::arc ); - connect( m_type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( typeChanged( int ) ) ); + connect( m_type, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( typeChanged( int ) ) ); // add width/height-input: m_widthLabel = new TQLabel( i18n( "object width", "Width:" ), group ); @@ -268,7 +268,7 @@ VEllipseTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Ellipse" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vgradienttool.cpp b/karbon/tools/vgradienttool.cpp index e7d2db3ca..eeebd7ae0 100644 --- a/karbon/tools/vgradienttool.cpp +++ b/karbon/tools/vgradienttool.cpp @@ -75,8 +75,8 @@ VGradientTool::activate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - connect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - connect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -94,8 +94,8 @@ VGradientTool::deactivate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - disconnect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - disconnect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -476,7 +476,7 @@ VGradientTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Gradient Tool" ), "14_gradient", TQt::Key_G, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Gradient Tool" ), "14_gradient", TQt::Key_G, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Gradient" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vpatterntool.cpp b/karbon/tools/vpatterntool.cpp index 8c42d5e00..d6d0e2fd1 100644 --- a/karbon/tools/vpatterntool.cpp +++ b/karbon/tools/vpatterntool.cpp @@ -67,8 +67,8 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge //setFrameStyle( Box | Sunken ); layout->setMargin( 3 ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); - connect( m_patternChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( patternSelected( KoIconItem* ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotButtonClicked( int ) ) ); + connect( m_patternChooser, TQ_SIGNAL( selected( KoIconItem* ) ), this, TQ_SLOT( patternSelected( KoIconItem* ) ) ); KoIconItem* item; for( item = patterns->first(); item; item = patterns->next() ) @@ -150,8 +150,8 @@ VPatternTool::activate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - connect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - connect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -169,8 +169,8 @@ VPatternTool::deactivate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - disconnect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - disconnect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -459,7 +459,7 @@ VPatternTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Pattern Tool" ), "14_pattern", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Pattern Tool" ), "14_pattern", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Pattern" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vpenciltool.cpp b/karbon/tools/vpenciltool.cpp index ea9da2f33..f8faebe3a 100644 --- a/karbon/tools/vpenciltool.cpp +++ b/karbon/tools/vpenciltool.cpp @@ -93,7 +93,7 @@ VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, c group3->setInsideMargin( 4 ); group3->setInsideSpacing( 2 ); - connect( m_combo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( selectMode() ) ); + connect( m_combo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( selectMode() ) ); //Set the default settings m_mode = VPencilTool::CURVE; @@ -402,7 +402,7 @@ VPencilTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Pencil Tool" ), "14_pencil", TQt::SHIFT+TQt::Key_P, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Pencil Tool" ), "14_pencil", TQt::SHIFT+TQt::Key_P, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Pencil" ) ); m_action->setExclusiveGroup( "freehand" ); //m_ownAction = true; diff --git a/karbon/tools/vpolygontool.cpp b/karbon/tools/vpolygontool.cpp index 20263c532..f6e3ed65f 100644 --- a/karbon/tools/vpolygontool.cpp +++ b/karbon/tools/vpolygontool.cpp @@ -156,7 +156,7 @@ VPolygonTool::setup( TDEActionCollection *collection ) { TDEShortcut shortcut( TQt::Key_Plus ); shortcut.append(TDEShortcut( TQt::Key_F9 ) ); - m_action = new TDERadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Polygon" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vpolylinetool.cpp b/karbon/tools/vpolylinetool.cpp index 38ac9d256..8e533416a 100644 --- a/karbon/tools/vpolylinetool.cpp +++ b/karbon/tools/vpolylinetool.cpp @@ -76,7 +76,7 @@ VPolylineTool::activate() m_bezierPoints.clear(); m_close = false; - connect( view()->part()->commandHistory(), TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(commandExecuted()) ); + connect( view()->part()->commandHistory(), TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(commandExecuted()) ); } void @@ -145,7 +145,7 @@ VPolylineTool::deactivate() createObject(); - disconnect( view()->part()->commandHistory(), TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(commandExecuted()) ); + disconnect( view()->part()->commandHistory(), TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(commandExecuted()) ); } void @@ -488,7 +488,7 @@ VPolylineTool::setup( TDEActionCollection *collection ) { TDEShortcut shortcut( TQt::Key_Plus ); shortcut.append( TDEShortcut( TQt::Key_F9 ) ); - m_action = new TDERadioAction( i18n( "Polyline Tool" ), "14_polyline", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Polyline Tool" ), "14_polyline", shortcut, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Polyline" ) ); m_action->setExclusiveGroup( "freehand" ); //m_ownAction = true; diff --git a/karbon/tools/vrectangletool.cpp b/karbon/tools/vrectangletool.cpp index 819883cf6..1196636c0 100644 --- a/karbon/tools/vrectangletool.cpp +++ b/karbon/tools/vrectangletool.cpp @@ -134,7 +134,7 @@ VRectangleTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Rectangle" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vrotatetool.cpp b/karbon/tools/vrotatetool.cpp index 4230cac7f..0a01a451d 100644 --- a/karbon/tools/vrotatetool.cpp +++ b/karbon/tools/vrotatetool.cpp @@ -166,7 +166,7 @@ VRotateTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Rotate Tool" ), "14_rotate", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Rotate Tool" ), "14_rotate", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Rotate" ) ); m_action->setExclusiveGroup( "manipulation" ); //m_ownAction = true; diff --git a/karbon/tools/vroundrecttool.cpp b/karbon/tools/vroundrecttool.cpp index 79d721f6c..85668bb2a 100644 --- a/karbon/tools/vroundrecttool.cpp +++ b/karbon/tools/vroundrecttool.cpp @@ -170,7 +170,7 @@ VRoundRectTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Round Rectangle" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vselectnodestool.cpp b/karbon/tools/vselectnodestool.cpp index 2a3c38bba..fb2b46aa9 100644 --- a/karbon/tools/vselectnodestool.cpp +++ b/karbon/tools/vselectnodestool.cpp @@ -428,7 +428,7 @@ VSelectNodesTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Select Nodes Tool" ), "14_selectnodes", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Select Nodes Tool" ), "14_selectnodes", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Select Nodes" ) ); m_action->setExclusiveGroup( "select" ); //m_ownAction = true; diff --git a/karbon/tools/vselecttool.cpp b/karbon/tools/vselecttool.cpp index dae170b06..d6ea99384 100644 --- a/karbon/tools/vselecttool.cpp +++ b/karbon/tools/vselecttool.cpp @@ -52,7 +52,7 @@ VSelectOptionsWidget::VSelectOptionsWidget( KarbonPart *part ) group->setRadioButtonExclusive( true ); group->setButton( part->document().selectionMode() ); - connect( group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( modeChange( int ) ) ); + connect( group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( modeChange( int ) ) ); group->setInsideMargin( 4 ); group->setInsideSpacing( 2 ); @@ -74,7 +74,7 @@ VSelectTool::VSelectTool( KarbonView *view ) m_objects.setAutoDelete( true ); m_optionsWidget = new VSelectOptionsWidget( view->part() ); registerTool( this ); - connect( view, TQT_SIGNAL( selectionChange() ), this, TQT_SLOT( updateStatusBar() ) ); + connect( view, TQ_SIGNAL( selectionChange() ), this, TQ_SLOT( updateStatusBar() ) ); } VSelectTool::~VSelectTool() @@ -603,7 +603,7 @@ VSelectTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Select Tool" ), "14_select", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Select Tool" ), "14_select", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Select" ) ); m_action->setExclusiveGroup( "select" ); //m_ownAction = true; diff --git a/karbon/tools/vsheartool.cpp b/karbon/tools/vsheartool.cpp index 4bc80810e..7209ae8d6 100644 --- a/karbon/tools/vsheartool.cpp +++ b/karbon/tools/vsheartool.cpp @@ -210,7 +210,7 @@ VShearTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Shear Tool" ), "14_shear", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Shear Tool" ), "14_shear", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Shear" ) ); m_action->setExclusiveGroup( "manipulation" ); //m_ownAction = true; diff --git a/karbon/tools/vsinustool.cpp b/karbon/tools/vsinustool.cpp index 3bfdfedc3..26327b310 100644 --- a/karbon/tools/vsinustool.cpp +++ b/karbon/tools/vsinustool.cpp @@ -153,7 +153,7 @@ VSinusTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Sinus" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vspiraltool.cpp b/karbon/tools/vspiraltool.cpp index 90b3b470c..5dc321e0f 100644 --- a/karbon/tools/vspiraltool.cpp +++ b/karbon/tools/vspiraltool.cpp @@ -204,7 +204,7 @@ VSpiralTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Spiral" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vstartool.cpp b/karbon/tools/vstartool.cpp index 7b503ff69..caf30efd8 100644 --- a/karbon/tools/vstartool.cpp +++ b/karbon/tools/vstartool.cpp @@ -44,12 +44,12 @@ VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, cons m_type->insertItem( i18n( "Framed Star" ), VStar::framed_star); m_type->insertItem( i18n( "Star" ), VStar::star ); m_type->insertItem( i18n( "Gear" ), VStar::gear ); - connect( m_type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( typeChanged( int ) ) ); + connect( m_type, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( typeChanged( int ) ) ); // add width/height-input: m_outerRLabel = new TQLabel( i18n( "Outer radius:" ), group ); m_outerR = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 50.0, KoUnit::U_MM ); - connect( m_outerR, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setOuterRadius( double ) ) ); + connect( m_outerR, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setOuterRadius( double ) ) ); m_innerRLabel = new TQLabel( i18n( "Inner radius:" ), group ); m_innerR = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 25.0, KoUnit::U_MM ); @@ -59,7 +59,7 @@ VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, cons new TQLabel( i18n( "Edges:" ), group ); m_edges = new KIntSpinBox( group ); m_edges->setMinValue( 3 ); - connect( m_edges, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( setEdges( int ) ) ); + connect( m_edges, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( setEdges( int ) ) ); new TQLabel( i18n( "Inner angle:" ), group ); m_innerAngle = new KIntSpinBox( group ); @@ -239,7 +239,7 @@ VStarTool::setup( TDEActionCollection *collection ) { TDEShortcut shortcut( TQt::Key_Plus ); shortcut.append(TDEShortcut( TQt::Key_F9 ) ); - m_action = new TDERadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Draw a star" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vtexttool.cpp b/karbon/tools/vtexttool.cpp index e64a4cf93..bfee64100 100644 --- a/karbon/tools/vtexttool.cpp +++ b/karbon/tools/vtexttool.cpp @@ -74,7 +74,7 @@ ShadowPreview::ShadowPreview( ShadowWidget* parent ) setBackgroundMode( TQt::NoBackground ); setMinimumSize( 60, 60 ); - connect( this, TQT_SIGNAL( changed( int, int, bool ) ), m_parent, TQT_SLOT( setShadowValues( int, int, bool ) ) ); + connect( this, TQ_SIGNAL( changed( int, int, bool ) ), m_parent, TQ_SLOT( setShadowValues( int, int, bool ) ) ); } ShadowPreview::~ShadowPreview() @@ -227,10 +227,10 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d m_distance->setValue( distance ); m_translucent->setChecked( translucent ); - connect( m_angle, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updatePreview( int ) ) ); - connect( m_distance, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updatePreview( int ) ) ); - connect( m_useShadow, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatePreview() ) ); - connect( m_translucent, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatePreview() ) ); + connect( m_angle, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( updatePreview( int ) ) ); + connect( m_distance, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( updatePreview( int ) ) ); + connect( m_useShadow, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatePreview() ) ); + connect( m_translucent, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatePreview() ) ); updatePreview(); } @@ -397,18 +397,18 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) m_textOffset->setRange( 0.0, 100.0, 1.0, true ); - connect( m_fontCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_boldCheck, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_italicCheck, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_fontSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_textPosition, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_textAlignment, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_textOffset, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( valueChanged( double ) ) ); - connect( m_textEditor, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( accept() ) ); - connect( m_textEditor, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged( const TQString& ) ) ); - connect( m_editBasePath, TQT_SIGNAL( clicked() ), this, TQT_SLOT( editBasePath() ) ); - connect( m_convertToShapes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( convertToShapes() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( cancel() ) ); + connect( m_fontCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_boldCheck, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_italicCheck, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_fontSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_textPosition, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_textAlignment, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_textOffset, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( valueChanged( double ) ) ); + connect( m_textEditor, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( accept() ) ); + connect( m_textEditor, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged( const TQString& ) ) ); + connect( m_editBasePath, TQ_SIGNAL( clicked() ), this, TQ_SLOT( editBasePath() ) ); + connect( m_convertToShapes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( convertToShapes() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( cancel() ) ); setMainWidget( base ); setFixedSize( baseSize() ); @@ -1148,7 +1148,7 @@ VTextTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Text Tool" ), "14_text", TQt::SHIFT+TQt::Key_T, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Text Tool" ), "14_text", TQt::SHIFT+TQt::Key_T, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Text Tool" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/widgets/vcanvas.cpp b/karbon/widgets/vcanvas.cpp index 9fa943276..081f9b073 100644 --- a/karbon/widgets/vcanvas.cpp +++ b/karbon/widgets/vcanvas.cpp @@ -97,7 +97,7 @@ VCanvas::VCanvas( TQWidget *parent, KarbonView* view, KarbonPart* part ) : TQScrollView( parent, "canvas", WStaticContents/*WNorthWestGravity*/ | WResizeNoErase | WRepaintNoErase ), m_part( part ), m_view( view ) { - connect(this, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( slotContentsMoving( int, int ) ) ); + connect(this, TQ_SIGNAL( contentsMoving( int, int ) ), this, TQ_SLOT( slotContentsMoving( int, int ) ) ); viewport()->setFocusPolicy( TQWidget::StrongFocus ); viewport()->setMouseTracking( true ); diff --git a/karbon/widgets/vcolorslider.cpp b/karbon/widgets/vcolorslider.cpp index 53f907866..0e5e2786d 100644 --- a/karbon/widgets/vcolorslider.cpp +++ b/karbon/widgets/vcolorslider.cpp @@ -67,8 +67,8 @@ void VColorSlider::init() setMinValue( 0 ); setMaxValue( 255 ); - connect( m_spinBox, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_spinBox( int ) ) ); - connect( m_gradientSelect, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_gradientSelect( int ) ) ); + connect( m_spinBox, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_spinBox( int ) ) ); + connect( m_gradientSelect, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_gradientSelect( int ) ) ); m_gradientSelect->installEventFilter( this ); @@ -114,9 +114,9 @@ void VColorSlider::updateFrom_spinBox( int value ) { if ( value != m_gradientSelect->value() ) { - disconnect( m_gradientSelect, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_gradientSelect( int ) ) ); + disconnect( m_gradientSelect, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_gradientSelect( int ) ) ); m_gradientSelect->setValue( (m_maxValue - value) + m_minValue ); - connect( m_gradientSelect, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_gradientSelect( int ) ) ); + connect( m_gradientSelect, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_gradientSelect( int ) ) ); emit valueChanged( value ); } } @@ -126,9 +126,9 @@ void VColorSlider::updateFrom_gradientSelect( int value ) value = (m_maxValue - value) + m_minValue; if ( value != m_spinBox->value() ) { - disconnect( m_spinBox, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_spinBox( int ) ) ); + disconnect( m_spinBox, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_spinBox( int ) ) ); m_spinBox->setValue( value ); - connect( m_spinBox, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_spinBox( int ) ) ); + connect( m_spinBox, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_spinBox( int ) ) ); emit valueChanged( value ); } } diff --git a/karbon/widgets/vgradienttabwidget.cpp b/karbon/widgets/vgradienttabwidget.cpp index 1416262da..86e674da7 100644 --- a/karbon/widgets/vgradienttabwidget.cpp +++ b/karbon/widgets/vgradienttabwidget.cpp @@ -224,13 +224,13 @@ void VGradientTabWidget::setupUI() void VGradientTabWidget::setupConnections() { - connect( m_gradientType, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( combosChange( int ) ) ); - connect( m_gradientRepeat, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( combosChange( int ) ) ); - connect( m_gradientWidget, TQT_SIGNAL( changed() ), m_gradientPreview, TQT_SLOT( update() ) ); - connect( m_addToPredefs, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addGradientToPredefs() ) ); - connect( m_predefGradientsView, TQT_SIGNAL( doubleClicked( TQListBoxItem *, const TQPoint & ) ), this, TQT_SLOT( changeToPredef( TQListBoxItem* ) ) ); - connect( m_predefDelete, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deletePredef() ) ); - connect( m_opacity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( opacityChanged( int ) ) ); + connect( m_gradientType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( combosChange( int ) ) ); + connect( m_gradientRepeat, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( combosChange( int ) ) ); + connect( m_gradientWidget, TQ_SIGNAL( changed() ), m_gradientPreview, TQ_SLOT( update() ) ); + connect( m_addToPredefs, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addGradientToPredefs() ) ); + connect( m_predefGradientsView, TQ_SIGNAL( doubleClicked( TQListBoxItem *, const TQPoint & ) ), this, TQ_SLOT( changeToPredef( TQListBoxItem* ) ) ); + connect( m_predefDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deletePredef() ) ); + connect( m_opacity, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( opacityChanged( int ) ) ); } // VGradientTabWidget::setupConnection void VGradientTabWidget::initUI() diff --git a/karbon/widgets/vreference.cpp b/karbon/widgets/vreference.cpp index 596c822eb..b4ff5770c 100644 --- a/karbon/widgets/vreference.cpp +++ b/karbon/widgets/vreference.cpp @@ -50,8 +50,8 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, mButtonGroup->insert( radio, BottomRight ); connect( - mButtonGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( setReferencePoint( int ) ) ); + mButtonGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( setReferencePoint( int ) ) ); mButtonGroup->setButton( Center ); layout->addWidget( mButtonGroup ); diff --git a/karbon/widgets/vselecttoolbar.cpp b/karbon/widgets/vselecttoolbar.cpp index b0dc9a7c8..9c8d1de1c 100644 --- a/karbon/widgets/vselecttoolbar.cpp +++ b/karbon/widgets/vselecttoolbar.cpp @@ -39,27 +39,27 @@ VSelectToolBar::VSelectToolBar( KarbonView *view, const char* name ) : TDEToolBa TQLabel *x_label = new TQLabel( i18n( "X:" ), this, "tde toolbar widget" ); insertWidget( 0, x_label->width(), x_label ); m_x = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_x, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotXChanged( double ) ) ); + connect( m_x, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotXChanged( double ) ) ); insertWidget( 1, m_x->width(), m_x ); TQLabel *y_label = new TQLabel( i18n( "Y:" ), this, "tde toolbar widget" ); insertWidget( 2, y_label->width(), y_label ); m_y = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_y, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotYChanged( double ) ) ); + connect( m_y, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotYChanged( double ) ) ); insertWidget( 3, m_y->width(), m_y ); insertSeparator( 4 ); TQLabel *w_label = new TQLabel( i18n( "selection width", "Width:" ), this, "tde toolbar widget" ); insertWidget( 5, w_label->width(), w_label ); m_width = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_width, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotWidthChanged( double ) ) ); + connect( m_width, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotWidthChanged( double ) ) ); insertWidget( 6, m_width->width(), m_width ); TQLabel *h_label = new TQLabel( i18n( "Height:" ), this, "tde toolbar widget" ); insertWidget( 7, h_label->width(), h_label ); m_height = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_height, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotHeightChanged( double ) ) ); + connect( m_height, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotHeightChanged( double ) ) ); insertWidget( 8, m_height->width(), m_height ); - connect( m_view, TQT_SIGNAL( selectionChange() ), this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_view, TQ_SIGNAL( selectionChange() ), this, TQ_SLOT( slotSelectionChanged() ) ); } VSelectToolBar::~VSelectToolBar() diff --git a/karbon/widgets/vtypebuttonbox.cpp b/karbon/widgets/vtypebuttonbox.cpp index 9a98a125a..a7c9f0f9c 100644 --- a/karbon/widgets/vtypebuttonbox.cpp +++ b/karbon/widgets/vtypebuttonbox.cpp @@ -257,8 +257,8 @@ VTypeButtonBox::VTypeButtonBox( KarbonPart *part, setInsideMargin( 1 ); setInsideSpacing( 1 ); - connect( this, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotButtonPressed( int ) ) ); + connect( this, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotButtonPressed( int ) ) ); } void diff --git a/kchart/csvimportdialog.cpp b/kchart/csvimportdialog.cpp index cf13c1b5e..a728a318f 100644 --- a/kchart/csvimportdialog.cpp +++ b/kchart/csvimportdialog.cpp @@ -88,24 +88,24 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) m_dialog->m_sheet->setSelectionMode( TQTable::Multi ); - connect(m_dialog->m_formatComboBox, TQT_SIGNAL(activated( const TQString& )), - this, TQT_SLOT(formatChanged( const TQString& ))); - connect(m_dialog->m_delimiterBox, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(delimiterClicked(int))); - connect(m_dialog->m_delimiterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(returnPressed())); - connect(m_dialog->m_delimiterEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(formatChanged ( const TQString & ) )); - connect(m_dialog->m_comboQuote, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(textquoteSelected(const TQString &))); - connect(m_dialog->m_sheet, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(currentCellChanged(int, int))); - connect(m_dialog->m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(ignoreDuplicatesChanged(int))); - connect(m_dialog->m_updateButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(updateClicked())); - connect(m_dialog->comboBoxEncoding, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(encodingChanged ( const TQString & ) )); + connect(m_dialog->m_formatComboBox, TQ_SIGNAL(activated( const TQString& )), + this, TQ_SLOT(formatChanged( const TQString& ))); + connect(m_dialog->m_delimiterBox, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(delimiterClicked(int))); + connect(m_dialog->m_delimiterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(returnPressed())); + connect(m_dialog->m_delimiterEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(formatChanged ( const TQString & ) )); + connect(m_dialog->m_comboQuote, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(textquoteSelected(const TQString &))); + connect(m_dialog->m_sheet, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(currentCellChanged(int, int))); + connect(m_dialog->m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(ignoreDuplicatesChanged(int))); + connect(m_dialog->m_updateButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(updateClicked())); + connect(m_dialog->comboBoxEncoding, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(encodingChanged ( const TQString & ) )); } diff --git a/kchart/kchartBackgroundPixmapConfigPage.cpp b/kchart/kchartBackgroundPixmapConfigPage.cpp index 01e7a67fb..d4bb9fb89 100644 --- a/kchart/kchartBackgroundPixmapConfigPage.cpp +++ b/kchart/kchartBackgroundPixmapConfigPage.cpp @@ -100,7 +100,7 @@ KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams TQWhatsThis::add( browsePB, i18n( "Click this button to select a background " "image not yet present in the list above. " ) ); center->addWidget( browsePB ); - connect( browsePB, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBrowse() ) ); + connect( browsePB, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBrowse() ) ); wallWidget = new TQWidget( this ); TQWhatsThis::add( wallWidget, i18n( "This area will always display the " @@ -110,8 +110,8 @@ KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams "it originally had." ) ); center->addWidget( wallWidget ); - connect( wallCB, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotWallPaperChanged( int ) ) ); + connect( wallCB, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotWallPaperChanged( int ) ) ); right = new TQVGroupBox( i18n( "Wallpaper Configuration" ), this ); TQWhatsThis::add( right, i18n( "In this box, you can set various settings " diff --git a/kchart/kchartColorConfigPage.cpp b/kchart/kchartColorConfigPage.cpp index c1691b286..2b9d49996 100644 --- a/kchart/kchartColorConfigPage.cpp +++ b/kchart/kchartColorConfigPage.cpp @@ -134,8 +134,8 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, wtstr = i18n( "Choose a row/column in the list on the left and change its color using this button."); TQWhatsThis::add( _dataColorCB, wtstr ); initDataColorList(); - connect( _dataColorLB, TQT_SIGNAL(highlighted(int )), this, TQT_SLOT(changeIndex(int))); - connect( _dataColorLB, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQT_SLOT(activeColorButton())); + connect( _dataColorLB, TQ_SIGNAL(highlighted(int )), this, TQ_SLOT(changeIndex(int))); + connect( _dataColorLB, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQ_SLOT(activeColorButton())); diff --git a/kchart/kchartConfigDialog.cpp b/kchart/kchartConfigDialog.cpp index f0f57d625..e9f47660a 100644 --- a/kchart/kchartConfigDialog.cpp +++ b/kchart/kchartConfigDialog.cpp @@ -191,8 +191,8 @@ KChartConfigDialog::KChartConfigDialog( KChartParams* params, #endif setCancelButton( i18n( "&Cancel" ) ); - connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( apply() ) ); - connect( this, TQT_SIGNAL( defaultButtonPressed() ), this, TQT_SLOT( defaults() ) ); + connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( apply() ) ); + connect( this, TQ_SIGNAL( defaultButtonPressed() ), this, TQ_SLOT( defaults() ) ); } diff --git a/kchart/kchartDataEditor.cpp b/kchart/kchartDataEditor.cpp index 544c41cba..4d6fdbf4a 100644 --- a/kchart/kchartDataEditor.cpp +++ b/kchart/kchartDataEditor.cpp @@ -178,8 +178,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : m_table->setRowMovingEnabled(true); m_table->setColumnMovingEnabled(true); - connect( m_table, TQT_SIGNAL( currentChanged(int, int) ), - this, TQT_SLOT( currentChanged(int, int) ) ); + connect( m_table, TQ_SIGNAL( currentChanged(int, int) ), + this, TQ_SLOT( currentChanged(int, int) ) ); // Create the Rows setting m_rowsLA = new TQLabel( i18n("# Rows:" ), page ); @@ -210,8 +210,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_insertRowButton = new TQPushButton( i18n("Insert Row") , page); - connect( m_insertRowButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( insertRow() ) ); + connect( m_insertRowButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( insertRow() ) ); m_removeRowButton = new TQPushButton( page ); m_removeRowButton->setPixmap( BarIcon( TQString("delete_table_row"), @@ -219,8 +219,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_removeRowButton = new TQPushButton( i18n("Remove Row") , page); - connect( m_removeRowButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeCurrentRow() ) ); + connect( m_removeRowButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeCurrentRow() ) ); m_insertColButton = new TQPushButton( page ); m_insertColButton->setPixmap( BarIcon( TQString("insert_table_col"), @@ -228,8 +228,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_insertColButton = new TQPushButton( i18n("Insert Column") , page); - connect( m_insertColButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( insertColumn() ) ); + connect( m_insertColButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( insertColumn() ) ); m_removeColButton = new TQPushButton( page ); m_removeColButton->setPixmap( BarIcon( TQString("delete_table_col"), @@ -237,8 +237,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_removeColButton = new TQPushButton( i18n("Remove Column") , page); - connect( m_removeColButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeCurrentColumn() ) ); + connect( m_removeColButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeCurrentColumn() ) ); // Start the layout. The buttons are at the top. TQVBoxLayout *topLayout = new TQVBoxLayout( page ); @@ -283,24 +283,24 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : topLayout->setStretchFactor(insertRemoveLayout,1); // Connect signals from the spin boxes. - connect(m_rowsSB, TQT_SIGNAL(valueChangedSpecial(int)), - this, TQT_SLOT(setRows(int))); - connect(m_colsSB, TQT_SIGNAL(valueChangedSpecial(int)), - this, TQT_SLOT(setCols(int))); + connect(m_rowsSB, TQ_SIGNAL(valueChangedSpecial(int)), + this, TQ_SLOT(setRows(int))); + connect(m_colsSB, TQ_SIGNAL(valueChangedSpecial(int)), + this, TQ_SLOT(setCols(int))); #if 0 // -- Changed data editor to use top row and leftmost column for // series names and labels so this is no longer necessary. - connect(m_table->horizontalHeader(), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(column_clicked(int)) ); - connect(m_table->verticalHeader(), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(row_clicked(int)) ); + connect(m_table->horizontalHeader(), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(column_clicked(int)) ); + connect(m_table->verticalHeader(), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(row_clicked(int)) ); #endif - connect(m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(tableChanged(int, int)) ); + connect(m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(tableChanged(int, int)) ); // At first, assume that any shrinking of the table is a mistake. // A confirmation dialog will make sure that the user knows what diff --git a/kchart/kchartFontConfigPage.cpp b/kchart/kchartFontConfigPage.cpp index 27f91581d..91d8c1070 100644 --- a/kchart/kchartFontConfigPage.cpp +++ b/kchart/kchartFontConfigPage.cpp @@ -109,10 +109,10 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params, grid->setColStretch(2, 1); grid->setRowStretch(3, 1); - connect( m_fontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changeLabelFont())); - connect( m_list, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )), - this, TQT_SLOT(changeLabelFont())); + connect( m_fontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changeLabelFont())); + connect( m_list, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )), + this, TQ_SLOT(changeLabelFont())); // Enter the items into the list. initList(); diff --git a/kchart/kchartHeaderFooterConfigPage.cpp b/kchart/kchartHeaderFooterConfigPage.cpp index 8e11184ed..24272cc1c 100644 --- a/kchart/kchartHeaderFooterConfigPage.cpp +++ b/kchart/kchartHeaderFooterConfigPage.cpp @@ -58,7 +58,7 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params titleFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(titleFontButton, i18n("Click on this button to choose the font family, style and size for the title.")); layout->addWidget(titleFontButton,0,3); - connect( titleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTitleFont())); + connect( titleFontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeTitleFont())); lab=new TQLabel(i18n("Subtitle:"),this); TQWhatsThis::add(lab, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title.")); @@ -75,7 +75,7 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params subtitleFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(subtitleFontButton, i18n("Click on this button to choose the font family, style and size for the subtitle.")); layout->addWidget(subtitleFontButton,1,3); - connect( subtitleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSubtitleFont())); + connect( subtitleFontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeSubtitleFont())); lab=new TQLabel(i18n("Footer:"),this); TQWhatsThis::add(lab, i18n("Write here the footer of your chart if you want one. The footer will be centered at the bottom just below your chart.")); @@ -91,7 +91,7 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params footerFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(footerFontButton, i18n("Click on this button to choose the font family, style and size for the footer.")); - connect( footerFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFooterFont())); + connect( footerFontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeFooterFont())); layout->addWidget(footerFontButton,2,3); layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 ); diff --git a/kchart/kchartLegendConfigPage.cpp b/kchart/kchartLegendConfigPage.cpp index 1187cafbc..0f4b07a27 100644 --- a/kchart/kchartLegendConfigPage.cpp +++ b/kchart/kchartLegendConfigPage.cpp @@ -125,10 +125,10 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, TQWhatsThis::add(textLegendFontButton, i18n("Click here to display the TDE font chooser dialog. You will be able to change the font family, style and size for the legend text.")); grid4->addWidget( textLegendFontButton, 3, 0 ); - connect( titleLegendFontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changeTitleLegendFont())); - connect( textLegendFontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changeTextLegendFont())); + connect( titleLegendFontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changeTitleLegendFont())); + connect( textLegendFontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changeTextLegendFont())); // 4. Block: Orientation orientationGroup = new TQVButtonGroup( i18n("Orientation"), this ); diff --git a/kchart/kchartLine3dConfigPage.cpp b/kchart/kchartLine3dConfigPage.cpp index f3750f739..fd600c0a2 100644 --- a/kchart/kchartLine3dConfigPage.cpp +++ b/kchart/kchartLine3dConfigPage.cpp @@ -45,8 +45,8 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, line3d=new TQCheckBox(i18n("3D lines"),this); grid1->addWidget(line3d,1,0); - connect(line3d, TQT_SIGNAL(toggled ( bool )), - this, TQT_SLOT(slotChange3DParameter(bool))); + connect(line3d, TQ_SIGNAL(toggled ( bool )), + this, TQ_SLOT(slotChange3DParameter(bool))); #endif // The line width label and input. diff --git a/kchart/kchartPageLayout.cpp b/kchart/kchartPageLayout.cpp index 434a5d2fd..714174589 100644 --- a/kchart/kchartPageLayout.cpp +++ b/kchart/kchartPageLayout.cpp @@ -82,9 +82,9 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con grid->addWidget(bottomBorder,3,1); init(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotReset() )); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this ,TQ_SLOT( slotReset() )); } diff --git a/kchart/kchartParameter3dConfigPage.cpp b/kchart/kchartParameter3dConfigPage.cpp index 753f07a92..00f38e06c 100644 --- a/kchart/kchartParameter3dConfigPage.cpp +++ b/kchart/kchartParameter3dConfigPage.cpp @@ -55,8 +55,8 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, TQWhatsThis::add(bar3d, i18n("If checked, this will enable 3D mode for viewing the bars. You can then add a shadow and set the angle and depth for 3D.")); grid1->addWidget(bar3d,0,0); - connect(bar3d, TQT_SIGNAL(toggled ( bool )), - this, TQT_SLOT(slotChange3DParameter(bool))); + connect(bar3d, TQ_SIGNAL(toggled ( bool )), + this, TQ_SLOT(slotChange3DParameter(bool))); // Checkbox for shadows drawShadowColor=new TQCheckBox(i18n("Draw dark shadow"),gb); diff --git a/kchart/kchartParameterConfigPage.cpp b/kchart/kchartParameterConfigPage.cpp index 770b1c23a..b86ccf121 100644 --- a/kchart/kchartParameterConfigPage.cpp +++ b/kchart/kchartParameterConfigPage.cpp @@ -63,13 +63,13 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, yaxis = new TQCheckBox( i18n( "Y-axis" ), gb1); TQWhatsThis::add(yaxis, i18n("If this is checked, the Y-axis is shown. If you uncheck this option, the Y-axis and the Y grid lines will not be displayed anymore.")); - connect( yaxis, TQT_SIGNAL( clicked() ), this, TQT_SLOT( axisChanged() ) ); + connect( yaxis, TQ_SIGNAL( clicked() ), this, TQ_SLOT( axisChanged() ) ); grid1->addWidget(yaxis, 1, 0); //gb1->insert(yaxis); xaxis = new TQCheckBox( i18n( "X-axis" ), gb1 ); TQWhatsThis::add(xaxis, i18n("If this is checked, the X-axis is shown. If you uncheck this option, the X-axis and the X grid lines will not be displayed anymore.")); - connect( xaxis, TQT_SIGNAL( clicked() ), this, TQT_SLOT( axisChanged() ) ); + connect( xaxis, TQ_SIGNAL( clicked() ), this, TQ_SLOT( axisChanged() ) ); grid1->addWidget(xaxis, 2, 0); //gb1->insert(xaxis); @@ -131,8 +131,8 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, automatic_precision->setChecked(true); max = new TQRadioButton( i18n("Decimal precision:"), precision); TQWhatsThis::add(max, i18n("This sets the Y-axis precision. For example, if you choose a precision of 2, the value 5 will be displayed as 5.00 alongside the Y-axis.")); - connect(automatic_precision, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(automatic_precision_toggled(bool)) ); + connect(automatic_precision, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(automatic_precision_toggled(bool)) ); maximum_length = new TQSpinBox(0, 15, 1, precision ); TQWhatsThis::add(maximum_length, i18n("Set the precision you want to display for the Y-axis, if you choose Decimal precision. The range is 0 to 15; 2 being the default.")); maximum_length->setValue(2); @@ -167,10 +167,10 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, grid1->activate(); grid2->activate(); #endif - /*connect( grid, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( changeState( bool ) ) );*/ - /*connect( xaxis, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( changeXaxisState( bool ) ) );*/ + /*connect( grid, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( changeState( bool ) ) );*/ + /*connect( xaxis, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( changeXaxisState( bool ) ) );*/ } diff --git a/kchart/kchartParameterPieConfigPage.cpp b/kchart/kchartParameterPieConfigPage.cpp index d640333ee..3ea70ece9 100644 --- a/kchart/kchartParameterPieConfigPage.cpp +++ b/kchart/kchartParameterPieConfigPage.cpp @@ -71,7 +71,7 @@ KChartParameterPieConfigPage::KChartParameterPieConfigPage( KChartParams* params grid1->activate(); - connect(pie3d,TQT_SIGNAL(toggled ( bool )),this, TQT_SLOT(active3DPie(bool))); + connect(pie3d,TQ_SIGNAL(toggled ( bool )),this, TQ_SLOT(active3DPie(bool))); } void KChartParameterPieConfigPage::active3DPie(bool b) diff --git a/kchart/kchartPieConfigPage.cpp b/kchart/kchartPieConfigPage.cpp index 31ec42a6b..a56a96c8c 100644 --- a/kchart/kchartPieConfigPage.cpp +++ b/kchart/kchartPieConfigPage.cpp @@ -89,9 +89,9 @@ KChartPieConfigPage::KChartPieConfigPage( KChartParams* params, initList(); dist->setEnabled(false); - connect(column,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(changeValue(int))); + connect(column,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(changeValue(int))); - connect( list, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( slotselected(TQListViewItem *) ) ); + connect( list, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( slotselected(TQListViewItem *) ) ); } diff --git a/kchart/kchartSubTypeChartPage.cpp b/kchart/kchartSubTypeChartPage.cpp index 9ccad59eb..055d113d6 100644 --- a/kchart/kchartSubTypeChartPage.cpp +++ b/kchart/kchartSubTypeChartPage.cpp @@ -57,8 +57,8 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n("HiLoOpenClose"), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); @@ -136,8 +136,8 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); @@ -220,8 +220,8 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params, subtypeBG->insert( percent, KDChartParams::BarPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); //TQHBox *hbox = new TQHBox( this ); new TQLabel( i18n( "Number of lines: "), left ); @@ -310,8 +310,8 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); @@ -389,8 +389,8 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); diff --git a/kchart/kchartWizard.cpp b/kchart/kchartWizard.cpp index 01e5bf456..9145c1754 100644 --- a/kchart/kchartWizard.cpp +++ b/kchart/kchartWizard.cpp @@ -58,15 +58,15 @@ KChartWizard::KChartWizard ( KChartPart* _chart, TQWidget *parent, const char* n setNextEnabled(m_axespage, false); setHelpEnabled(m_axespage, false); - // connect( this, TQT_SIGNAL( finished() ), _selectdatapage, TQT_SLOT( apply() ) ); - connect(this, TQT_SIGNAL(finished()), m_dataFormatPage, TQT_SLOT(apply())); - connect(this, TQT_SIGNAL(finished()), m_chartTypePage, TQT_SLOT(apply())); - connect(this ,TQT_SIGNAL(finished()), m_chartSubtypePage, TQT_SLOT(apply())); - connect(this, TQT_SIGNAL(finished()), m_labelsLegendPage, TQT_SLOT(apply())); - connect(this, TQT_SIGNAL(finished()), m_axespage, TQT_SLOT(apply())); - - connect( m_chartTypePage, TQT_SIGNAL( chartChange( int ) ), - this, TQT_SLOT( subType( int ) ) ); + // connect( this, TQ_SIGNAL( finished() ), _selectdatapage, TQ_SLOT( apply() ) ); + connect(this, TQ_SIGNAL(finished()), m_dataFormatPage, TQ_SLOT(apply())); + connect(this, TQ_SIGNAL(finished()), m_chartTypePage, TQ_SLOT(apply())); + connect(this ,TQ_SIGNAL(finished()), m_chartSubtypePage, TQ_SLOT(apply())); + connect(this, TQ_SIGNAL(finished()), m_labelsLegendPage, TQ_SLOT(apply())); + connect(this, TQ_SIGNAL(finished()), m_axespage, TQ_SLOT(apply())); + + connect( m_chartTypePage, TQ_SIGNAL( chartChange( int ) ), + this, TQ_SLOT( subType( int ) ) ); adjustSize(); subType( m_chart->params()->chartType() ); diff --git a/kchart/kchartWizardLabelsLegendPage.cpp b/kchart/kchartWizardLabelsLegendPage.cpp index 3899a2766..fdcf99f41 100644 --- a/kchart/kchartWizardLabelsLegendPage.cpp +++ b/kchart/kchartWizardLabelsLegendPage.cpp @@ -168,31 +168,31 @@ KChartWizardLabelsLegendPage::KChartWizardLabelsLegendPage( TQWidget* parent, KC title=_chart->params()->header1Font(); grid1->addWidget(tmpTQGroupBox,0,0); - connect(xtitlefont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeXLabelFont())); - connect(ytitlefont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeYLabelFont())); + connect(xtitlefont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeXLabelFont())); + connect(ytitlefont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeYLabelFont())); #if 0 - connect(ytitle2font,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeY2LabelFont())); + connect(ytitle2font,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeY2LabelFont())); #endif - connect(titlefont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeTitleFont())); - connect(legendTitleFont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeLegendTitleFont())); + connect(titlefont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeTitleFont())); + connect(legendTitleFont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeLegendTitleFont())); - connect(legendTextFont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeLegendTextFont())); + connect(legendTextFont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeLegendTextFont())); - connect(xtitlecolor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeXLabelColor(const TQColor &))); - connect(ytitlecolor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeYLabelColor(const TQColor &))); - connect(titlecolor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeTitleColor(const TQColor &))); + connect(xtitlecolor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeXLabelColor(const TQColor &))); + connect(ytitlecolor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeYLabelColor(const TQColor &))); + connect(titlecolor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeTitleColor(const TQColor &))); #if 0 - connect(ytitle2color,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeYTitle2Color(const TQColor &))); + connect(ytitle2color,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeYTitle2Color(const TQColor &))); #endif - connect(legendTitleColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeLegendTitleColor(const TQColor &))); + connect(legendTitleColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeLegendTitleColor(const TQColor &))); - connect(legendTextColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeLegendTextColor(const TQColor &))); + connect(legendTextColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeLegendTextColor(const TQColor &))); } diff --git a/kchart/kchartWizardSelectChartTypePage.cpp b/kchart/kchartWizardSelectChartTypePage.cpp index 8ea02100b..a6ed817b7 100644 --- a/kchart/kchartWizardSelectChartTypePage.cpp +++ b/kchart/kchartWizardSelectChartTypePage.cpp @@ -79,8 +79,8 @@ KChartWizardSelectChartTypePage::KChartWizardSelectChartTypePage( TQWidget* pare } m_type = m_chart->params()->chartType(); - connect( m_typeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( chartTypeSelected( int ) ) ); + connect( m_typeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( chartTypeSelected( int ) ) ); //// parent->resize( 425, 256 ); // parent->resize(xstep*5+50, ystep*4 + 100); diff --git a/kchart/kchartWizardSetupAxesPage.cpp b/kchart/kchartWizardSetupAxesPage.cpp index 5514e82b8..49873149e 100644 --- a/kchart/kchartWizardSetupAxesPage.cpp +++ b/kchart/kchartWizardSetupAxesPage.cpp @@ -189,15 +189,15 @@ KChartWizardSetupAxesPage::KChartWizardSetupAxesPage( TQWidget* parent, - connect(ylabelFont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeLabelFont())); + connect(ylabelFont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeLabelFont())); - connect(ylabelColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeLabelColor(const TQColor &))); - connect(borderColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeBorderColor(const TQColor &))); - connect(gridColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeGridColor(const TQColor &))); + connect(ylabelColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeLabelColor(const TQColor &))); + connect(borderColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeBorderColor(const TQColor &))); + connect(gridColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeGridColor(const TQColor &))); } diff --git a/kchart/kchartWizardSetupDataPage.cpp b/kchart/kchartWizardSetupDataPage.cpp index 1d057d4ca..2e8725bb0 100644 --- a/kchart/kchartWizardSetupDataPage.cpp +++ b/kchart/kchartWizardSetupDataPage.cpp @@ -27,16 +27,16 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, datarow = new TQRadioButton( this, "RadioButton_1" ); datarow->setGeometry( 270, 40, 100, 20 ); datarow->setText( i18n("Rows") ); - connect( datarow, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( dataInRowsClicked() ) ); + connect( datarow, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( dataInRowsClicked() ) ); tmpTQGroupBox->insert( datarow ); datacol = new TQRadioButton( this, "RadioButton_2" ); datacol->setGeometry( 270, 60, 100, 20 ); datacol->setText( i18n("Columns") ); datacol->setChecked( true ); - connect( datarow, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( dataInColsClicked() ) ); + connect( datarow, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( dataInColsClicked() ) ); tmpTQGroupBox->insert( datacol ); TQLabel* tmpTQLabel; @@ -49,8 +49,8 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, coldescript = new TQCheckBox( this, "CheckBox_3" ); coldescript->setGeometry( 260, 110, 20, 30 ); coldescript->setChecked( true ); - connect( coldescript, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( firstColumnIsDescriptionToggled( bool ) ) ); + connect( coldescript, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( firstColumnIsDescriptionToggled( bool ) ) ); coldescript->setText( "" ); descrBG->insert( coldescript ); @@ -61,8 +61,8 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, rowdescript = new TQCheckBox( this, "CheckBox_4" ); rowdescript->setGeometry( 260, 150, 20, 30 ); - connect( rowdescript, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( firstRowIsDescriptionToggled( bool ) ) ); + connect( rowdescript, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( firstRowIsDescriptionToggled( bool ) ) ); rowdescript->setText( "" ); descrBG->insert( rowdescript ); diff --git a/kchart/kchart_part.cpp b/kchart/kchart_part.cpp index 1956904bd..fffed0a03 100644 --- a/kchart/kchart_part.cpp +++ b/kchart/kchart_part.cpp @@ -693,7 +693,7 @@ bool KChartPart::showWizard( TQString &dataArea ) { KChartWizard *wizard = new KChartWizard( this, m_parentWidget, "wizard" ); - connect( wizard, TQT_SIGNAL(finished()), this, TQT_SLOT(slotModified()) ); + connect( wizard, TQ_SIGNAL(finished()), this, TQ_SLOT(slotModified()) ); wizard->setDataArea( dataArea ); diff --git a/kchart/kchart_view.cpp b/kchart/kchart_view.cpp index b7b7fba82..4b5e511df 100644 --- a/kchart/kchart_view.cpp +++ b/kchart/kchart_view.cpp @@ -65,100 +65,100 @@ KChartView::KChartView( KChartPart* part, TQWidget* parent, const char* name ) dcopObject(); // build it m_importData = new TDEAction( i18n( "Import Data..." ), 0, - this, TQT_SLOT( importData() ), + this, TQ_SLOT( importData() ), actionCollection(), "import_data" ); #if 0 TDEAction * actionExtraCreateTemplate = #endif new TDEAction( i18n( "&Create Template From Document..." ), 0, - this, TQT_SLOT( extraCreateTemplate() ), + this, TQ_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); m_wizard = new TDEAction( i18n("Customize with &Wizard..."), "wizard", 0, - this, TQT_SLOT( wizard() ), + this, TQ_SLOT( wizard() ), actionCollection(), "wizard"); m_edit = new TDEAction( i18n("Edit &Data..."), "edit", 0, - this, TQT_SLOT( editData() ), + this, TQ_SLOT( editData() ), actionCollection(), "editdata"); m_config = new TDEAction( i18n( "&Chart..." ), "configure", 0, - this, TQT_SLOT( slotConfig() ), + this, TQ_SLOT( slotConfig() ), actionCollection(), "config" ); // One TDEToggleAction per chart type m_chartbars = new TDEToggleAction( i18n("&Bar"), "chart_bar_3d", 0, this, - TQT_SLOT( barsChart() ), actionCollection(), + TQ_SLOT( barsChart() ), actionCollection(), "barschart"); m_chartbars->setExclusiveGroup( "charttypes" ); m_chartbars->setChecked( true ); m_chartline = new TDEToggleAction( i18n("&Line"), "chart_line", 0, this, - TQT_SLOT( lineChart() ), actionCollection(), + TQ_SLOT( lineChart() ), actionCollection(), "linechart"); m_chartline->setExclusiveGroup( "charttypes" ); m_chartareas = new TDEToggleAction( i18n("&Area"), "chart_area", 0, this, - TQT_SLOT( areasChart() ), actionCollection(), + TQ_SLOT( areasChart() ), actionCollection(), "areaschart"); m_chartareas->setExclusiveGroup( "charttypes" ); m_charthilo = new TDEToggleAction( i18n("&HiLo"), "chart_hilo", 0, this, - TQT_SLOT( hiLoChart() ), actionCollection(), + TQ_SLOT( hiLoChart() ), actionCollection(), "hilochart"); m_charthilo->setExclusiveGroup( "charttypes" ); m_chartbw = new TDEToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, this, - TQT_SLOT( bwChart() ), actionCollection(), + TQ_SLOT( bwChart() ), actionCollection(), "bwchart"); m_chartbw->setExclusiveGroup( "charttypes" ); m_chartpie = new TDEToggleAction( i18n("&Pie"), "chart_pie", 0, this, - TQT_SLOT( pieChart() ), actionCollection(), + TQ_SLOT( pieChart() ), actionCollection(), "piechart"); m_chartpie->setExclusiveGroup( "charttypes" ); m_chartring = new TDEToggleAction( i18n("&Ring"), "chart_ring", 0, this, - TQT_SLOT( ringChart() ), actionCollection(), + TQ_SLOT( ringChart() ), actionCollection(), "ringchart"); m_chartring->setExclusiveGroup( "charttypes" ); m_chartpolar = new TDEToggleAction( i18n("&Polar"), "chart_polar", 0, this, - TQT_SLOT( polarChart() ), actionCollection(), + TQ_SLOT( polarChart() ), actionCollection(), "polarchart"); m_chartpolar->setExclusiveGroup( "charttypes" ); // Configuration TDEActions m_colorConfig = new TDEAction( i18n( "&Colors..." ), 0, - this, TQT_SLOT( slotConfigColor() ), + this, TQ_SLOT( slotConfigColor() ), actionCollection(), "color_config" ); m_fontConfig = new TDEAction( i18n( "&Font..." ), 0, - this, TQT_SLOT( slotConfigFont() ), + this, TQ_SLOT( slotConfigFont() ), actionCollection(), "font_config" ); m_backConfig = new TDEAction( i18n( "&Background..." ), 0, - this, TQT_SLOT( slotConfigBack() ), + this, TQ_SLOT( slotConfigBack() ), actionCollection(), "back_config" ); m_legendConfig = new TDEAction( i18n( "&Legend..." ), 0, - this, TQT_SLOT( slotConfigLegend() ), + this, TQ_SLOT( slotConfigLegend() ), actionCollection(), "legend_config" ); m_subTypeChartConfig = new TDEAction( i18n( "Chart &Sub-type..." ), 0, - this, TQT_SLOT( slotConfigSubTypeChart() ), + this, TQ_SLOT( slotConfigSubTypeChart() ), actionCollection(), "legend_subtype" ); m_dataFormatConfig = new TDEAction( i18n( "&Data Format..." ), 0, - this, TQT_SLOT( slotConfigDataFormat() ), + this, TQ_SLOT( slotConfigDataFormat() ), actionCollection(), "data_format" ); m_headerFooterConfig = new TDEAction( i18n( "&Header && Footer..." ), 0, - this, TQT_SLOT( slotConfigHeaderFooterChart() ), + this, TQ_SLOT( slotConfigHeaderFooterChart() ), actionCollection(), "headerfooter_subtype" ); m_pageLayoutConfig = new TDEAction( i18n( "Page Layout..." ), 0, - this, TQT_SLOT( slotConfigPageLayout() ), + this, TQ_SLOT( slotConfigPageLayout() ), actionCollection(), "page_layout" ); // initialize the configuration @@ -230,8 +230,8 @@ void KChartView::editData() ed.setColLabels(((KChartPart*)koDocument())->colLabelTexts()); // Activate the Apply button in the editor. - connect(&ed, TQT_SIGNAL(applyClicked(kchartDataEditor *)), - this, TQT_SLOT(applyEdit(kchartDataEditor *))); + connect(&ed, TQ_SIGNAL(applyClicked(kchartDataEditor *)), + this, TQ_SLOT(applyEdit(kchartDataEditor *))); // Execute the data editor. if ( ed.exec() != TQDialog::Accepted ) { @@ -339,8 +339,8 @@ void KChartView::config(int flags) KChartConfigDialog *d = new KChartConfigDialog( params, this, flags, dat ); - connect( d, TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotRepaint() ) ); + connect( d, TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotRepaint() ) ); d->exec(); delete d; } @@ -611,8 +611,8 @@ void KChartView::slotConfigPageLayout() KChartPageLayout *dialog = new KChartPageLayout(params, this, "Page Layout"); - connect( dialog, TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotRepaint() ) ); + connect( dialog, TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotRepaint() ) ); dialog->exec(); delete dialog; diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 6de8d0a49..17a71babf 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -248,7 +248,7 @@ void KDGanttSemiSizingControl::init() { _but = new TQPushButton( this ); _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); + connect( _but, TQ_SIGNAL( clicked() ), this, TQ_SLOT(changeState()) ); _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); TQToolTip::add( _but, "Show / hide legend"); diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 1d1a3e4dc..a91f2a972 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -99,18 +99,18 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) spacerLeft = new TQHBox( leftWidget ); myListView = new KDListView(leftWidget, this); myListView->setVScrollBarMode (TQScrollView::AlwaysOff ); - connect( myListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( myListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( myListView, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) ); - connect( myListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) ); - connect( myListView, TQT_SIGNAL(doubleClicked ( TQListViewItem * ) ), this, TQT_SLOT(slotdoubleClicked ( TQListViewItem * ) ) ); + connect( myListView, TQ_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) ); + connect( myListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) ); + connect( myListView, TQ_SIGNAL(doubleClicked ( TQListViewItem * ) ), this, TQ_SLOT(slotdoubleClicked ( TQListViewItem * ) ) ); - connect( myListView, TQT_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQT_SLOT(slotCurrentChanged ( TQListViewItem * ) ) ); - connect( myListView, TQT_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQT_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) ); - connect( myListView, TQT_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) ); + connect( myListView, TQ_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQ_SLOT(slotCurrentChanged ( TQListViewItem * ) ) ); + connect( myListView, TQ_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQ_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) ); + connect( myListView, TQ_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) ); - //connect( myListView, TQT_SIGNAL( ), this, TQT_SLOT( ) ); + //connect( myListView, TQ_SIGNAL( ), this, TQ_SLOT( ) ); myTimeTable = new KDTimeTableWidget (rightWidget,this); spacerRight = new TQWidget( rightWidget ); @@ -145,8 +145,8 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) setLineWidth( 2 ); myListView->setFrameStyle( TQFrame::NoFrame ); myListView->setMargin( 0 ); - TQObject::connect(myListView, TQT_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT( expandItem(TQListViewItem * ))) ; - TQObject::connect(myListView, TQT_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT(collapseItem(TQListViewItem * ))) ; + TQObject::connect(myListView, TQ_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT( expandItem(TQListViewItem * ))) ; + TQObject::connect(myListView, TQ_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT(collapseItem(TQListViewItem * ))) ; timeHeaderSpacerWidget->setFixedWidth(myCanvasView->verticalScrollBar()->width() ); listViewIsVisible = true; @@ -158,7 +158,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) myTextColor = TQt::black; myLegendItems = new TQPtrList<legendItem>; - //TQObject::connect( this, TQT_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQT_SLOT( editItem( KDGanttViewItem* ))) ; + //TQObject::connect( this, TQ_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQ_SLOT( editItem( KDGanttViewItem* ))) ; myItemAttributeDialog = new itemAttributeDialog(); setRepaintMode( KDGanttView::Medium ); //setRepaintMode( KDGanttView::Always ); @@ -166,19 +166,19 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) setHeaderVisible( false ); // now connecting the widgets - connect(myCanvasView->horizontalScrollBar(), TQT_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQT_SLOT( setValue ( int))) ; - connect(myCanvasView, TQT_SIGNAL ( heightResized( int )) ,myTimeTable, TQT_SLOT( checkHeight ( int))) ; - connect(myCanvasView, TQT_SIGNAL ( widthResized( int )) ,myTimeHeader, TQT_SLOT( checkWidth ( int))) ; - - TQObject::connect(myCanvasView->verticalScrollBar(), TQT_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQT_SLOT( setValue ( int ))) ; - connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,this, TQT_SLOT(slotHeaderSizeChanged() )) ; - connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQT_SLOT(resetWidth( int ) )) ; - connect(myListView, TQT_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQT_SLOT( moveMyContent( int, int ))) ; - connect(myTimeTable, TQT_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQT_SLOT( setMyContentsHeight( int ))) ; + connect(myCanvasView->horizontalScrollBar(), TQ_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQ_SLOT( setValue ( int))) ; + connect(myCanvasView, TQ_SIGNAL ( heightResized( int )) ,myTimeTable, TQ_SLOT( checkHeight ( int))) ; + connect(myCanvasView, TQ_SIGNAL ( widthResized( int )) ,myTimeHeader, TQ_SLOT( checkWidth ( int))) ; + + TQObject::connect(myCanvasView->verticalScrollBar(), TQ_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQ_SLOT( setValue ( int ))) ; + connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,this, TQ_SLOT(slotHeaderSizeChanged() )) ; + connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQ_SLOT(resetWidth( int ) )) ; + connect(myListView, TQ_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQ_SLOT( moveMyContent( int, int ))) ; + connect(myTimeTable, TQ_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQ_SLOT( setMyContentsHeight( int ))) ; // the next three are for adding new ticks at left/right - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(addTickLeft())); - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(addTickRight())); - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT( enableAdding( int ))); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(addTickLeft())); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(addTickRight())); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT( enableAdding( int ))); // now initing fCenterTimeLineAfterShow = false; @@ -560,18 +560,18 @@ void KDGanttView::setRepaintMode( RepaintMode mode ) break; case Medium: - connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvv, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvv, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint())); break; case Always: - connect( cvv, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int ))); - connect( cvh, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int ))); - connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int ))); + connect( cvh, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int ))); + connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); break; } } diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 08ba49299..e63b3aee3 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -725,42 +725,42 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant ) myPopupMenu = new TQPopupMenu(this); TQPopupMenu * zoomPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Zoom"),zoomPopupMenu, 1); - zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQT_SLOT(setSettings(int)),0 ,21,21 ); - zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQT_SLOT(setSettings(int)),0 ,20,20 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQT_SLOT(setSettings(int)),0 ,22,22 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQT_SLOT(setSettings(int)),0 ,24,24 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQT_SLOT(setSettings(int)),0 ,26,26 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQT_SLOT(setSettings(int)),0 ,23,23 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQT_SLOT(setSettings(int)),0 ,25,25 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQT_SLOT(setSettings(int)),0 ,27,27 ); + zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQ_SLOT(setSettings(int)),0 ,21,21 ); + zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQ_SLOT(setSettings(int)),0 ,20,20 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQ_SLOT(setSettings(int)),0 ,22,22 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQ_SLOT(setSettings(int)),0 ,24,24 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQ_SLOT(setSettings(int)),0 ,26,26 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQ_SLOT(setSettings(int)),0 ,23,23 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQ_SLOT(setSettings(int)),0 ,25,25 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQ_SLOT(setSettings(int)),0 ,27,27 ); scalePopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Scale"),scalePopupMenu, 2); - scalePopupMenu->insertItem( i18n("Minute"),this, TQT_SLOT(setSettings(int)),0 ,1,1 ); - scalePopupMenu->insertItem( i18n("Hour"),this, TQT_SLOT(setSettings(int)),0 ,2,2 ); - scalePopupMenu->insertItem( i18n("Day"),this, TQT_SLOT(setSettings(int)),0 ,3,3 ); - scalePopupMenu->insertItem( i18n("Week"),this, TQT_SLOT(setSettings(int)),0 ,4,4 ); - scalePopupMenu->insertItem( i18n("Month"),this, TQT_SLOT(setSettings(int)),0 ,5,5 ); - scalePopupMenu->insertItem( i18n("Auto"),this, TQT_SLOT(setSettings(int)),0 ,6,6 ); + scalePopupMenu->insertItem( i18n("Minute"),this, TQ_SLOT(setSettings(int)),0 ,1,1 ); + scalePopupMenu->insertItem( i18n("Hour"),this, TQ_SLOT(setSettings(int)),0 ,2,2 ); + scalePopupMenu->insertItem( i18n("Day"),this, TQ_SLOT(setSettings(int)),0 ,3,3 ); + scalePopupMenu->insertItem( i18n("Week"),this, TQ_SLOT(setSettings(int)),0 ,4,4 ); + scalePopupMenu->insertItem( i18n("Month"),this, TQ_SLOT(setSettings(int)),0 ,5,5 ); + scalePopupMenu->insertItem( i18n("Auto"),this, TQ_SLOT(setSettings(int)),0 ,6,6 ); scalePopupMenu->setCheckable ( true ); timePopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Time Format"),timePopupMenu, 3); - timePopupMenu->insertItem( i18n("24 Hour"),this, TQT_SLOT(setSettings(int)),0 ,40,40 ); - timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQT_SLOT(setSettings(int)),0 ,41,41 ); - timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQT_SLOT(setSettings(int)),0 ,42,42 ); + timePopupMenu->insertItem( i18n("24 Hour"),this, TQ_SLOT(setSettings(int)),0 ,40,40 ); + timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQ_SLOT(setSettings(int)),0 ,41,41 ); + timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQ_SLOT(setSettings(int)),0 ,42,42 ); yearPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Year Format"),yearPopupMenu, 4); - yearPopupMenu->insertItem( i18n("Four Digit"),this, TQT_SLOT(setSettings(int)),0 ,50,50 ); - yearPopupMenu->insertItem( i18n("Two Digit"),this, TQT_SLOT(setSettings(int)),0 ,51,51 ); - yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQT_SLOT(setSettings(int)),0 ,52,52 ); - yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQT_SLOT(setSettings(int)),0 ,53,53 ); + yearPopupMenu->insertItem( i18n("Four Digit"),this, TQ_SLOT(setSettings(int)),0 ,50,50 ); + yearPopupMenu->insertItem( i18n("Two Digit"),this, TQ_SLOT(setSettings(int)),0 ,51,51 ); + yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQ_SLOT(setSettings(int)),0 ,52,52 ); + yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQ_SLOT(setSettings(int)),0 ,53,53 ); gridPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Grid"),gridPopupMenu,5); - gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQT_SLOT(setSettings(int)),0 ,10,10 ); - gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQT_SLOT(setSettings(int)),0 ,11,11 ); - gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQT_SLOT(setSettings(int)),0 ,12,12 ); - myPopupMenu->insertItem( i18n("Print"),this, TQT_SLOT(setSettings(int)),0 ,30,30 ); - connect(myPopupMenu, TQT_SIGNAL ( aboutToShow () ) , this, TQT_SLOT( preparePopupMenu() )) ; + gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQ_SLOT(setSettings(int)),0 ,10,10 ); + gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQ_SLOT(setSettings(int)),0 ,11,11 ); + gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQ_SLOT(setSettings(int)),0 ,12,12 ); + myPopupMenu->insertItem( i18n("Print"),this, TQ_SLOT(setSettings(int)),0 ,30,30 ); + connect(myPopupMenu, TQ_SIGNAL ( aboutToShow () ) , this, TQ_SLOT( preparePopupMenu() )) ; flagZoomToFit = false; setShowMinorTicks( true ); myRealEnd = myHorizonEnd; @@ -2714,7 +2714,7 @@ KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (pare setDefaultRenameAction(TQListView::Accept); setColumnWidthMode ( 0,Maximum ); _calendarMode = false; - // TQObject::connect(this, TQT_SIGNAL ( pressed ( TQListViewItem * )) , this, TQT_SLOT( dragItem( TQListViewItem *))) ; + // TQObject::connect(this, TQ_SIGNAL ( pressed ( TQListViewItem * )) , this, TQ_SLOT( dragItem( TQListViewItem *))) ; } @@ -3186,38 +3186,38 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi TQPopupMenu * newMenu = new TQPopupMenu( this ); TQPopupMenu * onView = new TQPopupMenu( this ); onView->insertItem( i18n( "Summary" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 0 ); + TQ_SLOT ( newRootItem( int ) ), 0, 0 ); onView->insertItem( i18n( "Event" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 1); + TQ_SLOT ( newRootItem( int ) ), 0, 1); onView->insertItem( i18n( "Task" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 2 ); + TQ_SLOT ( newRootItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "New Root" ), onView ); newMenu->insertItem( i18n( "Summary" ), - this, TQT_SLOT ( newChildItem( int) ), 0, 0 ); + this, TQ_SLOT ( newChildItem( int) ), 0, 0 ); newMenu->insertItem( i18n( "Event" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 1 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 1 ); newMenu->insertItem( i18n( "Task" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 2 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "New Child" ), newMenu ); TQPopupMenu * afterMenu = new TQPopupMenu( this ); afterMenu->insertItem( i18n( "Summary" ), - this, TQT_SLOT ( newChildItem( int) ), 0, 0+4 ); + this, TQ_SLOT ( newChildItem( int) ), 0, 0+4 ); afterMenu->insertItem( i18n( "Event" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 1+4 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 1+4 ); afterMenu->insertItem( i18n( "Task" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 2+4 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 2+4 ); onItem->insertItem( i18n( "New After" ), afterMenu ); TQPopupMenu *pasteMenu = new TQPopupMenu( this ); pasteMenu->insertItem( i18n( "As Root" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 0 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 0 ); pasteMenu->insertItem( i18n( "As Child" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 1 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 1 ); pasteMenu->insertItem( i18n( "After" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 2 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "Paste" ), pasteMenu, 3 ); - onItem->insertItem( i18n( "Cut Item" ), this, TQT_SLOT ( cutItem() ) ); + onItem->insertItem( i18n( "Cut Item" ), this, TQ_SLOT ( cutItem() ) ); onItem->setItemEnabled( 3, false ); myMyContentsHeight = 0; _showItemAddPopupMenu = false; @@ -3225,13 +3225,13 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi TQObject *scrollViewTimer = child( "scrollview scrollbar timer", "TQTimer", false ); Q_ASSERT( scrollViewTimer ); if ( scrollViewTimer ) { - disconnect( scrollViewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollBars() ) ); + disconnect( scrollViewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScrollBars() ) ); } // If they needed a scrollbar timer in scrollview... - connect( &scrollBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(myUpdateScrollBars() ) ); + connect( &scrollBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(myUpdateScrollBars() ) ); myScrollTimer = new TQTimer( this, "myScrollTimer" ); - connect( myScrollTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) ); + connect( myScrollTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) ); autoScrollEnabled = false; } diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp index 2d1e6b775..7cea44c1b 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp @@ -42,8 +42,8 @@ KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& colu nColumns->setValue( m_columns.columns ); m_preview->setPageColumns( m_columns ); - connect( nColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( nColChanged( int ) ) ); - connect( m_spacing, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( nSpaceChanged( double ) ) ); + connect( nColumns, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( nColChanged( int ) ) ); + connect( m_spacing, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( nSpaceChanged( double ) ) ); } void KoPageLayoutColumns::setEnableColumns(bool on) { diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index b465c4d15..2d469b8dd 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -55,7 +55,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, cpgUnit->insertStringList( KoUnit::listOfUnitName() ); cpgUnit->setCurrentItem( unit ); unitLayout->addWidget( cpgUnit, 0, TQt::AlignLeft | TQt::AlignVCenter ); - connect( cpgUnit, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setUnitInt( int ) ) ); + connect( cpgUnit, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setUnitInt( int ) ) ); } else { TQString str=KoUnit::unitDescription(unit); @@ -78,7 +78,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, cpgFormat = new TQComboBox( false, formatPageSize, "cpgFormat" ); cpgFormat->insertStringList( KoPageFormat::allFormats() ); lpgFormat->setBuddy( cpgFormat ); - connect( cpgFormat, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( formatChanged( int ) ) ); + connect( cpgFormat, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( formatChanged( int ) ) ); // spacer formatPageSize->setStretchFactor( new TQWidget( formatPageSize ), 10 ); @@ -94,7 +94,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lpgWidth->setBuddy( epgWidth ); if ( m_layout.format != PG_CUSTOM ) epgWidth->setEnabled( false ); - connect( epgWidth, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( widthChanged(double) ) ); + connect( epgWidth, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( widthChanged(double) ) ); // label height TQLabel *lpgHeight = new TQLabel( i18n( "&Height:" ), formatCustomSize ); @@ -104,7 +104,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lpgHeight->setBuddy( epgHeight ); if ( m_layout.format != PG_CUSTOM ) epgHeight->setEnabled( false ); - connect( epgHeight, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( heightChanged(double) ) ); + connect( epgHeight, TQ_SIGNAL( valueChangedPt(double ) ), this, TQ_SLOT( heightChanged(double) ) ); // --------------- orientation --------------- m_orientGroup = new TQHButtonGroup( i18n( "Orientation" ), this ); @@ -121,7 +121,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() ); new TQRadioButton( i18n("La&ndscape"), m_orientGroup ); - connect( m_orientGroup, TQT_SIGNAL (clicked (int)), this, TQT_SLOT( orientationChanged(int) )); + connect( m_orientGroup, TQ_SIGNAL (clicked (int)), this, TQ_SLOT( orientationChanged(int) )); // --------------- page margins --------------- TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this ); @@ -135,22 +135,22 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, // left margin ebrLeft = new KoUnitDoubleSpinBox( marginsFrame, "Left" ); marginsLayout->addWidget( ebrLeft, 1, 0 ); - connect( ebrLeft, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( leftChanged( double ) ) ); + connect( ebrLeft, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( leftChanged( double ) ) ); // right margin ebrRight = new KoUnitDoubleSpinBox( marginsFrame, "Right" ); marginsLayout->addWidget( ebrRight, 1, 2 ); - connect( ebrRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); + connect( ebrRight, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( rightChanged( double ) ) ); // top margin ebrTop = new KoUnitDoubleSpinBox( marginsFrame, "Top" ); marginsLayout->addWidget( ebrTop, 0, 1 , TQt::AlignCenter ); - connect( ebrTop, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( topChanged( double ) ) ); + connect( ebrTop, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( topChanged( double ) ) ); // bottom margin ebrBottom = new KoUnitDoubleSpinBox( marginsFrame, "Bottom" ); marginsLayout->addWidget( ebrBottom, 2, 1, TQt::AlignCenter ); - connect( ebrBottom, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( bottomChanged( double ) ) ); + connect( ebrBottom, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( bottomChanged( double ) ) ); // ------------- preview ----------- pgPreview = new KoPagePreview( this, "Preview", m_layout ); diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp index 8d618793d..c26579eba 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp @@ -257,8 +257,8 @@ void KoPageLayoutDia::setupTab1( bool enableBorders ) m_pageSizeTab = new KoPageLayoutSize(tab1, m_layout, m_unit, m_column, !(flags & DISABLE_UNIT), enableBorders ); lay->addWidget(m_pageSizeTab); m_pageSizeTab->show(); - connect (m_pageSizeTab, TQT_SIGNAL( propertyChange(KoPageLayout&)), - this, TQT_SLOT (sizeUpdated( KoPageLayout&))); + connect (m_pageSizeTab, TQ_SIGNAL( propertyChange(KoPageLayout&)), + this, TQ_SLOT (sizeUpdated( KoPageLayout&))); } void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) { @@ -365,8 +365,8 @@ void KoPageLayoutDia::setupTab3() m_columnsTab->layout()->setMargin(0); lay->addWidget(m_columnsTab); m_columnsTab->show(); - connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)), - this, TQT_SLOT (columnsUpdated( KoColumns&))); + connect (m_columnsTab, TQ_SIGNAL( propertyChange(KoColumns&)), + this, TQ_SLOT (columnsUpdated( KoColumns&))); } void KoPageLayoutDia::columnsUpdated(KoColumns &columns) { diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cpp b/kexi/3rdparty/kolibs/koUnitWidgets.cpp index 097dfc250..0329c8825 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cpp +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cpp @@ -128,7 +128,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name ) setAcceptLocalizedNumbers( true ); setUnit( KoUnit::U_PT ); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged())); } @@ -151,7 +151,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, changeValue( value ); setLineStep( 0.5 ); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged())); } void @@ -291,7 +291,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); changeValue( KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) ); - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit, @@ -304,7 +304,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub lineEdit()->setValidator( m_validator ); setUnit( unit ); changeValue( KoUnit::ptToUnit( value, unit ) ); - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } void @@ -385,16 +385,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); layout->addWidget( up, 0, 0 ); - connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); layout->addWidget( down, 1, 0 ); - connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name ); - connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); + connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) ); layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } @@ -409,16 +409,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double low up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); layout->addWidget( up, 0, 0 ); - connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); layout->addWidget( down, 1, 0 ); - connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name ); - connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); + connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) ); layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index fd3e2b2c9..fd749b9f9 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -159,7 +159,7 @@ TDEAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQSt altName += "_alt"; TDEAction *alt_act = new TDEAction(alternativeText, a->iconSet(), a->shortcut(), 0, 0, a->parent(), altName); - TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate())); + TQObject::connect(alt_act, TQ_SIGNAL(activated()), a, TQ_SLOT(activate())); alt_act->plug(w); //OK? @@ -173,12 +173,12 @@ void KexiActionProxy::plugSharedActionToExternalGUI(const char *action_name, KXM TDEAction *a = client->action(action_name); if (!a) return; - plugSharedAction(a->name(), a, TQT_SLOT(activate())); + plugSharedAction(a->name(), a, TQ_SLOT(activate())); //update availability setAvailable(a->name(), a->isEnabled()); //changes will be signaled - TQObject::connect(a, TQT_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQT_SLOT(slotSetEnabled(bool))); + TQObject::connect(a, TQ_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQ_SLOT(slotSetEnabled(bool))); } void KexiActionProxy::plugSharedActionsToExternalGUI( diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp index 627bd7611..cca089b3e 100644 --- a/kexi/core/kexicontexthelp.cpp +++ b/kexi/core/kexicontexthelp.cpp @@ -33,8 +33,8 @@ KexiContextHelp::KexiContextHelp(KexiMainWindow *view, TQWidget *parent) kdDebug()<<"KexiContextHelp::KexiContextHelp()"<<endl; setCaption(i18n("Context Help")); setIcon(SmallIcon("help")); - connect(this,TQT_SIGNAL(linkClicked( const TQString& )), - this,TQT_SLOT(linkClickedInternal( const TQString& ))); + connect(this,TQ_SIGNAL(linkClicked( const TQString& )), + this,TQ_SLOT(linkClickedInternal( const TQString& ))); } void KexiContextHelp::linkClickedInternal(const TQString& link) { diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index f8067ddd6..c570a50e2 100644 --- a/kexi/core/kexidialogbase.cpp +++ b/kexi/core/kexidialogbase.cpp @@ -395,7 +395,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr m_stack->raiseWidget( newView ); newView->propertySetSwitched(); m_parentWindow->invalidateSharedActions( newView ); - TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok? + TQTimer::singleShot(10, newView, TQ_SLOT(setFocus())); //newView->setFocus(); //js ok? // setFocus(); return true; } diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index 48b4f9f03..21c636c08 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -127,11 +127,11 @@ void Part::createGUIClients(KexiMainWindow *win) //default actions for part's gui client: TDEAction *act = new TDEAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, - TQT_SLOT(slotCreate()), m_mainWin->actionCollection(), + TQ_SLOT(slotCreate()), m_mainWin->actionCollection(), KexiPart::nameForCreateAction(*info())); act->plug( m_mainWin->findPopupMenu("insert") ); // new TDEAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, -// TQT_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1()); +// TQ_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1()); //let init specific actions for parts // initPartActions( m_guiClient->actionCollection() ); m_mainWin->guiFactory()->addClient(m_guiClient); //this client is added permanently @@ -439,10 +439,10 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c +"part"+(partInstanceClient?"inst":"")+"ui.rc"); // new TDEAction(part->m_names["new"], part->info()->itemIcon(), 0, this, -// TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); +// TQ_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); // new TDEAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, -// TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); +// TQ_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); // win->guiFactory()->addClient(this); } diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 5370ba577..31100b6f1 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -37,7 +37,7 @@ KexiSharedActionHostPrivate::KexiSharedActionHostPrivate(KexiSharedActionHost *h , host(h) { volatileActions.setAutoDelete(true); - connect(&actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &))); + connect(&actionMapper, TQ_SIGNAL(mapped(const TQString &)), this, TQ_SLOT(slotAction(const TQString &))); } void KexiSharedActionHostPrivate::slotAction(const TQString& act_id) @@ -214,7 +214,7 @@ TQWidget* KexiSharedActionHost::focusWindow() TDEAction* KexiSharedActionHost::createSharedActionInternal( TDEAction *action ) { - TQObject::connect(action,TQT_SIGNAL(activated()), &d->actionMapper, TQT_SLOT(map())); + TQObject::connect(action,TQ_SIGNAL(activated()), &d->actionMapper, TQ_SLOT(map())); d->actionMapper.setMapping(action, action->name()); d->sharedActions.append( action ); return action; diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index ad97123ed..994bbd56c 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -12,11 +12,11 @@ #include "kexiuseraction.h" KexiUserAction::KexiUserAction(KexiMainWindow *win, TDEActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap) - : TDEAction(text, pixmap, TDEShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1()) + : TDEAction(text, pixmap, TDEShortcut::null(), this, TQ_SLOT(execute()), parent, name.latin1()) { m_win = win; m_method = 0; - connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(execute())); + connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(execute())); } void diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index 0ddb7afa7..d6c66aad0 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -81,20 +81,20 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) KPushButton *newItem = new KPushButton(SmallIconSet("document-new"), i18n("&New Connection"), frame); vlayout->addWidget(newItem); m_buttons.insert(BAdd, newItem); - connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem())); + connect(newItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItem())); KPushButton *delItem = new KPushButton(SmallIconSet("edit-delete"), i18n("&Remove Connection"), frame); vlayout->addWidget(delItem); m_buttons.insert(BRemove, delItem); - connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); + connect(delItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem())); vlayout->addStretch(); setInitialSize(TQSize(600, 300)); //setWFlags(WDestructiveClose); - connect(m_table,TQT_SIGNAL(cellSelected(int, int)), this, TQT_SLOT(slotCellSelected(int, int))); - connect(m_table->KexiDataAwareObjectInterface::data(), TQT_SIGNAL(rowInserted(KexiTableItem*,bool)), this, TQT_SLOT(slotRowInserted(KexiTableItem*,bool))); + connect(m_table,TQ_SIGNAL(cellSelected(int, int)), this, TQ_SLOT(slotCellSelected(int, int))); + connect(m_table->KexiDataAwareObjectInterface::data(), TQ_SIGNAL(rowInserted(KexiTableItem*,bool)), this, TQ_SLOT(slotRowInserted(KexiTableItem*,bool))); this->newItem(); } @@ -131,10 +131,10 @@ ConnectionDialog::initTable() m_table->maximizeColumnsWidth(c); m_table->setColumnStretchEnabled( true, 4 ); - connect(m_data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*)), - this,TQT_SLOT(slotCellChanged(KexiTableItem*, int, TQVariant, KexiDB::ResultInfo*))); - connect(m_data, TQT_SIGNAL(rowUpdated(KexiTableItem*)), this, TQT_SLOT(checkConnection(KexiTableItem *))); - connect(m_table, TQT_SIGNAL(itemSelected(KexiTableItem *)), this, TQT_SLOT(checkConnection(KexiTableItem *))); + connect(m_data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*)), + this,TQ_SLOT(slotCellChanged(KexiTableItem*, int, TQVariant, KexiDB::ResultInfo*))); + connect(m_data, TQ_SIGNAL(rowUpdated(KexiTableItem*)), this, TQ_SLOT(checkConnection(KexiTableItem *))); + connect(m_table, TQ_SIGNAL(itemSelected(KexiTableItem *)), this, TQ_SLOT(checkConnection(KexiTableItem *))); } void @@ -366,8 +366,8 @@ void ConnectionDialog::newItemByDragnDrop() { KFormDesigner::FormManager::self()->startCreatingConnection(); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(connectionAborted(KFormDesigner::Form*)), this, TQT_SLOT(slotConnectionAborted(KFormDesigner::Form*))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(connectionCreated(KFormDesigner::Form*, Connection&)), this, TQT_SLOT(slotConnectionCreated(KFormDesigner::Form*, Connection&)) ); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(connectionAborted(KFormDesigner::Form*)), this, TQ_SLOT(slotConnectionAborted(KFormDesigner::Form*))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(connectionCreated(KFormDesigner::Form*, Connection&)), this, TQ_SLOT(slotConnectionCreated(KFormDesigner::Form*, Connection&)) ); hide(); } diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index d1a4b1b63..6c477b5eb 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -127,10 +127,10 @@ Container::Container(Container *toplevel, TQWidget *container, TQObject *parent, else m_form->objectTree()->addItem(toplevel->objectTree(), it); - connect(toplevel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDeleted())); + connect(toplevel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDeleted())); } - connect(container, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDeleted())); + connect(container, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDeleted())); } Container::~Container() diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 55bf34e1a..b453bafb5 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -55,35 +55,35 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) newRow->setTextLabel(i18n("&Add Item"), true); vlayout->addWidget(newRow); m_buttons.insert(BNewRow, newRow); - connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow())); + connect(newRow, TQ_SIGNAL(clicked()), this, TQ_SLOT(newRow())); TQToolButton *newChild = new TQToolButton(m_contents); newChild->setIconSet(BarIconSet("1rightarrow")); newChild->setTextLabel(i18n("New &Subitem"), true); vlayout->addWidget(newChild); m_buttons.insert(BNewChild, newChild); - connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow())); + connect(newChild, TQ_SIGNAL(clicked()), this, TQ_SLOT(newChildRow())); TQToolButton *delRow = new TQToolButton(m_contents); delRow->setIconSet(BarIconSet("edit_remove")); delRow->setTextLabel(i18n("&Remove Item"), true); vlayout->addWidget(delRow); m_buttons.insert(BRemRow, delRow); - connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow())); + connect(delRow, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeRow())); TQToolButton *rowUp = new TQToolButton(m_contents); rowUp->setIconSet(BarIconSet("1uparrow")); rowUp->setTextLabel(i18n("Move Item &Up"), true); vlayout->addWidget(rowUp); m_buttons.insert(BRowUp, rowUp); - connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp())); + connect(rowUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveRowUp())); TQToolButton *rowDown = new TQToolButton(m_contents); rowDown->setIconSet(BarIconSet("1downarrow")); rowDown->setTextLabel(i18n("Move Item &Down"), true); vlayout->addWidget(rowDown); m_buttons.insert(BRowDown, rowDown); - connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown())); + connect(rowDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveRowDown())); vlayout->addStretch(); //// The listview /////////// @@ -98,8 +98,8 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) m_listview->setSorting(-1); layout->addWidget(m_listview); m_listview->setFocus(); - connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); - connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); + connect(m_listview, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*))); + connect(m_listview, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*))); /////////////////// Setup the columns page //////////////// TQHBoxLayout *hbox = new TQHBoxLayout(m_column, 0, 6); @@ -113,8 +113,8 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) m_propSet->addProperty(new KoProperty::Property("resizable", TQVariant(true), i18n("Resizable"), i18n("Resizable") )); m_propSet->addProperty(new KoProperty::Property("fullwidth", TQVariant(false), i18n("Full Width"), i18n("Full Width") )); m_editor->changeSet(m_propSet); - connect(m_propSet, TQT_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)), - this, TQT_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&))); + connect(m_propSet, TQ_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)), + this, TQ_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&))); // Setup the icon toolbar ////////// TQVBoxLayout *vbox = new TQVBoxLayout(hbox, 3); @@ -123,28 +123,28 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) add->setTextLabel(i18n("&Add Item"), true); vbox->addWidget(add); m_buttons.insert(BColAdd, add); - connect(add, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem())); + connect(add, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItem())); TQToolButton *remove = new TQToolButton(m_column); remove->setIconSet(BarIconSet("edit_remove")); remove->setTextLabel(i18n("&Remove Item"), true); vbox->addWidget(remove); m_buttons.insert(BColRem, remove); - connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); + connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem())); TQToolButton *up = new TQToolButton(m_column); up->setIconSet(BarIconSet("1uparrow")); up->setTextLabel(i18n("Move Item &Up"), true); vbox->addWidget(up); m_buttons.insert(BColUp, up); - connect(up, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveItemUp())); + connect(up, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveItemUp())); TQToolButton *down = new TQToolButton(m_column); down->setIconSet(BarIconSet("1downarrow")); down->setTextLabel(i18n("Move Item &Down"), true); vbox->addWidget(down); m_buttons.insert(BColDown, down); - connect(down, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveItemDown())); + connect(down, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveItemDown())); vbox->addStretch(); // The listbox with columns name ///// @@ -152,7 +152,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) m_listbox->setFocus(); hbox->insertWidget(0, m_listbox); hbox->addWidget(m_editor); - connect(m_listbox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), this, TQT_SLOT(updateItemProperties(TQListBoxItem*))); + connect(m_listbox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), this, TQ_SLOT(updateItemProperties(TQListBoxItem*))); //// Init dialog and display it //////////////////////// setInitialSize(TQSize(500, 300), true); diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index f2fde913f..12a9760f6 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -520,7 +520,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, KFDTabWidget *tab = new KFDTabWidget(p, n); #if defined(USE_KTabWidget) && TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) tab->setTabReorderingEnabled(true); - connect(tab, TQT_SIGNAL(movedTab(int,int)), this, TQT_SLOT(reorderTabs(int,int))); + connect(tab, TQ_SIGNAL(movedTab(int,int)), this, TQ_SLOT(reorderTabs(int,int))); #endif container->form()->objectTree()->addItem(container->objectTree(), new KFormDesigner::ObjectTreeItem( @@ -660,9 +660,9 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP // m_container = m_container->toplevel(); } - int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addTabPage()) ); - id = menu->insertItem(SmallIconSet("edit"), i18n("Rename Page..."), this, TQT_SLOT(renameTabPage())); - id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeTabPage())); + int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQ_SLOT(addTabPage()) ); + id = menu->insertItem(SmallIconSet("edit"), i18n("Rename Page..."), this, TQ_SLOT(renameTabPage())); + id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQ_SLOT(removeTabPage())); // if( dynamic_cast<TabWidgetBase*>(m_widget)->count() == 1) if( dynamic_cast<TabWidgetBase*>(widget())->count() == 1) menu->setItemEnabled(id, false); @@ -679,18 +679,18 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP // m_container = container->form()->objectTree()->lookup(m_widget->name())->parent()->container(); // m_container = container->form()->objectTree()->lookup(stack->name())->parent()->container(); - int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) ); + int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQ_SLOT(addStackPage()) ); - id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeStackPage()) ); + id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQ_SLOT(removeStackPage()) ); // if( ((TQWidgetStack*)m_widget)->children()->count() == 4) // == the stack has only one page if(stack->childrenListObject().count() == 4) // == the stack has only one page menu->setItemEnabled(id, false); - id = menu->insertItem(SmallIconSet("go-next"), i18n("Jump to Next Page"), this, TQT_SLOT(nextStackPage())); + id = menu->insertItem(SmallIconSet("go-next"), i18n("Jump to Next Page"), this, TQ_SLOT(nextStackPage())); if(!stack->widget(stack->id(stack->visibleWidget())+1)) menu->setItemEnabled(id, false); - id = menu->insertItem(SmallIconSet("go-previous"), i18n("Jump to Previous Page"), this, TQT_SLOT(prevStackPage())); + id = menu->insertItem(SmallIconSet("go-previous"), i18n("Jump to Previous Page"), this, TQ_SLOT(prevStackPage())); if(!stack->widget(stack->id(stack->visibleWidget()) -1) ) menu->setItemEnabled(id, false); return true; diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 89326c204..e970b138d 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -472,12 +472,12 @@ StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPo { if((classname == "TQLabel") || (classname == "KTextEdit")) { - menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); + menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQ_SLOT(editText())); return true; } else if(classname == "TDEListView") { - menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQT_SLOT(editListContents())); + menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQ_SLOT(editListContents())); return true; } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 349210f18..1089b5b34 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -99,8 +99,8 @@ Form::Form(WidgetLibrary* library, const char *name, bool designMode) // Init actions d->collection = new TDEActionCollection(0, this); d->history = new KCommandHistory(d->collection, true); - connect(d->history, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(slotCommandExecuted())); - connect(d->history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(slotFormRestored())); + connect(d->history, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(slotCommandExecuted())); + connect(d->history, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(slotFormRestored())); } Form::~Form() @@ -141,7 +141,7 @@ Form::createToplevel(TQWidget *container, FormWidget *formWidget, const TQCStrin // d->topTree->addModifiedProperty("caption", name()); //m_topTree->addModifiedProperty("icon"); - connect(container, TQT_SIGNAL(destroyed()), this, TQT_SLOT(formDeleted())); + connect(container, TQ_SIGNAL(destroyed()), this, TQ_SLOT(formDeleted())); kdDebug() << "Form::createToplevel(): d->toplevel=" << d->toplevel << endl; } @@ -421,8 +421,8 @@ Form::slotCommandExecuted() emit FormManager::self()->dirty(this, true); d->dirty = true; // because actions text is changed after the commandExecuted() signal is emitted - TQTimer::singleShot(10, this, TQT_SLOT(emitUndoEnabled())); - TQTimer::singleShot(10, this, TQT_SLOT(emitRedoEnabled())); + TQTimer::singleShot(10, this, TQ_SLOT(emitUndoEnabled())); + TQTimer::singleShot(10, this, TQ_SLOT(emitRedoEnabled())); } void diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 14584e204..102acda38 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -121,7 +121,7 @@ FormManager::FormManager(TQObject *parent, int options, const char *name) TDEGlobal::locale()->insertCatalogue("kformdesigner"); #endif - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS); //moved to createWidgetLibrary() m_lib = new WidgetLibrary(this, supportedFactoryGroups); @@ -139,9 +139,9 @@ FormManager::FormManager(TQObject *parent, int options, const char *name) m_domDoc.appendChild(m_domDoc.createElement("UI")); m_deleteWidgetLater_list.setAutoDelete(true); - connect( &m_deleteWidgetLater_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(deleteWidgetLaterTimeout())); - connect( this, TQT_SIGNAL(connectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)), - this, TQT_SLOT(slotConnectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&))); + connect( &m_deleteWidgetLater_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(deleteWidgetLaterTimeout())); + connect( this, TQ_SIGNAL(connectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)), + this, TQ_SLOT(slotConnectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&))); // register kfd custom editors KoProperty::FactoryManager::self()->registerFactoryForEditor(KoProperty::Pixmap, @@ -187,8 +187,8 @@ FormManager::setObjectTreeView(ObjectTreeView *treeview) { m_treeview = treeview; if (m_treeview) - connect(m_propSet, TQT_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)), - m_treeview, TQT_SLOT(renameItem(const TQCString&, const TQCString&))); + connect(m_propSet, TQ_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)), + m_treeview, TQ_SLOT(renameItem(const TQCString&, const TQCString&))); } ActionList @@ -196,13 +196,13 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection, { m_collection = collection; - ActionList actions = lib->createWidgetActions(client, m_collection, this, TQT_SLOT(insertWidget(const TQCString &))); + ActionList actions = lib->createWidgetActions(client, m_collection, this, TQ_SLOT(insertWidget(const TQCString &))); if (m_options & HideSignalSlotConnections) m_dragConnection = 0; else { m_dragConnection = new TDEToggleAction(i18n("Connect Signals/Slots"), - "signalslot", TDEShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection, + "signalslot", TDEShortcut(0), this, TQ_SLOT(startCreatingConnection()), m_collection, "drag_connection"); //to be exclusive with any 'widget' action m_dragConnection->setExclusiveGroup("LibActionWidgets"); @@ -211,7 +211,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection, } m_pointer = new TDEToggleAction(i18n("Pointer"), "mouse_pointer", TDEShortcut(0), - this, TQT_SLOT(slotPointerClicked()), m_collection, "pointer"); + this, TQ_SLOT(slotPointerClicked()), m_collection, "pointer"); m_pointer->setExclusiveGroup("LibActionWidgets"); //to be exclusive with any 'widget' action m_pointer->setChecked(true); actions.append(m_pointer); @@ -223,7 +223,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection, // Create the Style selection action (with a combo box in toolbar and submenu items) TDESelectAction *m_style = new TDESelectAction( i18n("Style"), TDEShortcut(0), - this, TQT_SLOT(slotStyle()), m_collection, "change_style"); + this, TQ_SLOT(slotStyle()), m_collection, "change_style"); m_style->setEditable(false); TDEGlobal::config()->setGroup("General"); @@ -628,17 +628,17 @@ FormManager::initForm(Form *form) m_active = form; - connect(form, TQT_SIGNAL(selectionChanged(TQWidget*, bool, bool)), - m_propSet, TQT_SLOT(setSelectedWidgetWithoutReload(TQWidget*, bool, bool))); + connect(form, TQ_SIGNAL(selectionChanged(TQWidget*, bool, bool)), + m_propSet, TQ_SLOT(setSelectedWidgetWithoutReload(TQWidget*, bool, bool))); if(m_treeview) { - connect(form, TQT_SIGNAL(selectionChanged(TQWidget*, bool, bool)), - m_treeview, TQT_SLOT(setSelectedWidget(TQWidget*, bool))); - connect(form, TQT_SIGNAL(childAdded(ObjectTreeItem* )), m_treeview, TQT_SLOT(addItem(ObjectTreeItem*))); - connect(form, TQT_SIGNAL(childRemoved(ObjectTreeItem* )), m_treeview, TQT_SLOT(removeItem(ObjectTreeItem*))); + connect(form, TQ_SIGNAL(selectionChanged(TQWidget*, bool, bool)), + m_treeview, TQ_SLOT(setSelectedWidget(TQWidget*, bool))); + connect(form, TQ_SIGNAL(childAdded(ObjectTreeItem* )), m_treeview, TQ_SLOT(addItem(ObjectTreeItem*))); + connect(form, TQ_SIGNAL(childRemoved(ObjectTreeItem* )), m_treeview, TQ_SLOT(removeItem(ObjectTreeItem*))); } - connect(m_propSet, TQT_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)), - form, TQT_SLOT(changeName(const TQCString&, const TQCString&))); + connect(m_propSet, TQ_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)), + form, TQ_SLOT(changeName(const TQCString&, const TQCString&))); form->setSelectedWidget(form->widget()); windowChanged(form->widget()); @@ -923,7 +923,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu /*int id =*/ m_popup->insertItem(i18n("Choose Buddy..."), sub); // menuIds->append(id); - connect(sub, TQT_SIGNAL(activated(int)), this, TQT_SLOT(buddyChosen(int))); + connect(sub, TQ_SIGNAL(activated(int)), this, TQ_SLOT(buddyChosen(int))); separatorNeeded = true; } @@ -946,7 +946,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu // menuIds->append(id); if(list.isEmpty()) m_popup->setItemEnabled(id, false); - connect(sigMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuSignalChosen(int))); + connect(sigMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuSignalChosen(int))); separatorNeeded = true; } #endif diff --git a/kexi/formeditor/libactionwidget.cpp b/kexi/formeditor/libactionwidget.cpp index 4322ad181..b98843d2f 100644 --- a/kexi/formeditor/libactionwidget.cpp +++ b/kexi/formeditor/libactionwidget.cpp @@ -26,7 +26,7 @@ using namespace KFormDesigner; LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c) - : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, + : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQ_SLOT(slotWidget())*/, c, TQString("library_widget_" + w->className()).latin1()) { // kdDebug() << "LibActionWidget::LibActionWidget(): " << TQString("library_widget_" + w->className()).latin1() << endl; @@ -34,7 +34,7 @@ LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c) setExclusiveGroup("LibActionWidgets"); setToolTip(w->name()); setWhatsThis(w->description()); -// connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(slotWidget())); +// connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(slotWidget())); } void diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index 22434c87d..0614da0e9 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -172,12 +172,12 @@ ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop) installEventFilter(this); - connect((TQObject*)header(), TQT_SIGNAL(sectionHandleDoubleClicked(int)), this, TQT_SLOT(slotColumnSizeChanged(int))); + connect((TQObject*)header(), TQ_SIGNAL(sectionHandleDoubleClicked(int)), this, TQ_SLOT(slotColumnSizeChanged(int))); if(!tabStop) { setSelectionModeExt(Extended); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQ_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } setFullWidth(true); @@ -323,7 +323,7 @@ void ObjectTreeView::setForm(Form *form) { if (m_form) - disconnect(m_form, TQT_SIGNAL(destroying()), this, TQT_SLOT(slotBeforeFormDestroyed())); + disconnect(m_form, TQ_SIGNAL(destroying()), this, TQ_SLOT(slotBeforeFormDestroyed())); m_form = form; m_topItem = 0; clear(); @@ -331,7 +331,7 @@ ObjectTreeView::setForm(Form *form) if(!m_form) return; - connect(m_form, TQT_SIGNAL(destroying()), this, TQT_SLOT(slotBeforeFormDestroyed())); + connect(m_form, TQ_SIGNAL(destroying()), this, TQ_SLOT(slotBeforeFormDestroyed())); // Creates the hidden top Item m_topItem = new ObjectTreeViewItem(this); diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp index ab46ecd71..13301789c 100644 --- a/kexi/formeditor/resizehandle.cpp +++ b/kexi/formeditor/resizehandle.cpp @@ -109,7 +109,7 @@ bool ResizeHandle::eventFilter(TQObject *o, TQEvent *ev) { if (((ev->type() == TQEvent::Move) || (ev->type() == TQEvent::Resize)) && o == m_set->m_widget) { - //TQTimer::singleShot(0,this,TQT_SLOT(updatePos())); + //TQTimer::singleShot(0,this,TQ_SLOT(updatePos())); updatePos(); } /* else if (ev->type() == TQEvent::Paint && o == this) { diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index c2f47c6cd..eed6ddcb7 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -46,13 +46,13 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text) m_fcombo = new TDEFontCombo(m_toolbar); m_toolbar->insertWidget(TBFont, 40, m_fcombo); - connect(m_fcombo, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeFont(const TQString &))); + connect(m_fcombo, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changeFont(const TQString &))); m_toolbar->insertSeparator(); m_colCombo = new KColorCombo(m_toolbar); m_toolbar->insertWidget(TBColor, 30, m_colCombo); - connect(m_colCombo, TQT_SIGNAL(activated(const TQColor&)), this, TQT_SLOT(changeColor(const TQColor&))); + connect(m_colCombo, TQ_SIGNAL(activated(const TQColor&)), this, TQ_SLOT(changeColor(const TQColor&))); m_toolbar->insertButton("format-text-bold", TBBold, true, i18n("Bold")); m_toolbar->insertButton("format-text-italic", TBItalic, true, i18n("Italic")); @@ -82,15 +82,15 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text) m_toolbar->setToggle(TBJustify, true); group->addButton(TBJustify); - connect(m_toolbar, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(buttonToggled(int))); + connect(m_toolbar, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(buttonToggled(int))); m_edit = new KTextEdit(text, TQString(), frame, "richtext_edit"); m_edit->setTextFormat(RichText); m_edit->setFocus(); - connect(m_edit, TQT_SIGNAL(cursorPositionChanged(int, int)), this, TQT_SLOT(cursorPositionChanged(int, int))); - connect(m_edit, TQT_SIGNAL(clicked(int, int)), this, TQT_SLOT(cursorPositionChanged(int, int))); - connect(m_edit, TQT_SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged(VerticalAlignment))); + connect(m_edit, TQ_SIGNAL(cursorPositionChanged(int, int)), this, TQ_SLOT(cursorPositionChanged(int, int))); + connect(m_edit, TQ_SIGNAL(clicked(int, int)), this, TQ_SLOT(cursorPositionChanged(int, int))); + connect(m_edit, TQ_SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), this, TQ_SLOT(slotVerticalAlignmentChanged(VerticalAlignment))); m_edit->moveCursor(TQTextEdit::MoveEnd, false); cursorPositionChanged(0, 0); diff --git a/kexi/formeditor/scripting/scriptmanager.cpp b/kexi/formeditor/scripting/scriptmanager.cpp index 73bf70e34..cf2929b75 100644 --- a/kexi/formeditor/scripting/scriptmanager.cpp +++ b/kexi/formeditor/scripting/scriptmanager.cpp @@ -56,8 +56,8 @@ void ScriptManager::setFormManager(FormManager *manager) { m_formManager = manager; - connect(m_formManager, TQT_SIGNAL(aboutToDeleteForm(KFormDesigner::Form*)), this, TQT_SLOT(slotFormDeleted(KFormDesigner::Form*))); - connect(m_formManager, TQT_SIGNAL(formCreated(KFormDesigner::Form*)), this, TQT_SLOT(newFormScript(KFormDesigner::Form*))); + connect(m_formManager, TQ_SIGNAL(aboutToDeleteForm(KFormDesigner::Form*)), this, TQ_SLOT(slotFormDeleted(KFormDesigner::Form*))); + connect(m_formManager, TQ_SIGNAL(formCreated(KFormDesigner::Form*)), this, TQ_SLOT(newFormScript(KFormDesigner::Form*))); } void diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp index bbc340988..2c1a5132d 100644 --- a/kexi/formeditor/tabstopdialog.cpp +++ b/kexi/formeditor/tabstopdialog.cpp @@ -51,24 +51,24 @@ TabStopDialog::TabStopDialog(TQWidget *parent) l->addWidget(m_treeview, 0, 0); m_treeview->m_form = 0; - connect(m_treeview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); - connect(m_treeview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); + connect(m_treeview, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*))); + connect(m_treeview, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*))); TQVBoxLayout *vbox = new TQVBoxLayout(); l->addLayout(vbox, 0, 1); m_btnUp = new KPushButton(SmallIconSet("1uparrow"), i18n("Move Up"), frame); TQToolTip::add( m_btnUp, i18n("Move widget up") ); vbox->addWidget(m_btnUp); - connect(m_btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveItemUp())); + connect(m_btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveItemUp())); m_btnDown = new KPushButton(SmallIconSet("1downarrow"), i18n("Move Down"), frame); TQToolTip::add( m_btnDown, i18n("Move widget down") ); vbox->addWidget(m_btnDown); - connect(m_btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveItemDown())); + connect(m_btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveItemDown())); vbox->addStretch(); m_check = new TQCheckBox(i18n("Handle tab order automatically"), frame, "tabstops_check"); - connect(m_check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRadioClicked(bool))); + connect(m_check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotRadioClicked(bool))); l->addMultiCellWidget(m_check, 1, 1, 0, 1); updateGeometry(); diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index dfd56a225..c200dc333 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -172,21 +172,21 @@ KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *parent, const char *name, setModified(false); // action stuff - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), TQT_SLOT(setUndoEnabled(bool, const TQString&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), TQT_SLOT(setRedoEnabled(bool, const TQString&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected())); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), TQ_SLOT(setUndoEnabled(bool, const TQString&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), TQ_SLOT(setRedoEnabled(bool, const TQString&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQT_SLOT(slotFormModified(KFormDesigner::Form*, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQ_SLOT(slotFormModified(KFormDesigner::Form*, bool))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(createFormSlot(KFormDesigner::Form*, const TQString&, const TQString&)), - this, TQT_SLOT(slotCreateFormSlot(KFormDesigner::Form*, const TQString&, const TQString &))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(createFormSlot(KFormDesigner::Form*, const TQString&, const TQString&)), + this, TQ_SLOT(slotCreateFormSlot(KFormDesigner::Form*, const TQString&, const TQString &))); } container->show(); setWidget(container); - connect(m_workspace, TQT_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQT_SLOT(windowChanged(TQWidget*))); + connect(m_workspace, TQ_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQ_SLOT(windowChanged(TQWidget*))); slotNoFormSelected(); } @@ -198,45 +198,45 @@ KFormDesigner::WidgetLibrary* KFormDesignerKDevPart::formsLibrary() void KFormDesignerKDevPart::setupActions() { - KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - KStdAction::openNew(this, TQT_SLOT(createBlankForm()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); - KStdAction::cut(KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()), actionCollection()); - KStdAction::copy(KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()), actionCollection()); - KStdAction::paste(KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()), actionCollection()); - KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); - KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); - KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new TDEAction(i18n("Preview Form"), "document-print-preview", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); - new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); - new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); - new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); - - new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); - new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); - new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); - new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); - - new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); - new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); + KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(createBlankForm()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + KStdAction::cut(KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()), actionCollection()); + KStdAction::copy(KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()), actionCollection()); + KStdAction::paste(KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()), actionCollection()); + KStdAction::undo(KFormDesigner::FormManager::self(), TQ_SLOT(undo()), actionCollection()); + KStdAction::redo(KFormDesigner::FormManager::self(), TQ_SLOT(redo()), actionCollection()); + KStdAction::selectAll(KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()), actionCollection()); + new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "document-print-preview", "Ctrl+T", this, TQ_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), actionCollection(), "taborder"); + new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); + new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editConnections()), actionCollection(), "form_connections"); + + new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); + new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); + new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid"); + new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()), actionCollection(), "break_layout"); + + new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); + new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); - alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); - alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); - alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); - alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); - alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); + alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); + alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); + alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); + alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); + alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); - sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); - sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); - sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); - sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); - sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); - sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); + sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); + sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); + sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); + sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); + sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); + sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); if(m_inShell) setXMLFile("kformdesigner_part_shell.rc"); diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp index 455fd311d..e8adc2ac2 100644 --- a/kexi/formeditor/test/kfd_mainwindow.cpp +++ b/kexi/formeditor/test/kfd_mainwindow.cpp @@ -73,7 +73,7 @@ KFDMainWindow::loadUIFile(const KURL &url) void KFDMainWindow::setupActions() { - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); } bool diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 735b9a9ed..7c9dd7742 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -172,19 +172,19 @@ KFormDesignerPart::KFormDesignerPart(TQWidget *parent, const char *name, bool re setModified(false); // action stuff -// connect(m_manager, TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); -// connect(m_manager, TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); -// connect(m_manager, TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), TQT_SLOT(setUndoEnabled(bool, const TQString&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), TQT_SLOT(setRedoEnabled(bool, const TQString&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQT_SLOT(slotFormModified(KFormDesigner::Form*, bool))); +// connect(m_manager, TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); +// connect(m_manager, TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); +// connect(m_manager, TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected())); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), TQ_SLOT(setUndoEnabled(bool, const TQString&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), TQ_SLOT(setRedoEnabled(bool, const TQString&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQ_SLOT(slotFormModified(KFormDesigner::Form*, bool))); } container->show(); setWidget(container); - connect(m_workspace, TQT_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQT_SLOT(windowChanged(TQWidget*))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)), - this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&))); + connect(m_workspace, TQ_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQ_SLOT(windowChanged(TQWidget*))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)), + this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&))); // slotNoFormSelected(); KFormDesigner::FormManager::self()->emitNoFormSelected(); @@ -202,58 +202,58 @@ KFormDesigner::WidgetLibrary* KFormDesignerPart::formsLibrary() void KFormDesignerPart::setupActions() { - KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - KStdAction::openNew(this, TQT_SLOT(createBlankForm()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); - KStdAction::cut(KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()), actionCollection()); - KStdAction::copy(KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()), actionCollection()); - KStdAction::paste(KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()), actionCollection()); - KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); - KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); - KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new TDEAction(i18n("Preview Form"), "document-print-preview", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); - new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); - new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); - new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); + KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(createBlankForm()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + KStdAction::cut(KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()), actionCollection()); + KStdAction::copy(KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()), actionCollection()); + KStdAction::paste(KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()), actionCollection()); + KStdAction::undo(KFormDesigner::FormManager::self(), TQ_SLOT(undo()), actionCollection()); + KStdAction::redo(KFormDesigner::FormManager::self(), TQ_SLOT(redo()), actionCollection()); + KStdAction::selectAll(KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()), actionCollection()); + new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "document-print-preview", CTRL+Key_T, this, TQ_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), actionCollection(), "taborder"); + new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); + new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editConnections()), actionCollection(), "form_connections"); TDEActionMenu *layoutMenu = new TDEActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu"); - layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox")); - layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox")); - layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid")); - layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow")); - layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow")); - layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter")); - layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter")); - new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox")); + layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox")); + layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid")); + layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHFlow()), actionCollection(), "layout_hflow")); + layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVFlow()), actionCollection(), "layout_vflow")); + layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter")); + layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter")); + new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()), actionCollection(), "break_layout"); /* - new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); - new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); - new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); - new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"); - new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"); - new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); + new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); + new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid"); + new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"); + new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"); + new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()), actionCollection(), "break_layout"); */ - new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); - new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); + new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); + new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); - alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); - alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); - alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); - alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); - alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); + alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); + alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); + alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); + alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); + alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); - sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); - sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); - sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); - sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); - sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); - sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); + sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); + sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); + sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); + sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); + sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); + sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); if(m_inShell) setXMLFile("kformdesigner_part_shell.rc"); diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 6611be2f8..b4825825f 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -222,9 +222,9 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, textedit->selectAll(); setEditor(w, textedit); - connect(textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); - connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); - connect(textedit, TQT_SIGNAL(destroyed()), this, TQT_SLOT(editorDeleted())); + connect(textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); + connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); + connect(textedit, TQ_SIGNAL(destroyed()), this, TQ_SLOT(editorDeleted())); //#else } else { @@ -243,9 +243,9 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, editor->show(); editor->setFocus(); editor->selectAll(); - connect(editor, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeTextInternal(const TQString&))); - connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); - connect(editor, TQT_SIGNAL(destroyed()), this, TQT_SLOT(editorDeleted())); + connect(editor, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changeTextInternal(const TQString&))); + connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); + connect(editor, TQ_SIGNAL(destroyed()), this, TQ_SLOT(editorDeleted())); setEditor(w, editor); // m_editor = editor; @@ -308,7 +308,7 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container) w->setPalette(p); } - connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); + connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); } bool diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index f5da30e15..ca086432a 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -341,7 +341,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *p LibActionWidget *a = new LibActionWidget(it.current(), it.current()->factory()->m_guiClient ? it.current()->factory()->m_guiClient->actionCollection() : parent); - connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot); + connect(a, TQ_SIGNAL(prepareInsert(const TQCString &)), receiver, slot); actions.append(a); } return actions; diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 9da235d2d..ae5ac0336 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -94,10 +94,10 @@ WidgetPropertySet::WidgetPropertySet(TQObject *parent) d = new WidgetPropertySetPrivate(); // d->manager = manager; - connect(&d->set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); - connect(&d->set, TQT_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&))); + connect(&d->set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(&d->set, TQ_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&))); initPropertiesDescription(); } @@ -216,7 +216,7 @@ WidgetPropertySet::setSelectedWidget(TQWidget *w, bool add, bool forceReload, bo createPropertiesForWidget(w); w->installEventFilter(this); - connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotWidgetDestroyed())); + connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotWidgetDestroyed())); } if (!moreWillBeSelected) diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 0ce563a91..3528bd0af 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -89,7 +89,7 @@ bool DriverManagerInternal::lookupDrivers() return true; if (tqApp) { - connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits())); + connect(tqApp,TQ_SIGNAL(aboutToQuit()),this,TQ_SLOT(slotAppQuits())); } //TODO: for QT-only version check for TDEInstance wrapper // KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (TDEGlobal::instance()==0)!" << endl; diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index afc861439..af315dca2 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -71,8 +71,8 @@ tristate SQLiteVacuum::run() args << ksqlite_app << "-verbose-vacuum" << m_filePath << "vacuum"; m_process = new TQProcess(args, this, "process"); m_process->setWorkingDirectory( TQFileInfo(m_filePath).dir(true) ); - connect( m_process, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(readFromStdout()) ); - connect( m_process, TQT_SIGNAL(processExited()), this, TQT_SLOT(processExited()) ); + connect( m_process, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(readFromStdout()) ); + connect( m_process, TQ_SIGNAL(processExited()), this, TQ_SLOT(processExited()) ); if (!m_process->start()) { m_result = false; return m_result; @@ -83,7 +83,7 @@ tristate SQLiteVacuum::run() ); m_dlg->adjustSize(); m_dlg->resize(300, m_dlg->height()); - connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); + connect(m_dlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); m_dlg->setMinimumDuration(1000); m_dlg->setAutoClose(true); m_dlg->progressBar()->setTotalSteps(100); diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index b7e6a2ed6..e9f13589c 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -398,7 +398,7 @@ ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent, showCancelButton(true); progressBar()->setPercentageVisible(false); progressBar()->setTotalSteps(0); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); adjustSize(); resize(250, height()); } diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index c48f0d81b..d614d9eda 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -67,7 +67,7 @@ void KexiUtils::addKexiDBDebug(const TQString& text) hbox->addWidget(btn_clear); kexiDBDebugPage = new TDEListView(page, "kexiDbDebugPage"); - TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiDBDebugPage, TQT_SLOT(clear())); + TQObject::connect(btn_clear, TQ_SIGNAL(clicked()), kexiDBDebugPage, TQ_SLOT(clear())); vbox->addWidget(kexiDBDebugPage); kexiDBDebugPage->addColumn(""); kexiDBDebugPage->header()->hide(); @@ -107,7 +107,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) hbox->addWidget(btn_sim); kexiAlterTableActionDebugPage = new TDEListView(page, "kexiAlterTableActionDebugPage"); - TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiAlterTableActionDebugPage, TQT_SLOT(clear())); + TQObject::connect(btn_clear, TQ_SIGNAL(clicked()), kexiAlterTableActionDebugPage, TQ_SLOT(clear())); vbox->addWidget(kexiAlterTableActionDebugPage); kexiAlterTableActionDebugPage->addColumn(""); kexiAlterTableActionDebugPage->header()->hide(); @@ -165,7 +165,7 @@ void KexiUtils::connectPushButtonActionForDebugWindow(const char* actionName, if (debugWindow) { KPushButton* btn = findFirstChild<KPushButton>(debugWindow, "KPushButton", actionName); if (btn) - TQObject::connect(btn, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(btn, TQ_SIGNAL(clicked()), receiver, slot); } } diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index 9d794242c..fc126152a 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -45,7 +45,7 @@ using namespace KexiUtils; DelayedCursorHandler::DelayedCursorHandler() : startedOrActive(false) { - connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(show())); + connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(show())); } void DelayedCursorHandler::start(bool noDelay) { startedOrActive = true; diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 3365268a2..6f8d36e6a 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -53,7 +53,7 @@ class KexiFindDialog::Private { if (!action) return; - TQObject::connect(parent, member, action, TQT_SLOT(activate())); + TQObject::connect(parent, member, action, TQ_SLOT(activate())); if (action->shortcut().isNull()) return; TQAccel *accel = new TQAccel(parent); // we want to handle dialog-wide shortcut as well @@ -90,13 +90,13 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent ) delete a; m_btnClose->setText(KStdGuiItem::close().text()); m_btnClose->setIconSet(KStdGuiItem::close().iconSet()); - connect(m_btnFind, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findNext())); - connect(m_btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked())); - connect(m_btnReplace, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceNext())); - connect(m_btnReplaceAll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceAll())); + connect(m_btnFind, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findNext())); + connect(m_btnClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseClicked())); + connect(m_btnReplace, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(replaceNext())); + connect(m_btnReplaceAll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(replaceAll())); // clear message after the text is changed - connect(m_textToFind, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage())); - connect(m_textToReplace, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage())); + connect(m_textToFind, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(updateMessage())); + connect(m_textToReplace, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(updateMessage())); d->replaceMode = true; //to force updating by setReplaceMode() setReplaceMode(false); @@ -117,10 +117,10 @@ void KexiFindDialog::setActions( TDEAction *findnext, TDEAction *findprev, d->replaceAction = replace; d->replaceallAction = replaceall; d->accels.clear(); - d->setActionAndAccel(d->findnextAction, this, TQT_SIGNAL(findNext())); - d->setActionAndAccel(d->findprevAction, this, TQT_SIGNAL(findPrevious())); - d->setActionAndAccel(d->replaceAction, this, TQT_SIGNAL(replaceNext())); - d->setActionAndAccel(d->replaceallAction, this, TQT_SIGNAL(replaceAll())); + d->setActionAndAccel(d->findnextAction, this, TQ_SIGNAL(findNext())); + d->setActionAndAccel(d->findprevAction, this, TQ_SIGNAL(findPrevious())); + d->setActionAndAccel(d->replaceAction, this, TQ_SIGNAL(replaceNext())); + d->setActionAndAccel(d->replaceallAction, this, TQ_SIGNAL(replaceAll())); } TQStringList KexiFindDialog::lookInColumnNames() const diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 7a82eb1e9..c6f64d129 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -259,15 +259,15 @@ KexiMainWindowImpl::KexiMainWindowImpl() TDEGlobal::iconLoader()->addAppDir("koffice"); //get informed - connect(&Kexi::partManager(),TQT_SIGNAL(partLoaded(KexiPart::Part*)),this,TQT_SLOT(slotPartLoaded(KexiPart::Part*))); - connect( m_pMdi, TQT_SIGNAL(nowMaximized(bool)), this, TQT_SLOT(slotCaptionForCurrentMDIChild(bool)) ); - connect( m_pMdi, TQT_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, TQT_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*))); -// connect( this, TQT_SIGNAL(lastChildFrmClosed()), this, TQT_SLOT(slotLastChildFrmClosed())); - connect( this, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastChildViewClosed())); + connect(&Kexi::partManager(),TQ_SIGNAL(partLoaded(KexiPart::Part*)),this,TQ_SLOT(slotPartLoaded(KexiPart::Part*))); + connect( m_pMdi, TQ_SIGNAL(nowMaximized(bool)), this, TQ_SLOT(slotCaptionForCurrentMDIChild(bool)) ); + connect( m_pMdi, TQ_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, TQ_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*))); +// connect( this, TQ_SIGNAL(lastChildFrmClosed()), this, TQ_SLOT(slotLastChildFrmClosed())); + connect( this, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastChildViewClosed())); - connect( this, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*))); - connect( this, TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), - this, TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); + connect( this, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(slotChildViewIsDetachedNow(TQWidget*))); + connect( this, TQ_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), + this, TQ_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); //if (!userMode()) { @@ -349,7 +349,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() // if (!userMode()) { invalidateActions(); - d->timer.singleShot(0,this,TQT_SLOT(slotLastActions())); + d->timer.singleShot(0,this,TQ_SLOT(slotLastActions())); // } setTabWidgetVisibility(KMdi::AlwaysShowTabs); @@ -367,7 +367,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() // when initially the main window is empty TQToolTip::add(closeButton, i18n("Close the current tab page in Kexi tab interface", "Close the current tab")); - TQObject::connect( closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeActiveView() ) ); + TQObject::connect( closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeActiveView() ) ); } #ifdef KEXI_ADD_CUSTOM_KEXIMAINWINDOWIMPL @@ -406,7 +406,7 @@ void KexiMainWindowImpl::setWindowMenu(TQPopupMenu *menu) menuBar()->insertItem(txt, m_pWindowMenu, id, count-3); } m_pWindowMenu->setCheckable(true); - TQObject::connect( m_pWindowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()) ); + TQObject::connect( m_pWindowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillWindowMenu()) ); } void KexiMainWindowImpl::fillWindowMenu() @@ -521,77 +521,77 @@ void KexiMainWindowImpl::initActions() // setupGUI(TDEMainWindow::Keys|TDEMainWindow::StatusBar|TDEMainWindow::Save|TDEMainWindow::Create); // d->actionMapper = new TQSignalMapper(this, "act_map"); -// connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &))); +// connect(d->actionMapper, TQ_SIGNAL(mapped(const TQString &)), this, TQ_SLOT(slotAction(const TQString &))); // PROJECT MENU TDEAction *action = new TDEAction(i18n("&New..."), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), - this, TQT_SLOT(slotProjectNew()), actionCollection(), "project_new"); + this, TQ_SLOT(slotProjectNew()), actionCollection(), "project_new"); action->setToolTip(i18n("Create a new project")); action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected.")); - action = KStdAction::open( this, TQT_SLOT( slotProjectOpen() ), actionCollection(), "project_open" ); + action = KStdAction::open( this, TQ_SLOT( slotProjectOpen() ), actionCollection(), "project_open" ); action->setToolTip(i18n("Open an existing project")); action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected.")); #ifdef HAVE_TDENEWSTUFF action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0), - this, TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); + this, TQ_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); action->setToolTip(i18n("Download example databases from the Internet")); action->setWhatsThis(i18n("Downloads example databases from the Internet.")); #endif -// d->action_open_recent = KStdAction::openRecent( this, TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); +// d->action_open_recent = KStdAction::openRecent( this, TQ_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); //#ifdef KEXI_SHOW_UNIMPLEMENTED #ifndef KEXI_NO_UNFINISHED d->action_open_recent = new TDEActionMenu(i18n("Open Recent"), actionCollection(), "project_open_recent"); - connect(d->action_open_recent->popupMenu(),TQT_SIGNAL(activated(int)), - this,TQT_SLOT(slotProjectOpenRecent(int))); - connect(d->action_open_recent->popupMenu(), TQT_SIGNAL(aboutToShow()), - this,TQT_SLOT(slotProjectOpenRecentAboutToShow())); + connect(d->action_open_recent->popupMenu(),TQ_SIGNAL(activated(int)), + this,TQ_SLOT(slotProjectOpenRecent(int))); + connect(d->action_open_recent->popupMenu(), TQ_SIGNAL(aboutToShow()), + this,TQ_SLOT(slotProjectOpenRecentAboutToShow())); //moved down d->action_open_recent_projects_title_id = // d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Opened Databases")); //moved down d->action_open_recent_connections_title_id = // d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Connected Database Servers")); // d->action_open_recent->popupMenu()->insertSeparator(); // d->action_open_recent_more_id = d->action_open_recent->popupMenu() -// ->insertItem(i18n("&More Projects..."), this, TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000); +// ->insertItem(i18n("&More Projects..."), this, TQ_SLOT(slotProjectOpenRecentMore()), 0, 1000); #else d->action_open_recent = d->dummy_action; #endif d->action_save = KStdAction::save( - this, TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); + this, TQ_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); // d->action_save = new TDEAction(i18n("&Save"), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save), -// this, TQT_SLOT(slotProjectSave()), actionCollection(), "project_save"); +// this, TQ_SLOT(slotProjectSave()), actionCollection(), "project_save"); d->action_save->setToolTip(i18n("Save object changes")); d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window.")); #ifdef KEXI_SHOW_UNIMPLEMENTED d->action_save_as = new TDEAction(i18n("Save &As..."), "document-save-as", 0, - this, TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); + this, TQ_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); d->action_save_as->setToolTip(i18n("Save object as")); d->action_save_as->setWhatsThis( i18n("Saves object changes from currently selected window under a new name (within the same project).")); d->action_project_properties = new TDEAction(i18n("Project Properties"), "application-vnd.tde.info", 0, - this, TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); + this, TQ_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); #else d->action_save_as = d->dummy_action; d->action_project_properties = d->dummy_action; #endif d->action_close = new TDEAction(i18n("&Close Project"), "window-close", 0, - this, TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" ); + this, TQ_SLOT(slotProjectClose()), actionCollection(), "project_close" ); d->action_close->setToolTip(i18n("Close the current project")); d->action_close->setWhatsThis(i18n("Closes the current project.")); - KStdAction::quit( this, TQT_SLOT(slotProjectQuit()), actionCollection(), "quit"); + KStdAction::quit( this, TQ_SLOT(slotProjectQuit()), actionCollection(), "quit"); #ifdef KEXI_SHOW_UNIMPLEMENTED d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, - this, TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); + this, TQ_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); d->action_project_relations->setToolTip(i18n("Project relationships")); d->action_project_relations->setWhatsThis(i18n("Shows project relationships.")); @@ -600,13 +600,13 @@ void KexiMainWindowImpl::initActions() #endif d->action_tools_data_migration = new TDEAction( i18n("&Import Database..."), "database_import", 0, - this, TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); + this, TQ_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); d->action_tools_data_migration->setToolTip(i18n("Import entire database as a Kexi project")); d->action_tools_data_migration->setWhatsThis(i18n("Imports entire database as a Kexi project.")); d->action_tools_compact_database = new TDEAction( i18n("&Compact Database..."), "", 0, - this, TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); + this, TQ_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); d->action_tools_compact_database->setToolTip(i18n("Compact the current database project")); d->action_tools_compact_database->setWhatsThis( i18n("Compacts the current database project, so it will take less space and work faster.")); @@ -617,7 +617,7 @@ void KexiMainWindowImpl::initActions() d->action_project_import_data_table = new TDEAction( i18n("Import->Table Data From File...", "Table Data From &File..."), "table"/*! @todo: change to "file_import" or so*/, - 0, this, TQT_SLOT(slotProjectImportDataTable()), actionCollection(), + 0, this, TQ_SLOT(slotProjectImportDataTable()), actionCollection(), "project_import_data_table"); d->action_project_import_data_table->setToolTip(i18n("Import table data from a file")); d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file.")); @@ -626,7 +626,7 @@ void KexiMainWindowImpl::initActions() d->action_project_export_data_table = new TDEAction(i18n("Export->Table or Query Data to File...", "Table or Query Data to &File..."), "table"/*! @todo: change to "file_export" or so*/, - 0, this, TQT_SLOT(slotProjectExportDataTable()), actionCollection(), + 0, this, TQ_SLOT(slotProjectExportDataTable()), actionCollection(), "project_export_data_table"); d->action_project_export_data_table->setToolTip( i18n("Export data from the active table or query data to a file")); @@ -634,17 +634,17 @@ void KexiMainWindowImpl::initActions() i18n("Exports data from the active table or query data to a file.")); //TODO new TDEAction(i18n("From File..."), "document-open", 0, -//TODO this, TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); +//TODO this, TQ_SLOT(slotImportFile()), actionCollection(), "project_import_file"); //TODO new TDEAction(i18n("From Server..."), "server", 0, -//TODO this, TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); +//TODO this, TQ_SLOT(slotImportServer()), actionCollection(), "project_import_server"); - d->action_project_print = KStdAction::print(this, TQT_SLOT(slotProjectPrint()), + d->action_project_print = KStdAction::print(this, TQ_SLOT(slotProjectPrint()), actionCollection(), "project_print" ); d->action_project_print->setToolTip(i18n("Print data from the active table or query")); d->action_project_print->setWhatsThis(i18n("Prints data from the active table or query.")); d->action_project_print_preview = KStdAction::printPreview( - this, TQT_SLOT(slotProjectPrintPreview()), + this, TQ_SLOT(slotProjectPrintPreview()), actionCollection(), "project_print_preview" ); d->action_project_print_preview->setToolTip( i18n("Show print preview for the active table or query")); @@ -652,7 +652,7 @@ void KexiMainWindowImpl::initActions() i18n("Shows print preview for the active table or query.")); d->action_project_print_setup = new TDEAction(i18n("Page Set&up..."), - "", 0, this, TQT_SLOT(slotProjectPageSetup()), actionCollection(), + "", 0, this, TQ_SLOT(slotProjectPageSetup()), actionCollection(), "project_print_setup"); d->action_project_print_setup->setToolTip( i18n("Show page setup for printing the active table or query")); @@ -669,7 +669,7 @@ void KexiMainWindowImpl::initActions() else { d->action_edit_paste_special_data_table = new TDEAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."), - "table", 0, this, TQT_SLOT(slotEditPasteSpecialDataTable()), + "table", 0, this, TQ_SLOT(slotEditPasteSpecialDataTable()), actionCollection(), "edit_paste_special_data_table"); d->action_edit_paste_special_data_table->setToolTip( i18n("Paste clipboard data as a table")); @@ -680,7 +680,7 @@ void KexiMainWindowImpl::initActions() d->action_edit_copy_special_data_table = new TDEAction(i18n("Copy Special->Table or Query Data...", "Table or Query as Data Table..."), - "table", 0, this, TQT_SLOT(slotEditCopySpecialDataTable()), + "table", 0, this, TQ_SLOT(slotEditCopySpecialDataTable()), actionCollection(), "edit_copy_special_data_table"); d->action_edit_copy_special_data_table->setToolTip( i18n("Copy selected table or query data to clipboard")); @@ -700,18 +700,18 @@ void KexiMainWindowImpl::initActions() #endif d->action_edit_find = KStdAction::find( - this, TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" ); + this, TQ_SLOT(slotEditFind()), actionCollection(), "edit_find" ); // d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = KStdAction::findNext( - this, TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); + this, TQ_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); d->action_edit_findprev = KStdAction::findPrev( - this, TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); + this, TQ_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); d->action_edit_replace = 0; //! @todo d->action_edit_replace = KStdAction::replace( -//! this, TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); +//! this, TQ_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; //! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, -//! this, TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); +//! this, TQ_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); d->action_edit_select_all = createSharedAction( KStdAction::SelectAll, "edit_select_all"); @@ -745,7 +745,7 @@ void KexiMainWindowImpl::initActions() //VIEW MENU if (!userMode()) { d->action_view_data_mode = new TDERadioAction(i18n("&Data View"), "state_data", TQt::Key_F6, - this, TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); + this, TQ_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode ); d->action_view_data_mode->setExclusiveGroup("view_mode"); d->action_view_data_mode->setToolTip(i18n("Switch to data view")); @@ -756,7 +756,7 @@ void KexiMainWindowImpl::initActions() if (!userMode()) { d->action_view_design_mode = new TDERadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7, - this, TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); + this, TQ_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode ); d->action_view_design_mode->setExclusiveGroup("view_mode"); d->action_view_design_mode->setToolTip(i18n("Switch to design view")); @@ -767,7 +767,7 @@ void KexiMainWindowImpl::initActions() if (!userMode()) { d->action_view_text_mode = new TDERadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8, - this, TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); + this, TQ_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode ); d->action_view_text_mode->setExclusiveGroup("view_mode"); d->action_view_text_mode->setToolTip(i18n("Switch to text view")); @@ -778,7 +778,7 @@ void KexiMainWindowImpl::initActions() if (d->isProjectNavigatorVisible) { d->action_view_nav = new TDEAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1, - this, TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); + this, TQ_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); d->action_view_nav->setToolTip(i18n("Go to project navigator panel")); d->action_view_nav->setWhatsThis(i18n("Goes to project navigator panel.")); } @@ -786,13 +786,13 @@ void KexiMainWindowImpl::initActions() d->action_view_nav = 0; d->action_view_mainarea = new TDEAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2, - this, TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); + this, TQ_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); d->action_view_mainarea->setToolTip(i18n("Go to main area")); d->action_view_mainarea->setWhatsThis(i18n("Goes to main area.")); if (!userMode()) { d->action_view_propeditor = new TDEAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3, - this, TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); + this, TQ_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); d->action_view_propeditor->setToolTip(i18n("Go to property editor panel")); d->action_view_propeditor->setWhatsThis(i18n("Goes to property editor panel.")); } @@ -863,7 +863,7 @@ void KexiMainWindowImpl::initActions() #else TQt::ALT+TQt::Key_Right, #endif - this, TQT_SLOT(activateNextWin()), actionCollection(), "window_next"); + this, TQ_SLOT(activateNextWin()), actionCollection(), "window_next"); d->action_window_next->setToolTip( i18n("Next window") ); d->action_window_next->setWhatsThis(i18n("Switches to the next window.")); @@ -873,17 +873,17 @@ void KexiMainWindowImpl::initActions() #else TQt::ALT+TQt::Key_Left, #endif - this, TQT_SLOT(activatePrevWin()), actionCollection(), "window_previous"); + this, TQ_SLOT(activatePrevWin()), actionCollection(), "window_previous"); d->action_window_previous->setToolTip( i18n("Previous window") ); d->action_window_previous->setWhatsThis(i18n("Switches to the previous window.")); //SETTINGS MENU setStandardToolBarMenuEnabled( true ); - action = KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + action = KStdAction::keyBindings(this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure shortcut keys.")); #ifdef KEXI_SHOW_UNIMPLEMENTED - action = KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + action = KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure toolbars.")); d->action_show_other = new TDEActionMenu(i18n("Other"), @@ -923,31 +923,31 @@ void KexiMainWindowImpl::initActions() #endif #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_configure = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection()); + d->action_configure = KStdAction::preferences(this, TQ_SLOT(slotShowSettings()), actionCollection()); action->setWhatsThis(i18n("Lets you configure Kexi.")); #endif //HELP MENU #if 0//js: todo reenable later - KStdAction::tipOfDay( this, TQT_SLOT( slotTipOfTheDayAction() ), actionCollection() ) + KStdAction::tipOfDay( this, TQ_SLOT( slotTipOfTheDayAction() ), actionCollection() ) ->setWhatsThis(i18n("This shows useful tips on the use of this application.")); #endif #if 0 //we don't have a time for updating info text for each new version new TDEAction(i18n("Important Information"), "messagebox_info", 0, - this, TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); + this, TQ_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); #endif //TODO: UNCOMMENT TO REMOVE MDI MODES SETTING m_pMdiModeMenu->hide(); #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS new TDEAction(i18n("Give Feedback..."), "messagebox_info", 0, - this, TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); + this, TQ_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); #endif #endif // TDEAction *actionSettings = new TDEAction(i18n("Configure Kexi..."), "configure", 0, // actionCollection(), "kexi_settings"); // actionSettings->setWhatsThis(i18n("Lets you configure Kexi.")); -// connect(actionSettings, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowSettings())); +// connect(actionSettings, TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowSettings())); // -- add a few missing tooltips (usable especially in Form's "Assign action" dialog) if ((action = actionCollection()->action("window_close"))) @@ -1138,7 +1138,7 @@ void KexiMainWindowImpl::invalidateSharedActions() // unused, I think void KexiMainWindowImpl::invalidateSharedActionsLater() { - TQTimer::singleShot(1, this, TQT_SLOT(invalidateSharedActions())); + TQTimer::singleShot(1, this, TQ_SLOT(invalidateSharedActions())); } void KexiMainWindowImpl::invalidateProjectWideActions() @@ -1345,7 +1345,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) // d->disableErrorMessages = true; enableMessages( false ); - TQTimer::singleShot(1, this, TQT_SLOT(slotAutoOpenObjectsLater())); + TQTimer::singleShot(1, this, TQ_SLOT(slotAutoOpenObjectsLater())); return true; } @@ -1725,29 +1725,29 @@ void KexiMainWindowImpl::initNavigator() d->navToolWindow = addToolWindow(d->nav, KDockWidget::DockLeft, getMainDockWidget(), 20/*, lv, 35, "2"*/); // d->navToolWindow->hide(); - connect(d->nav,TQT_SIGNAL(openItem(KexiPart::Item*,int)),this,TQT_SLOT(openObject(KexiPart::Item*,int))); - connect(d->nav,TQT_SIGNAL(openOrActivateItem(KexiPart::Item*,int)), - this,TQT_SLOT(openObjectFromNavigator(KexiPart::Item*,int))); - connect(d->nav,TQT_SIGNAL(newItem( KexiPart::Info* )), - this,TQT_SLOT(newObject(KexiPart::Info*))); - connect(d->nav,TQT_SIGNAL(removeItem(KexiPart::Item*)), - this,TQT_SLOT(removeObject(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(renameItem(KexiPart::Item*,const TQString&, bool&)), - this,TQT_SLOT(renameObject(KexiPart::Item*,const TQString&, bool&))); - connect(d->nav,TQT_SIGNAL(executeItem(KexiPart::Item*)), - this,TQT_SLOT(executeItem(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(exportItemAsDataTable(KexiPart::Item*)), - this,TQT_SLOT(exportItemAsDataTable(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(printItem( KexiPart::Item* )), - this,TQT_SLOT(printItem(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(pageSetupForItem( KexiPart::Item*)), - this,TQT_SLOT(showPageSetupForItem(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(openItem(KexiPart::Item*,int)),this,TQ_SLOT(openObject(KexiPart::Item*,int))); + connect(d->nav,TQ_SIGNAL(openOrActivateItem(KexiPart::Item*,int)), + this,TQ_SLOT(openObjectFromNavigator(KexiPart::Item*,int))); + connect(d->nav,TQ_SIGNAL(newItem( KexiPart::Info* )), + this,TQ_SLOT(newObject(KexiPart::Info*))); + connect(d->nav,TQ_SIGNAL(removeItem(KexiPart::Item*)), + this,TQ_SLOT(removeObject(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(renameItem(KexiPart::Item*,const TQString&, bool&)), + this,TQ_SLOT(renameObject(KexiPart::Item*,const TQString&, bool&))); + connect(d->nav,TQ_SIGNAL(executeItem(KexiPart::Item*)), + this,TQ_SLOT(executeItem(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(exportItemAsDataTable(KexiPart::Item*)), + this,TQ_SLOT(exportItemAsDataTable(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(printItem( KexiPart::Item* )), + this,TQ_SLOT(printItem(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(pageSetupForItem( KexiPart::Item*)), + this,TQ_SLOT(showPageSetupForItem(KexiPart::Item*))); if (d->prj) {//connect to the project - connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), - d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), + d->nav, TQ_SLOT(slotRemoveItem(const KexiPart::Item&))); } - connect(d->nav,TQT_SIGNAL(selectionChanged(KexiPart::Item*)), - this,TQT_SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(selectionChanged(KexiPart::Item*)), + this,TQ_SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*))); // d->restoreNavigatorWidth(); } @@ -1759,7 +1759,7 @@ void KexiMainWindowImpl::initNavigator() "dontShowWarningsRelatedToPluginsLoading"); } } - connect(d->prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), d->nav, TQT_SLOT(addItem(KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)), d->nav, TQ_SLOT(addItem(KexiPart::Item&))); d->nav->setFocus(); if (d->forceShowProjectNavigatorOnCreation) { @@ -1858,8 +1858,8 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p) { if (!p) return; - connect(p, TQT_SIGNAL(newObjectRequest(KexiPart::Info*)), - this, TQT_SLOT(newObject(KexiPart::Info*))); + connect(p, TQ_SIGNAL(newObjectRequest(KexiPart::Info*)), + this, TQ_SLOT(newObject(KexiPart::Info*))); p->createGUIClients(this); } @@ -2224,12 +2224,12 @@ void KexiMainWindowImpl::registerChild(KexiDialogBase *dlg) { kdDebug() << "KexiMainWindowImpl::registerChild()" << endl; - connect(dlg, TQT_SIGNAL(activated(KMdiChildView *)), - this, TQT_SLOT(activeWindowChanged(KMdiChildView *))); - connect(dlg, TQT_SIGNAL(dirtyChanged(KexiDialogBase*)), - this, TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*))); + connect(dlg, TQ_SIGNAL(activated(KMdiChildView *)), + this, TQ_SLOT(activeWindowChanged(KMdiChildView *))); + connect(dlg, TQ_SIGNAL(dirtyChanged(KexiDialogBase*)), + this, TQ_SLOT(slotDirtyFlagChanged(KexiDialogBase*))); -// connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQT_SLOT(childClosed(KMdiChildView *))); +// connect(dlg, TQ_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQ_SLOT(childClosed(KMdiChildView *))); if(dlg->id() != -1) { d->insertDialog(dlg); } @@ -2523,7 +2523,7 @@ void KexiMainWindowImpl::slotConfigureToolbars() { KEditToolbar edit(factory()); -// connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); +// connect(&edit,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); (void) edit.exec(); } @@ -2579,12 +2579,12 @@ KexiMainWindowImpl::createKexiProject(KexiProjectData* new_data) { d->prj = new KexiProject( new_data, this ); // d->prj = ::createKexiProject(new_data); -//provided by KexiMessageHandler connect(d->prj, TQT_SIGNAL(error(const TQString&,KexiDB::Object*)), this, TQT_SLOT(showErrorMessage(const TQString&,KexiDB::Object*))); -//provided by KexiMessageHandler connect(d->prj, TQT_SIGNAL(error(const TQString&,const TQString&)), this, TQT_SLOT(showErrorMessage(const TQString&,const TQString&))); - connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), this, TQT_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&))); +//provided by KexiMessageHandler connect(d->prj, TQ_SIGNAL(error(const TQString&,KexiDB::Object*)), this, TQ_SLOT(showErrorMessage(const TQString&,KexiDB::Object*))); +//provided by KexiMessageHandler connect(d->prj, TQ_SIGNAL(error(const TQString&,const TQString&)), this, TQ_SLOT(showErrorMessage(const TQString&,const TQString&))); + connect(d->prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), this, TQ_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&))); if (d->nav) - connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQ_SLOT(slotRemoveItem(const KexiPart::Item&))); } KexiProjectData* @@ -4394,7 +4394,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio return false; if (action == PreviewItem || action == PrintItem) { TQTimer::singleShot(0,printingDialog->selectedView(), - (action == PreviewItem) ? TQT_SLOT(printPreview()) : TQT_SLOT(print())); + (action == PreviewItem) ? TQ_SLOT(printPreview()) : TQ_SLOT(print())); } return true; } diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index d1eac9f5d..3843f1daa 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -336,10 +336,10 @@ void updatePropEditorDockWidthInfo() { m_findDialog = new KexiFindDialog(wnd); m_findDialog->setActions( action_edit_findnext, action_edit_findprev, action_edit_replace, action_edit_replace_all ); -/* connect(m_findDialog, TQT_SIGNAL(findNext()), action_edit_findnext, TQT_SLOT(activate())); - connect(m_findDialog, TQT_SIGNAL(find()), wnd, TQT_SLOT(slotEditFindNext())); - connect(m_findDialog, TQT_SIGNAL(replace()), wnd, TQT_SLOT(slotEditReplaceNext())); - connect(m_findDialog, TQT_SIGNAL(replaceAll()), wnd, TQT_SLOT(slotEditReplaceAll()));*/ +/* connect(m_findDialog, TQ_SIGNAL(findNext()), action_edit_findnext, TQ_SLOT(activate())); + connect(m_findDialog, TQ_SIGNAL(find()), wnd, TQ_SLOT(slotEditFindNext())); + connect(m_findDialog, TQ_SIGNAL(replace()), wnd, TQ_SLOT(slotEditReplaceNext())); + connect(m_findDialog, TQ_SIGNAL(replaceAll()), wnd, TQ_SLOT(slotEditReplaceAll()));*/ } return m_findDialog; } diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp index f3e1acec2..86ad6da7f 100644 --- a/kexi/main/kexinamedialog.cpp +++ b/kexi/main/kexinamedialog.cpp @@ -64,11 +64,11 @@ void KexiNameDialog::init() lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1); // m_widget->captionLineEdit()->selectAll(); // m_widget->captionLineEdit()->setFocus(); - connect(m_widget,TQT_SIGNAL(messageChanged()),this, TQT_SLOT(updateSize())); + connect(m_widget,TQ_SIGNAL(messageChanged()),this, TQ_SLOT(updateSize())); updateSize(); enableButtonOK( true ); slotTextChanged(); - connect(m_widget, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(m_widget, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); } void KexiNameDialog::updateSize() diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index bf38c28a3..fe1babeb7 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -94,14 +94,14 @@ void KexiNameWidget::init( m_nameWarning = i18n("Please enter the name."); m_captionWarning = i18n("Please enter the caption."); - connect(le_caption, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotCaptionTxtChanged(const TQString&))); - connect(le_name, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotNameTxtChanged(const TQString&))); - connect(le_caption, TQT_SIGNAL(returnPressed()), - this,TQT_SIGNAL(returnPressed())); - connect(le_name, TQT_SIGNAL(returnPressed()), - this,TQT_SIGNAL(returnPressed())); + connect(le_caption, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotCaptionTxtChanged(const TQString&))); + connect(le_name, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotNameTxtChanged(const TQString&))); + connect(le_caption, TQ_SIGNAL(returnPressed()), + this,TQ_SIGNAL(returnPressed())); + connect(le_name, TQ_SIGNAL(returnPressed()), + this,TQ_SIGNAL(returnPressed())); } KexiNameWidget::~KexiNameWidget() diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 2dbf58fe0..0316da78b 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -54,8 +54,8 @@ KexitStatusBar::KexitStatusBar(TQWidget *parent, const char *name) setReadOnlyFlag(false); // @todo -// connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), -// this, TQT_SLOT(activePartChanged(KParts::Part*))); +// connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), +// this, TQ_SLOT(activePartChanged(KParts::Part*))); /// @todo remove parts from the map on PartRemoved() ? } @@ -77,8 +77,8 @@ void KexitStatusBar::activePartChanged(KParts::Part *part) // @todo if (part && part->widget()) { if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { - connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( setStatus( const TQString & ) ) ); + connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQ_SLOT( setStatus( const TQString & ) ) ); # if TDE_VERSION < TDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); @@ -86,7 +86,7 @@ void KexitStatusBar::activePartChanged(KParts::Part *part) # endif } else if ((m_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) { - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); cursorPositionChanged(); } else { diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index ecf21be9a..83db3bbdb 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -55,8 +55,8 @@ KexiSimplePrintingCommand::KexiSimplePrintingCommand( , m_previewWindow(0) , m_printPreviewNeedsReloading(false) { - connect(this, TQT_SIGNAL(showPageSetupRequested(KexiPart::Item*)), - m_mainWin, TQT_SLOT(showPageSetupForItem(KexiPart::Item*))); + connect(this, TQ_SIGNAL(showPageSetupRequested(KexiPart::Item*)), + m_mainWin, TQ_SLOT(showPageSetupForItem(KexiPart::Item*))); } KexiSimplePrintingCommand::~KexiSimplePrintingCommand() @@ -261,8 +261,8 @@ bool KexiSimplePrintingCommand::showPrintPreview(const KexiSimplePrintingSetting *m_previewEngine, tableOrQuery.captionOrName(), 0, TQt::WStyle_Customize|TQt::WStyle_NormalBorder|TQt::WStyle_Title| TQt::WStyle_SysMenu|TQt::WStyle_MinMax|TQt::WStyle_ContextHelp); - connect(m_previewWindow, TQT_SIGNAL(printRequested()), this, TQT_SLOT(print())); - connect(m_previewWindow, TQT_SIGNAL(pageSetupRequested()), this, TQT_SLOT(slotShowPageSetupRequested())); + connect(m_previewWindow, TQ_SIGNAL(printRequested()), this, TQ_SLOT(print())); + connect(m_previewWindow, TQ_SIGNAL(pageSetupRequested()), this, TQ_SLOT(slotShowPageSetupRequested())); m_previewWindow->show(); KDialog::centerOnScreen(m_previewWindow); m_printPreviewNeedsReloading = false; @@ -337,17 +337,17 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(TDEIcon::Small) ); m_contents->printButton->setText( KStdGuiItem::print().text() ); - connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print())); + connect(m_contents->printButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(print())); m_contents->printPreviewButton->setIconSet( SmallIconSet("document-print-preview") ); m_contents->printPreviewButton->setText( i18n("Print Previe&w...") ); - connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview())); + connect(m_contents->printPreviewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(printPreview())); m_contents->iconLabel->setFixedWidth(32+6); m_contents->iconLabel->setPixmap( DesktopIcon("text-x-generic", 32) ); TQWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text.")); - connect(m_contents->headerTitleFontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeTitleFont())); + connect(m_contents->headerTitleFontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeTitleFont())); if (m_item) { m_origCaptionLabelText = m_contents->captionLabel->text(); @@ -358,18 +358,18 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi } m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) ); } - connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTitleTextChanged(const TQString&))); + connect(m_contents->headerTitleLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTitleTextChanged(const TQString&))); m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont ); TQWhatsThis::add(m_contents->openDataLink, i18n("Shows data for table or query associated with this page setup.")); TQToolTip::add(m_contents->openDataLink, i18n("Shows data for table or query associated with this page setup.")); - connect(m_contents->openDataLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotOpenData())); + connect(m_contents->openDataLink, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(slotOpenData())); TQWhatsThis::add(m_contents->saveSetupLink, i18n("Saves settings for this setup as default.")); - connect(m_contents->saveSetupLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotSaveSetup())); + connect(m_contents->saveSetupLink, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(slotSaveSetup())); #if !KDE_IS_VERSION(3,5,1) && !defined(TQ_WS_WIN) //a fix for problems with focusable KUrlLabel on KDElibs<=3.5.0 m_contents->openDataLink->setFocusPolicy(NoFocus); @@ -388,15 +388,15 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi updatePageLayoutAndUnitInfo(); TQWhatsThis::add(m_contents->changePageSizeAndMarginsButton, i18n("Changes page size and margins.")); - connect(m_contents->changePageSizeAndMarginsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangePageSizeAndMargins())); + connect(m_contents->changePageSizeAndMarginsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangePageSizeAndMargins())); - connect(m_contents->addPageNumbersCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAddPageNumbersCheckboxToggled(bool))); - connect(m_contents->addDateTimeCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAddDateTimeCheckboxToggled(bool))); - connect(m_contents->addTableBordersCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAddTableBordersCheckboxToggled(bool))); + connect(m_contents->addPageNumbersCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAddPageNumbersCheckboxToggled(bool))); + connect(m_contents->addDateTimeCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAddDateTimeCheckboxToggled(bool))); + connect(m_contents->addTableBordersCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAddTableBordersCheckboxToggled(bool))); if (!ok) { // no data! @@ -414,16 +414,16 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_printPreviewNeedsReloading = false; /* if (printPreview) - TQTimer::singleShot(50, this, TQT_SLOT(printPreview())); + TQTimer::singleShot(50, this, TQ_SLOT(printPreview())); else if (print) - TQTimer::singleShot(50, this, TQT_SLOT(print()));*/ - connect(this, TQT_SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&, + TQTimer::singleShot(50, this, TQ_SLOT(print()));*/ + connect(this, TQ_SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&, const TQString&)), - m_mainWin, TQT_SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&, + m_mainWin, TQ_SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&, const TQString&))); - connect(this, TQT_SIGNAL(printPreviewForItemRequested(KexiPart::Item*, + connect(this, TQ_SIGNAL(printPreviewForItemRequested(KexiPart::Item*, const KexiSimplePrintingSettings&,const TQString&,bool)), - m_mainWin, TQT_SLOT(printPreviewForItem(KexiPart::Item*, + m_mainWin, TQ_SLOT(printPreviewForItem(KexiPart::Item*, const KexiSimplePrintingSettings&,const TQString&,bool))); } diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 11cf11147..eb4152623 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -169,28 +169,28 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( lyr->addWidget(m_toolbar); id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) ); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrintClicked())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrintClicked())); static_cast<KPushButton*>(m_toolbar->getWidget(id))->setAccel(TQt::CTRL|TQt::Key_P); m_toolbar->insertSeparator(); id = m_toolbar->insertWidget(-1, 0, new KPushButton(i18n("Page Set&up..."), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPageSetup())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPageSetup())); m_toolbar->insertSeparator(); #ifndef KEXI_NO_UNFINISHED //! @todo unfinished id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-in"), i18n("Zoom In"), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomInClicked())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomInClicked())); m_toolbar->insertSeparator(); id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-out"), i18n("Zoom Out"), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOutClicked())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomOutClicked())); m_toolbar->insertSeparator(); #endif id = m_toolbar->insertWidget(-1, 0, new KPushButton(KStdGuiItem::close(), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); m_toolbar->alignItemRight(id); m_scrollView = new KexiSimplePrintPreviewScrollView(this); @@ -214,29 +214,29 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( m_navToolbar->setIconText(TDEToolBar::IconTextRight); m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-first"), i18n("First Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFirstClicked())); + m_navToolbar->addConnection(m_idFirst, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFirstClicked())); m_navToolbar->insertSeparator(); m_idPrevious = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-previous"), i18n("Previous Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idPrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPreviousClicked())); + m_navToolbar->addConnection(m_idPrevious, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPreviousClicked())); m_navToolbar->insertSeparator(); m_idPageNumberLabel = m_navToolbar->insertWidget( -1, 0, new TQLabel(m_navToolbar)); m_navToolbar->insertSeparator(); m_idNext = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-next"), i18n("Next Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idNext, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked())); + m_navToolbar->addConnection(m_idNext, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNextClicked())); m_navToolbar->insertSeparator(); m_idLast = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-last"), i18n("Last Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idLast, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLastClicked())); + m_navToolbar->addConnection(m_idLast, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLastClicked())); m_navToolbar->insertSeparator(); resize(width(), kapp->desktop()->height()*4/5); //! @todo progress bar... - TQTimer::singleShot(50, this, TQT_SLOT(initLater())); + TQTimer::singleShot(50, this, TQ_SLOT(initLater())); } void KexiSimplePrintPreviewWindow::initLater() diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 25305e1a6..360b7031d 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -119,7 +119,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, // TQLabel* lbl = new TQLabel(i18n("<b>Select existing Kexi project to open:</b>"), openExistingWidget); // openExistingWidgetLyr->addWidget( lbl ); d->prjTypeSelector = new KexiPrjTypeSelector( d->openExistingWidget ); - connect(d->prjTypeSelector->buttonGroup,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotPrjTypeSelected(int))); + connect(d->prjTypeSelector->buttonGroup,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotPrjTypeSelected(int))); openExistingWidgetLyr->addWidget( d->prjTypeSelector ); openExistingWidgetLyr->addSpacing( KDialogBase::spacingHint() ); TQFrame* line = new TQFrame( d->openExistingWidget, "line" ); @@ -136,28 +136,28 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, m_fileDlg = 0; // addWidget(m_file); -// connect(m_file->btn_advanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(showAdvancedConn())); +// connect(m_file->btn_advanced,TQ_SIGNAL(clicked()),this,TQ_SLOT(showAdvancedConn())); m_remote = new KexiConnSelectorBase(d->stack, "conn_sel"); m_remote->icon->setPixmap( DesktopIcon("network") ); m_remote->icon->setFixedSize( m_remote->icon->pixmap()->size() ); // m_remote->btn_back->setIconSet( SmallIconSet("1uparrow") ); - connect(m_remote->btn_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteAddBtnClicked())); - connect(m_remote->btn_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteEditBtnClicked())); - connect(m_remote->btn_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteRemoveBtnClicked())); + connect(m_remote->btn_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteAddBtnClicked())); + connect(m_remote->btn_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteEditBtnClicked())); + connect(m_remote->btn_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteRemoveBtnClicked())); TQToolTip::add(m_remote->btn_add, i18n("Add a new database connection")); TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); d->stack->addWidget(m_remote); if (m_remote->layout()) m_remote->layout()->setMargin(0); -// connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn())); - connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); - connect(m_remote->list,TQT_SIGNAL(returnPressed(TQListViewItem*)), - this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); - connect(m_remote->list,TQT_SIGNAL(selectionChanged()), - this,TQT_SLOT(slotConnectionSelectionChanged())); +// connect(m_remote->btn_back,TQ_SIGNAL(clicked()),this,TQ_SLOT(showSimpleConn())); + connect(m_remote->list,TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQ_SIGNAL(returnPressed(TQListViewItem*)), + this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQ_SIGNAL(selectionChanged()), + this,TQ_SLOT(slotConnectionSelectionChanged())); } KexiConnSelectorWidget::~KexiConnSelectorWidget() @@ -167,7 +167,7 @@ KexiConnSelectorWidget::~KexiConnSelectorWidget() /*void KexiConnSelectorWidget::disconnectShowSimpleConnButton() { - m_remote->btn_back->disconnect(this,TQT_SLOT(showSimpleConn())); + m_remote->btn_back->disconnect(this,TQ_SLOT(showSimpleConn())); }*/ void KexiConnSelectorWidget::showAdvancedConn() @@ -228,9 +228,9 @@ void KexiConnSelectorWidget::showSimpleConn() for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { if (w->isDialog()) { //#ifndef TQ_WS_WIN - connect(m_fileDlg,TQT_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); + connect(m_fileDlg,TQ_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQ_SLOT(reject())); //#endif -// connect(m_fileDlg,TQT_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); +// connect(m_fileDlg,TQ_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQ_SLOT(reject())); break; } } diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 2b1f40264..e97532b33 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -123,9 +123,9 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, // d->chk_server_txt = i18n("Always &use database server for creating new projects.") // +"\n"+txt_dns; - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(executed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(selectionChanged( TQListViewItem*)),this,TQ_SLOT(slotLvTypesSelected(TQListViewItem*))); // static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); // static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1); @@ -167,26 +167,26 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_conn_sel->m_fileDlg->setMode( KexiStartupFileDialog::SavingFileBasedDB ); // m_conn_sel->m_fileDlg->setMode( KFile::LocalOnly | KFile::File ); // m_conn_sel->m_fileDlg->setOperationMode( KFileDialog::Saving ); -////js connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(rejected()),this,TQT_SLOT(reject())); -// connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(fileHighlighted(const TQString&)),this,TQT_SLOT(slotFileHighlighted(const TQString&))); - connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); +////js connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(rejected()),this,TQ_SLOT(reject())); +// connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(fileHighlighted(const TQString&)),this,TQ_SLOT(slotFileHighlighted(const TQString&))); + connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept())); m_conn_sel->showAdvancedConn(); - connect(m_conn_sel,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,TQT_SLOT(next())); + connect(m_conn_sel,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQ_SLOT(next())); addPage(m_conn_sel_widget, i18n("Select Project's Location")); //page: server db name m_server_db_name = new KexiServerDBNamePage(this, "KexiServerDBNamePage"); d->server_db_name_dblist_lbl_txt = i18n("Existing project databases on <b>%1</b> database server:"); - connect(m_server_db_name->le_caption, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotServerDBCaptionTxtChanged(const TQString&))); - connect(m_server_db_name->le_dbname, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotServerDBNameTxtChanged(const TQString&))); - connect(m_server_db_name->le_caption, TQT_SIGNAL(returnPressed()), - this,TQT_SLOT(accept())); - connect(m_server_db_name->le_dbname, TQT_SIGNAL(returnPressed()), - this,TQT_SLOT(accept())); + connect(m_server_db_name->le_caption, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotServerDBCaptionTxtChanged(const TQString&))); + connect(m_server_db_name->le_dbname, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotServerDBNameTxtChanged(const TQString&))); + connect(m_server_db_name->le_caption, TQ_SIGNAL(returnPressed()), + this,TQ_SLOT(accept())); + connect(m_server_db_name->le_dbname, TQ_SIGNAL(returnPressed()), + this,TQ_SLOT(accept())); m_server_db_name->le_caption->setText(i18n("New database")); m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(this, "id_val")); m_project_selector = new KexiProjectSelectorWidget( diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index 8f7682a42..b31a7e49f 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -121,9 +121,9 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget( //show projects setProjectSet( m_prj_set ); - connect(list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(list,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(list,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotItemSelected())); + connect(list,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotItemSelected())); } /*! @@ -267,10 +267,10 @@ void KexiProjectSelectorDialog::init(KexiProjectSet* prj_set, bool showProjectNa setIcon(*m_sel->icon()); m_sel->setFocus(); - connect(m_sel,TQT_SIGNAL(projectExecuted(KexiProjectData*)), - this,TQT_SLOT(slotProjectExecuted(KexiProjectData*))); - connect(m_sel,TQT_SIGNAL(selectionChanged(KexiProjectData*)), - this,TQT_SLOT(slotProjectSelectionChanged(KexiProjectData*))); + connect(m_sel,TQ_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQ_SLOT(slotProjectExecuted(KexiProjectData*))); + connect(m_sel,TQ_SIGNAL(selectionChanged(KexiProjectData*)), + this,TQ_SLOT(slotProjectSelectionChanged(KexiProjectData*))); } KexiProjectData* KexiProjectSelectorDialog::selectedProjectData() const diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index f47d7da1d..6e668b6c0 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -162,8 +162,8 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD setPrompt( msg ); if (showDetailsButton) { - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(slotShowConnectionDetails()) ); + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(slotShowConnectionDetails()) ); setButtonText(KDialogBase::User1, i18n("&Details")+ " >>"); } setButtonOK(KGuiItem(i18n("&Open"), "document-open")); @@ -388,8 +388,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (cdata.password.isEmpty()) { delete d->passwordDialog; d->passwordDialog = new KexiDBPasswordDialog(0, cdata, true); -// connect( d->passwordDialog, TQT_SIGNAL(user1Clicked()), -// this, TQT_SLOT(slotShowConnectionDetails()) ); +// connect( d->passwordDialog, TQ_SIGNAL(user1Clicked()), +// this, TQ_SLOT(slotShowConnectionDetails()) ); const int ret = d->passwordDialog->exec(); if (d->passwordDialog->showConnectionDetailsRequested() || ret == TQDialog::Accepted) { // if ( ret == TQDialog::Accepted ) { @@ -485,8 +485,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) } d->connDialog = new KexiDBConnectionDialog( *m_projectData, d->shortcutFile->fileName()); - connect(d->connDialog, TQT_SIGNAL(saveChanges()), - this, TQT_SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQ_SIGNAL(saveChanges()), + this, TQ_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { //get (possibly changed) prj data @@ -522,8 +522,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!d->connDialog) { d->connDialog = new KexiDBConnectionDialog( cdata, d->connShortcutFile->fileName()); - connect(d->connDialog, TQT_SIGNAL(saveChanges()), - this, TQT_SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQ_SIGNAL(saveChanges()), + this, TQ_SLOT(slotSaveShortcutFileChanges())); } const int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { @@ -565,8 +565,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) //let's show connection details, user asked for that in the "password dialog" if (d->passwordDialog && d->passwordDialog->showConnectionDetailsRequested()) { d->connDialog = new KexiDBConnectionDialog(*m_projectData); -// connect(d->connDialog->tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), -// this, TQT_SLOT(slotSaveShortcutFileChanges())); +// connect(d->connDialog->tabWidget->mainWidget, TQ_SIGNAL(saveChanges()), +// this, TQ_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index c738d1923..de382d2fb 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -194,7 +194,7 @@ KexiStartupDialog::KexiStartupDialog( #endif if (!d->singlePage) { - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*))); d->templatesWidget->setFocus(); } showPage(0); @@ -304,7 +304,7 @@ void KexiStartupDialog::setupPageTemplates() d->templatesWidget_IconListBox->installEventFilter(this); } lyr->addWidget(d->templatesWidget); - connect(d->templatesWidget, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); + connect(d->templatesWidget, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*))); if (d->dialogOptions & CheckBoxDoNotShowAgain) { d->chkDoNotShow = new TQCheckBox(i18n("Don't show me this dialog again"), d->pageTemplates, "chkDoNotShow"); @@ -348,21 +348,21 @@ void KexiStartupDialog::setupPageTemplates() d->viewTemplates = new KexiStartupDialogTemplatesPage( templPageFrame ); tmplyr->addWidget( d->viewTemplates ); - connect(d->viewTemplates,TQT_SIGNAL(selected(const TQString&)), - this,TQT_SLOT(templateSelected(const TQString&))); -/* connect(d->viewTemplates->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)), - this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewTemplates->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)), - this,TQT_SLOT(templateItemSelected(TQIconViewItem*)));*/ + connect(d->viewTemplates,TQ_SIGNAL(selected(const TQString&)), + this,TQ_SLOT(templateSelected(const TQString&))); +/* connect(d->viewTemplates->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)), + this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewTemplates->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)), + this,TQ_SLOT(templateItemSelected(TQIconViewItem*)));*/ /*later templPageFrame = d->templatesWidget->addPage ( i18n("Personal Databases"), i18n("New Personal Database Project Templates"), DesktopIcon("folder_home") ); tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); d->viewPersonalTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "personal_page" ); tmplyr->addWidget( d->viewPersonalTempl ); - connect(d->viewPersonalTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewPersonalTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewPersonalTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*))); */ //- page "business db" @@ -374,9 +374,9 @@ void KexiStartupDialog::setupPageTemplates() tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); d->viewBusinessTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "business_page" ); tmplyr->addWidget( d->viewBusinessTempl ); - connect(d->viewBusinessTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewBusinessTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewBusinessTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*))); */ #endif //DB_TEMPLATES @@ -559,11 +559,11 @@ void KexiStartupDialog::setupPageOpenExisting() d->openExistingConnWidget->showAdvancedConn(); } d->openExistingFileDlg = d->openExistingConnWidget->m_fileDlg; - connect(d->openExistingFileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); - connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,TQT_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); - connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), - this,TQT_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); + connect(d->openExistingFileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept())); + connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQ_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); + connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), + this,TQ_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); } void KexiStartupDialog::connectionItemForOpenExistingExecuted(ConnectionDataLVItem *item) @@ -632,8 +632,8 @@ void KexiStartupDialog::setupPageOpenRecent() TQVBoxLayout *lyr = new TQVBoxLayout( d->pageOpenRecent, 0, KDialogBase::spacingHint() ); lyr->addWidget( d->prj_selector = new KexiProjectSelectorWidget( d->pageOpenRecent, "prj_selector", d->recentProjects ) ); - connect(d->prj_selector,TQT_SIGNAL(projectExecuted(KexiProjectData*)), - this,TQT_SLOT(recentProjectItemExecuted(KexiProjectData*))); + connect(d->prj_selector,TQ_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQ_SLOT(recentProjectItemExecuted(KexiProjectData*))); #endif } diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index d99ad4aed..d04407309 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -78,7 +78,7 @@ KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * paren setColumnWidthMode(0, Maximum); setResizeMode(LastColumn); setItemMargin(6); - connect(this,TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*))); + connect(this,TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*))); } KexiStartupDialogTemplatesPage::~KexiStartupDialogTemplatesPage() @@ -104,7 +104,7 @@ void KexiStartupDialogTemplatesPage::populate() // info = new KTextBrowser(this,"info"); // setResizeMode(templates,KeepSize); // setResizeMode(info,KeepSize); -// connect(templates,TQT_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQT_SLOT(itemClicked(TQIconViewItem*))); +// connect(templates,TQ_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQ_SLOT(itemClicked(TQIconViewItem*))); } /* diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 9708b0371..0db509815 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -93,8 +93,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //(js) d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); //(js) d->okButton->setDefault( true ); //(js) d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); -//(js) connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); -//(js) connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); +//(js) connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() )); +//(js) connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() )); //(js) d->customWidget = widget; //(js) d->autoSelectExtCheckBox = 0; // delayed loading //TODO d->autoSelectExtChecked = false; @@ -167,14 +167,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT(urlEntered(const KURL&))); - connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); - connect(ops, TQT_SIGNAL(finishedLoading()), - TQT_SLOT(slotLoadingFinished())); + connect(ops, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT(urlEntered(const KURL&))); + connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQ_SIGNAL(finishedLoading()), + TQ_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -208,13 +208,13 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f "edit or select a bookmark.<p>" "These bookmarks are specific to the file dialog, but otherwise operate " "like bookmarks elsewhere in TDE.</qt>")); - connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - TQT_SLOT( enterURL( const TQString& ))); + connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + TQ_SLOT( enterURL( const TQString& ))); TDEToggleAction *showSidebarAction = new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); - connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleSpeedbar( bool )) ); TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " @@ -241,8 +241,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - ops, TQT_SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + ops, TQ_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); */ /* @@ -264,16 +264,16 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f d->pathCombo->setCompletionObject( ops->dirCompletionObject(), false ); - connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL(textChanged( const TQString& )), - TQT_SLOT( pathComboChanged( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( dirCompletion( const TQString& ))); - connect( d->pathCombo, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), - d->pathCombo, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); + connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL(textChanged( const TQString& )), + TQ_SLOT( pathComboChanged( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( dirCompletion( const TQString& ))); + connect( d->pathCombo, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), + d->pathCombo, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); TQString whatsThisText; @@ -293,14 +293,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f // locationEdit->setAutoDeleteCompletionObject( true ); locationEdit->setCompletionObject( ops->completionObject(), false ); - connect( locationEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotOk())); - connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( locationActivated( const TQString& ) )); - connect( locationEdit, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( fileCompletion( const TQString& ))); - connect( locationEdit, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), - locationEdit, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); + connect( locationEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotOk())); + connect(locationEdit, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( fileCompletion( const TQString& ))); + connect( locationEdit, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), + locationEdit, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); // the Filter label/edit whatsThisText = i18n("<qt>This is the filter to apply to the file list. " @@ -316,12 +316,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); + connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); + connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index f9b535c8b..bb3a9d56a 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -65,9 +65,9 @@ tristate SQLite2ToSQLite3Migration::run() m_process = new TDEProcess(this, "process"); *m_process << ksqlite2to3_app << m_filePath; m_process->setWorkingDirectory( fi.dir(true).absPath() ); - connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(processExited(TDEProcess*)) ); if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) return false; @@ -76,7 +76,7 @@ tristate SQLite2ToSQLite3Migration::run() .arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3") ); m_dlg->setModal(true); - connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); + connect(m_dlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); m_dlg->setMinimumDuration(1000); m_dlg->setAutoClose(true); m_dlg->progressBar()->setTotalSteps(100); diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index 43bf6e4f6..d040f06bf 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -83,8 +83,8 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args) setupImporting(); setupFinish(); - connect(this, TQT_SIGNAL(selected(const TQString &)), this, TQT_SLOT(pageSelected(const TQString &))); - connect(this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(helpClicked())); + connect(this, TQ_SIGNAL(selected(const TQString &)), this, TQ_SLOT(pageSelected(const TQString &))); + connect(this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(helpClicked())); if (m_predefinedConnectionData) { // setup wizard for predefined server source @@ -291,11 +291,11 @@ void ImportWizard::setupDst() ":ProjectMigrationDestinationDir", m_dstPage, "m_dstConnSelector"); m_dstConn->hideHelpers(); //me: Can't connect m_dstConn->m_fileDlg here, it doesn't exist yet - //connect(this, TQT_SLOT(next()), m_dstConn->m_fileDlg, TQT_SIGNAL(accepted())); + //connect(this, TQ_SLOT(next()), m_dstConn->m_fileDlg, TQ_SIGNAL(accepted())); vbox->addWidget( m_dstConn ); - connect(m_dstConn,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,TQT_SLOT(next())); + connect(m_dstConn,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQ_SLOT(next())); // m_dstConn->hideHelpers(); m_dstConn->showSimpleConn(); @@ -353,7 +353,7 @@ void ImportWizard::setupImporting() KButtonBox *optionsBox = new KButtonBox(m_importingPage); vbox->addWidget( optionsBox ); - m_importOptionsButton = optionsBox->addButton(i18n("Advanced Options"), this, TQT_SLOT(slotOptionsButtonClicked())); + m_importOptionsButton = optionsBox->addButton(i18n("Advanced Options"), this, TQ_SLOT(slotOptionsButtonClicked())); m_importOptionsButton->setIconSet(SmallIconSet("configure")); optionsBox->addStretch(1); @@ -736,10 +736,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result) // Setup progress feedback for the GUI if(sourceDriver->progressSupported()) { m_progressBar->updateGeometry(); - disconnect(sourceDriver, TQT_SIGNAL(progressPercent(int)), - this, TQT_SLOT(progressUpdated(int))); - connect(sourceDriver, TQT_SIGNAL(progressPercent(int)), - this, TQT_SLOT(progressUpdated(int))); + disconnect(sourceDriver, TQ_SIGNAL(progressPercent(int)), + this, TQ_SLOT(progressUpdated(int))); + connect(sourceDriver, TQ_SIGNAL(progressPercent(int)), + this, TQ_SLOT(progressUpdated(int))); progressUpdated(0); } diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 1bc8945f5..212a68426 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -92,7 +92,7 @@ bool MigrateManagerInternal::lookupDrivers() return true; if (tqApp) { - connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits())); + connect(tqApp,TQ_SIGNAL(aboutToQuit()),this,TQ_SLOT(slotAppQuits())); } //TODO: for QT-only version check for TDEInstance wrapper // KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (TDEGlobal::instance()==0)!" << endl; diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 9b1af9c1b..b282385b1 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -430,8 +430,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionCategoriesListView = new ActionCategoriesListView(mainWidget); d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); d->glyr->addWidget(d->actionCategoriesListView, 1, 0); - connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*))); + connect( d->actionCategoriesListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotActionCategorySelected(TQListViewItem*))); TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); @@ -453,8 +453,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ // 2nd column: list of actions/objects d->objectsListView = new KexiBrowser(d->secondAnd3rdColumnMainWidget, d->mainWin, 0/*features*/); d->secondAnd3rdColumnGrLyr->addWidget(d->objectsListView, 1, 0); - connect(d->objectsListView, TQT_SIGNAL(selectionChanged(KexiPart::Item*)), - this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*))); + connect(d->objectsListView, TQ_SIGNAL(selectionChanged(KexiPart::Item*)), + this, TQ_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*))); d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget); d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); @@ -470,10 +470,10 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); - connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*))); - connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotActionToExecuteItemSelected(TQListViewItem*))); + connect(d->actionToExecuteListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*))); + connect(d->actionToExecuteListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotActionToExecuteItemSelected(TQListViewItem*))); d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteListView, 1, 1); d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, @@ -594,10 +594,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) vlyr->addWidget(lbl); vlyr->addWidget(d->tdeactionListView); d->secondAnd3rdColumnStack->addWidget(d->tdeactionPageWidget); - connect(d->tdeactionListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); - connect( d->tdeactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*))); + connect(d->tdeactionListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); + connect( d->tdeactionListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotTDEActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); d->raiseWidget(d->tdeactionPageWidget); @@ -619,10 +619,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) vlyr->addWidget(lbl); vlyr->addWidget(d->currentFormActionsListView); d->secondAnd3rdColumnStack->addWidget(d->currentFormActionsPageWidget); - connect(d->currentFormActionsListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*))); - connect( d->currentFormActionsListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*))); + connect(d->currentFormActionsListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*))); + connect( d->currentFormActionsListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); d->raiseWidget(d->currentFormActionsPageWidget); diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index ba21827e5..d673f5f32 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -88,7 +88,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_clearWidgetDSButton->setMinimumHeight(m_widgetDSLabel->minimumHeight()); TQToolTip::add(m_clearWidgetDSButton, i18n("Clear widget's data source")); hlyr->addWidget(m_clearWidgetDSButton); - connect(m_clearWidgetDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearWidgetDataSourceSelection())); + connect(m_clearWidgetDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearWidgetDataSourceSelection())); m_sourceFieldCombo = new KexiFieldComboBox(contents, "sourceFieldCombo"); m_widgetDSLabel->setBuddy(m_sourceFieldCombo); @@ -114,13 +114,13 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_gotoButton->setMinimumHeight(m_dataSourceLabel->minimumHeight()); TQToolTip::add(m_gotoButton, i18n("Go to selected form's data source")); hlyr->addWidget(m_gotoButton); - connect(m_gotoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelected())); + connect(m_gotoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelected())); m_clearDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearDSButton"); m_clearDSButton->setMinimumHeight(m_dataSourceLabel->minimumHeight()); TQToolTip::add(m_clearDSButton, i18n("Clear form's data source")); hlyr->addWidget(m_clearDSButton); - connect(m_clearDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDataSourceSelection())); + connect(m_clearDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDataSourceSelection())); m_dataSourceCombo = new KexiDataSourceComboBox(contents, "dataSourceCombo"); m_dataSourceLabel->setBuddy(m_dataSourceCombo); @@ -179,23 +179,23 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_addField->setFocusPolicy(TQWidget::StrongFocus); TQToolTip::add(m_addField, i18n("Insert selected fields into form")); hlyr->addWidget(m_addField); - connect(m_addField, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSelectedFields())); + connect(m_addField, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInsertSelectedFields())); m_fieldListView = new KexiFieldListView(contents, "fieldListView", KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection ); m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); m_availableFieldsLabel->setBuddy(m_fieldListView); contentsVlyr->addWidget(m_fieldListView, 1); - connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged())); - connect(m_fieldListView, TQT_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&))); + connect(m_fieldListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotFieldListViewSelectionChanged())); + connect(m_fieldListView, TQ_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&))); #endif vlyr->addStretch(1); - connect(m_dataSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotDataSourceTextChanged(const TQString &))); - connect(m_dataSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotDataSourceChanged())); - connect(m_sourceFieldCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotFieldSelected())); + connect(m_dataSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotDataSourceTextChanged(const TQString &))); + connect(m_dataSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotDataSourceChanged())); + connect(m_sourceFieldCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotFieldSelected())); clearDataSourceSelection(); slotFieldListViewSelectionChanged(); diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 19241a363..1dbffdb19 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -384,7 +384,7 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, #ifndef KEXI_NO_IMAGEBOX_WIDGET else if(c == "KexiDBImageBox") { w = new KexiDBImageBox(designMode, p, n); - connect(w, TQT_SIGNAL(idChanged(long)), this, TQT_SLOT(slotImageBoxIdChanged(long))); + connect(w, TQ_SIGNAL(idChanged(long)), this, TQ_SLOT(slotImageBoxIdChanged(long))); } #endif #ifndef KEXI_NO_AUTOFIELD_WIDGET diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index aae999061..f7a247ec9 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -174,14 +174,14 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); if (!action) continue; - TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); //safety - TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); + TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); //safety + TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); } else if (partInfo) { //'open or execute' action KexiFormEventAction* action = new KexiFormEventAction(mainWin, obj, actionType, actionArg, data.option); - TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); - TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); + TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); + TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); } } delete l; diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index e5d7addf6..4ba0442ac 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -107,13 +107,13 @@ KexiFormPart::KexiFormPart(TQObject *parent, const char *name, const TQStringLis static_formsLibrary = KFormDesigner::FormManager::createWidgetLibrary( formManager, supportedFactoryGroups); static_formsLibrary->setAdvancedPropertiesVisible(false); - connect(static_formsLibrary, TQT_SIGNAL(widgetCreated(TQWidget*)), - this, TQT_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*))); + connect(static_formsLibrary, TQ_SIGNAL(widgetCreated(TQWidget*)), + this, TQ_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*))); - connect(KFormDesigner::FormManager::self()->propertySet(), TQT_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)), - this, TQT_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)), - this, TQT_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool))); + connect(KFormDesigner::FormManager::self()->propertySet(), TQ_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)), + this, TQ_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)), + this, TQ_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool))); } KexiFormPart::~KexiFormPart() @@ -143,8 +143,8 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col ) { if (mode==Kexi::DesignViewMode) { KFormDesigner::FormManager::self()->createActions(col, 0); - new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder"); - new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust"); + new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), col, "taborder"); + new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(ajustWidgetSize()), col, "adjust"); } //TODO } @@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col ) void KexiFormPart::initPartActions() { -// new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()), +// new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQ_SLOT(showFormUICode()), // guiClient()->actionCollection(), "show_form_ui"); } @@ -162,7 +162,7 @@ void KexiFormPart::initInstanceActions() kapp->config()->setGroup("General"); if (kapp->config()->readBoolEntry("showInternalDebugger", false)) { new TDEAction(i18n("Show Form UI Code"), "compfile", - CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_SLOT(showFormUICode()), + CTRL+Key_U, KFormDesigner::FormManager::self(), TQ_SLOT(showFormUICode()), actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui"); } #endif @@ -171,7 +171,7 @@ void KexiFormPart::initInstanceActions() KFormDesigner::FormManager::self()->createActions( library(), col, (KXMLGUIClient*)col->parentGUIClient() ); //guiClient() ); //connect actions provided by widget factories - connect( col->action("widget_assign_action"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotAssignAction())); + connect( col->action("widget_assign_action"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotAssignAction())); createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "edit-clear", 0, "formpart_clear_contents"); createSharedAction(Kexi::DesignViewMode, i18n("Edit Tab Order..."), "tab_order", 0, "formpart_taborder"); @@ -488,14 +488,14 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow* d->objectTreeView = new KFormDesigner::ObjectTreeView(0, "KexiFormPart:ObjectTreeView"); KFormDesigner::FormManager::self()->setObjectTreeView(d->objectTreeView); //important: assign to manager d->dataSourcePage = new KexiDataSourcePage(0, "dataSourcePage"); - connect(d->dataSourcePage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), - mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&))); - connect(d->dataSourcePage, TQT_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), - KFormDesigner::FormManager::self(), TQT_SLOT(setFormDataSource(const TQCString&, const TQCString&))); - connect(d->dataSourcePage, TQT_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), - KFormDesigner::FormManager::self(), TQT_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); - connect(d->dataSourcePage, TQT_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), - KFormDesigner::FormManager::self(), TQT_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&))); + connect(d->dataSourcePage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), + mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&))); + connect(d->dataSourcePage, TQ_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), + KFormDesigner::FormManager::self(), TQ_SLOT(setFormDataSource(const TQCString&, const TQCString&))); + connect(d->dataSourcePage, TQ_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), + KFormDesigner::FormManager::self(), TQ_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); + connect(d->dataSourcePage, TQ_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), + KFormDesigner::FormManager::self(), TQ_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&))); } KexiProject *prj = mainWin->project(); @@ -520,16 +520,16 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget) kdDebug() << it.current() << endl; KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView"); if (formView) { - connect(widget, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), - formView, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); + connect(widget, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), + formView, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); } } else if (0==qstrcmp(it.current(), handleDropEventSignal)) { kdDebug() << it.current() << endl; KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView"); if (formView) { - connect(widget, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), - formView, TQT_SLOT(slotHandleDropEvent(TQDropEvent*))); + connect(widget, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), + formView, TQ_SLOT(slotHandleDropEvent(TQDropEvent*))); } } } diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index 4e0677f89..86d66517d 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -49,7 +49,7 @@ KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview) // recordNavigator()->showEditingIndicator(true); } - connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted())); + connect(this, TQ_SIGNAL(resizingStarted()), this, TQ_SLOT(slotResizingStarted())); m_popupMenu = new TDEPopupMenu(this, "contextMenu"); @@ -288,9 +288,9 @@ KexiDataItemInterface *KexiFormScrollView::editor( int col, bool ignoreMissingEd return 0; } editor->hide(); - connect(editor,TQT_SIGNAL(editRequested()),this,TQT_SLOT(slotEditRequested())); - connect(editor,TQT_SIGNAL(cancelRequested()),this,TQT_SLOT(cancelEditor())); - connect(editor,TQT_SIGNAL(acceptRequested()),this,TQT_SLOT(acceptEditor())); + connect(editor,TQ_SIGNAL(editRequested()),this,TQ_SLOT(slotEditRequested())); + connect(editor,TQ_SIGNAL(cancelRequested()),this,TQ_SLOT(cancelEditor())); + connect(editor,TQ_SIGNAL(acceptRequested()),this,TQ_SLOT(acceptEditor())); editor->resize(columnWidth(col)-1, rowHeight()-1); editor->installEventFilter(this); diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 6ea8bd154..d9423cd8f 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -91,67 +91,67 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, if (viewMode()==Kexi::DataViewMode) { m_scrollView->recordNavigator()->setRecordHandler( m_scrollView ); m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background()); -//moved to formmanager connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); +//moved to formmanager connect(formPart()->manager(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected())); } else { - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)), - this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form *, bool)), - this, TQT_SLOT(slotDirty(KFormDesigner::Form *, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)), + this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form *, bool)), + this, TQ_SLOT(slotDirty(KFormDesigner::Form *, bool))); - connect(m_dbform, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), - this, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); - connect(m_dbform, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), - this, TQT_SLOT(slotHandleDropEvent(TQDropEvent*))); + connect(m_dbform, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), + this, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); + connect(m_dbform, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), + this, TQ_SLOT(slotHandleDropEvent(TQDropEvent*))); // action stuff - plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder())); - plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize())); -//TODO plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQT_SLOT(editFormPixmapCollection())); -//TODO plugSharedAction("formpart_connections", formPart()->manager(), TQT_SLOT(editConnections())); - - plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget())); - plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget())); - plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget())); - plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget())); - plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQT_SLOT(selectAll())); - plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent())); - plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQT_SLOT(undo())); - plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo())); + plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder())); + plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize())); +//TODO plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQ_SLOT(editFormPixmapCollection())); +//TODO plugSharedAction("formpart_connections", formPart()->manager(), TQ_SLOT(editConnections())); + + plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget())); + plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget())); + plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget())); + plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget())); + plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQ_SLOT(selectAll())); + plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent())); + plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQ_SLOT(undo())); + plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQ_SLOT(redo())); plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) ); - plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) ); - plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) ); + plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()) ); + plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()) ); + plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()) ); #ifdef KEXI_SHOW_SPLITTER_WIDGET - plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) ); - plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) ); + plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()) ); + plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()) ); #endif - plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) ); + plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()) ); - plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()) ); - plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()) ); + plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()) ); + plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()) ); plugSharedAction("other_widgets_menu", KFormDesigner::FormManager::self(), 0 ); setAvailable("other_widgets_menu", true); plugSharedAction("formpart_align_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQT_SLOT(alignWidgetsToLeft()) ); - plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()) ); - plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()) ); - plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()) ); - plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()) ); + plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQ_SLOT(alignWidgetsToLeft()) ); + plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()) ); + plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()) ); + plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()) ); + plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()) ); plugSharedAction("formpart_adjust_size_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()) ); - plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()) ); - plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()) ); - plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()) ); - plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()) ); - plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()) ); - - plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQT_SLOT(changeFont()) ); + plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()) ); + plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()) ); + plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()) ); + plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()) ); + plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()) ); + plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()) ); + + plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQ_SLOT(changeFont()) ); } initForm(); @@ -159,7 +159,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, KexiDataAwareView::init( m_scrollView, m_scrollView, m_scrollView, /* skip data-awarness if design mode */ viewMode()==Kexi::DesignViewMode ); - connect(this, TQT_SIGNAL(focus(bool)), this, TQT_SLOT(slotFocus(bool))); + connect(this, TQ_SIGNAL(focus(bool)), this, TQ_SLOT(slotFocus(bool))); /// @todo skip this if ther're no borders // m_dbform->resize( m_dbform->size()+TQSize(m_scrollView->verticalScrollBar()->width(), m_scrollView->horizontalScrollBar()->height()) ); } @@ -225,8 +225,8 @@ KexiFormView::initForm() if (viewMode()==Kexi::DesignViewMode) { //we want to be informed about executed commands - connect(form()->commandHistory(), TQT_SIGNAL(commandExecuted()), - KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted())); + connect(form()->commandHistory(), TQ_SIGNAL(commandExecuted()), + KFormDesigner::FormManager::self(), TQ_SLOT(slotHistoryCommandExecuted())); } const bool newForm = parentDialog()->id() < 0; diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp index d97fe7d91..0f36a427f 100644 --- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp @@ -31,7 +31,7 @@ KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const cha { setFocusPolicy(TQWidget::StrongFocus); updateTristate(); - connect(this, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotStateChanged(int))); + connect(this, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotStateChanged(int))); } KexiDBCheckBox::~KexiDBCheckBox() diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index 5fb89443a..ac97d6395 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -317,7 +317,7 @@ void KexiDBComboBox::mousePressEvent( TQMouseEvent *e ) if (handleMousePressEvent(e)) return; -// TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); +// TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); // d->shortClick = TRUE; // } KexiDBAutoField::mousePressEvent( e ); diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index da8c9fc43..58dee2e6a 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -38,8 +38,8 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_edit = new TQDateEdit(date, this); m_edit->setAutoAdvance(true); m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); - connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) ); - connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) ); + connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged(const TQDate&)) ); + connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateChanged(const TQDate&)) ); TQToolButton* btn = new TQToolButton(this); btn->setText("..."); @@ -53,12 +53,12 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char #endif m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); - connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); + connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) - connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate())); + connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate())); m_datePicker->setCloseButton(true); m_datePicker->installEventFilter(this); m_datePickerPopupMenu->insertItem(m_datePicker); diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 355065918..6b62f8053 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -38,8 +38,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_dateEdit->setAutoAdvance(true); m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); // m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") ); - connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged())); - connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged())); + connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged())); + connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateTimeChanged())); TQToolButton* btn = new TQToolButton(this); btn->setText("..."); @@ -49,8 +49,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_timeEdit = new TQTimeEdit(datetime.time(), this);; m_timeEdit->setAutoAdvance(true); m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); - connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged())); - connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged())); + connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged())); + connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SIGNAL(dateTimeChanged())); #ifdef TQDateTimeEditor_HACK m_dte_date = KexiUtils::findFirstChild<TQDateTimeEditor>(m_dateEdit, "TQDateTimeEditor"); @@ -60,12 +60,12 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par #endif m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); - connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); + connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) - connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate())); + connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate())); m_datePicker->setCloseButton(true); m_datePicker->installEventFilter(this); m_datePickerPopupMenu->insertItem(m_datePicker); diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp index 0fdc08cf5..195cecc11 100644 --- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp @@ -25,7 +25,7 @@ KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *parent, const char *name) : KDoubleSpinBox(parent, name) , KexiFormDataItemInterface() { - connect(this, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotValueChanged())); } KexiDBDoubleSpinBox::~KexiDBDoubleSpinBox() diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 1d74f94fd..2fec335dd 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -106,29 +106,29 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n m_paletteBackgroundColorChanged = false; //set this here, not before - connect(m_popupMenu, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), - this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&))); - connect(m_popupMenu, TQT_SIGNAL(insertFromFileRequested(const KURL&)), - this, TQT_SLOT(handleInsertFromFileAction(const KURL&))); - connect(m_popupMenu, TQT_SIGNAL(saveAsRequested(const TQString&)), - this, TQT_SLOT(handleSaveAsAction(const TQString&))); - connect(m_popupMenu, TQT_SIGNAL(cutRequested()), - this, TQT_SLOT(handleCutAction())); - connect(m_popupMenu, TQT_SIGNAL(copyRequested()), - this, TQT_SLOT(handleCopyAction())); - connect(m_popupMenu, TQT_SIGNAL(pasteRequested()), - this, TQT_SLOT(handlePasteAction())); - connect(m_popupMenu, TQT_SIGNAL(clearRequested()), - this, TQT_SLOT(clear())); - connect(m_popupMenu, TQT_SIGNAL(showPropertiesRequested()), - this, TQT_SLOT(handleShowPropertiesAction())); - -// connect(m_popupMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotAboutToHidePopupMenu())); + connect(m_popupMenu, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), + this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&))); + connect(m_popupMenu, TQ_SIGNAL(insertFromFileRequested(const KURL&)), + this, TQ_SLOT(handleInsertFromFileAction(const KURL&))); + connect(m_popupMenu, TQ_SIGNAL(saveAsRequested(const TQString&)), + this, TQ_SLOT(handleSaveAsAction(const TQString&))); + connect(m_popupMenu, TQ_SIGNAL(cutRequested()), + this, TQ_SLOT(handleCutAction())); + connect(m_popupMenu, TQ_SIGNAL(copyRequested()), + this, TQ_SLOT(handleCopyAction())); + connect(m_popupMenu, TQ_SIGNAL(pasteRequested()), + this, TQ_SLOT(handlePasteAction())); + connect(m_popupMenu, TQ_SIGNAL(clearRequested()), + this, TQ_SLOT(clear())); + connect(m_popupMenu, TQ_SIGNAL(showPropertiesRequested()), + this, TQ_SLOT(handleShowPropertiesAction())); + +// connect(m_popupMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotAboutToHidePopupMenu())); // if (m_chooser) { //we couldn't use m_chooser->setPopup() because of drawing problems -// connect(m_chooser, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooserPressed())); -// connect(m_chooser, TQT_SIGNAL(released()), this, TQT_SLOT(slotChooserReleased())); -// connect(m_chooser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool))); +// connect(m_chooser, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChooserPressed())); +// connect(m_chooser, TQ_SIGNAL(released()), this, TQ_SLOT(slotChooserReleased())); +// connect(m_chooser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool))); // } setDataSource( TQString() ); //to initialize popup menu and actions availability diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp index 633fe6fc7..d574963bd 100644 --- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp @@ -26,7 +26,7 @@ KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *parent, const char *name) : KIntSpinBox(parent, name) , KexiFormDataItemInterface() { - connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged())); } KexiDBIntSpinBox::~KexiDBIntSpinBox() diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index 93f350271..7df46895c 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -433,7 +433,7 @@ void KexiDBLabel::updatePixmapLater() { if (d->resizeEvent) { if (!d->timer) { d->timer = new TQTimer(this, "KexiDBLabelTimer"); - connect(d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatePixmap())); + connect(d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updatePixmap())); } d->timer->start(100, true); d->resizeEvent = false; diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index e0395cde6..eebe699d6 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -67,7 +67,7 @@ KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name) widget->setPalette(p); #endif - connect(this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString&))); + connect(this, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString&))); } KexiDBLineEdit::~KexiDBLineEdit() diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index 3b9c6f09c..960602200 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -35,7 +35,7 @@ KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name) , m_menuExtender(this, this) , m_slotTextChanged_enabled(true) { - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); installEventFilter(this); } diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index ac42fa857..1233c1dd0 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -42,7 +42,7 @@ KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char m_dte_time = 0; #endif - connect(this, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged(const TQTime&))); + connect(this, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged(const TQTime&))); } KexiDBTimeEdit::~KexiDBTimeEdit() diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 19e30f248..5719f9f03 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -109,7 +109,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_fileSavePage->setAdditionalFilters( csvMimeTypes() ); m_fileSavePage->setDefaultExtension("csv"); m_fileSavePage->setLocationText( KexiUtils::stringToFileName(m_tableOrQuery->captionOrName()) ); - connect(m_fileSavePage, TQT_SIGNAL(rejected()), this, TQT_SLOT(reject())); + connect(m_fileSavePage, TQ_SIGNAL(rejected()), this, TQ_SLOT(reject())); addPage(m_fileSavePage, i18n("Enter Name of File You Want to Save Data To")); } @@ -135,7 +135,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_showOptionsButton = new KPushButton(KGuiItem(i18n("Show Options >>"), "configure"), m_exportOptionsPage); - connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked())); + connect(m_showOptionsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowOptionsButtonClicked())); exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0); m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); @@ -358,7 +358,7 @@ void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout ) if (!m_defaultsBtn) { m_defaultsBtn = new KPushButton(i18n("Defaults"), this); TQWidget::setTabOrder(backButton(), m_defaultsBtn); - connect(m_defaultsBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultsButtonClicked())); + connect(m_defaultsBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultsButtonClicked())); } if (!m_exportOptionsSection->isVisible()) m_defaultsBtn->hide(); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 61f86ec2b..26efa6029 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -235,7 +235,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" ); glyr->addWidget( m_primaryKeyField, 2, 1 ); - connect(m_primaryKeyField, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPrimaryKeyFieldToggled(bool))); + connect(m_primaryKeyField, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPrimaryKeyFieldToggled(bool))); m_comboQuote = new KexiCSVTextQuoteComboBox( page ); glyr->addWidget( m_comboQuote, 1, 2 ); @@ -364,24 +364,24 @@ if ( m_mode == Clipboard ) m_table->setSelectionMode(TQTable::NoSelection); - connect(m_formatCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(formatChanged(int))); - connect(m_delimiterWidget, TQT_SIGNAL(delimiterChanged(const TQString&)), - this, TQT_SLOT(delimiterChanged(const TQString&))); - connect(m_startAtLineSpinBox, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(startlineSelected(int))); - connect(m_comboQuote, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(textquoteSelected(int))); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(currentCellChanged(int, int))); - connect(m_table, TQT_SIGNAL(valueChanged(int,int)), - this, TQT_SLOT(cellValueChanged(int,int))); - connect(m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(ignoreDuplicatesChanged(int))); - connect(m_1stRowForFieldNames, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(slot1stRowForFieldNamesChanged(int))); - - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(optionsButtonClicked())); + connect(m_formatCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(formatChanged(int))); + connect(m_delimiterWidget, TQ_SIGNAL(delimiterChanged(const TQString&)), + this, TQ_SLOT(delimiterChanged(const TQString&))); + connect(m_startAtLineSpinBox, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(startlineSelected(int))); + connect(m_comboQuote, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(textquoteSelected(int))); + connect(m_table, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(currentCellChanged(int, int))); + connect(m_table, TQ_SIGNAL(valueChanged(int,int)), + this, TQ_SLOT(cellValueChanged(int,int))); + connect(m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(ignoreDuplicatesChanged(int))); + connect(m_1stRowForFieldNames, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(slot1stRowForFieldNamesChanged(int))); + + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(optionsButtonClicked())); installRecursiveEventFilter(this, this); @@ -406,7 +406,7 @@ void KexiCSVImportDialog::initLater() if (m_dialogCancelled) { // m_loadingProgressDlg->hide(); // m_loadingProgressDlg->close(); - TQTimer::singleShot(0, this, TQT_SLOT(reject())); + TQTimer::singleShot(0, this, TQ_SLOT(reject())); return; } @@ -1270,7 +1270,7 @@ void KexiCSVImportDialog::textquoteSelected(int) void KexiCSVImportDialog::fillTableLater() { m_table->setNumRows( 0 ); - TQTimer::singleShot(10, this, TQT_SLOT(fillTable())); + TQTimer::singleShot(10, this, TQ_SLOT(fillTable())); } void KexiCSVImportDialog::startlineSelected(int startline) diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index d424ffada..a63c33473 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -65,12 +65,12 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget lyr->addStretch(2); slotDelimiterChangedInternal(KEXICSV_DEFAULT_FILE_DELIMITER_INDEX); //this will init m_delimiter - connect(m_combo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDelimiterChanged(int))); - connect(m_delimiterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotDelimiterLineEditReturnPressed())); - connect(m_delimiterEdit, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(slotDelimiterLineEditTextChanged( const TQString & ) )); + connect(m_combo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDelimiterChanged(int))); + connect(m_delimiterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotDelimiterLineEditReturnPressed())); + connect(m_delimiterEdit, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(slotDelimiterLineEditTextChanged( const TQString & ) )); } void KexiCSVDelimiterWidget::slotDelimiterChanged(int index) diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index dd8b9a92b..2352e02fd 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -173,14 +173,14 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare d->propertyset = new KexiDataAwarePropertySet(this, d->tableview); // Connect signals the KexiDataTable provides to local slots. - connect(d->tabledata, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), - this, TQT_SLOT(beforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); - connect(d->tabledata, TQT_SIGNAL(rowUpdated(KexiTableItem*)), - this, TQT_SLOT(rowUpdated(KexiTableItem*))); - connect(d->tabledata, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), - this, TQT_SLOT(rowInserted(KexiTableItem*,uint,bool))); - connect(d->tabledata, TQT_SIGNAL(rowDeleted()), - this, TQT_SLOT(rowDeleted())); + connect(d->tabledata, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), + this, TQ_SLOT(beforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + connect(d->tabledata, TQ_SIGNAL(rowUpdated(KexiTableItem*)), + this, TQ_SLOT(rowUpdated(KexiTableItem*))); + connect(d->tabledata, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), + this, TQ_SLOT(rowInserted(KexiTableItem*,uint,bool))); + connect(d->tabledata, TQ_SIGNAL(rowDeleted()), + this, TQ_SLOT(rowDeleted())); // Everything is ready. So, update the data now. updateData(); @@ -382,8 +382,8 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, TDESha // if there exists no such propertyset yet, create one. set = new KoProperty::Set(d->propertyset, action->name()); d->propertyset->insert(row, set, true); - connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&))); } // The caption. @@ -433,9 +433,9 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop updateProperties(row, &set, macroitem); } // It's needed to call the reload delayed cause in KoProperty::Editor - // TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); may lead + // TQTimer::singleShot(10, this, TQ_SLOT(selectItemLater())); may lead // to crashes if we are to fast. - TQTimer::singleShot(50, this, TQT_SLOT(reloadPropertyLater())); + TQTimer::singleShot(50, this, TQ_SLOT(reloadPropertyLater())); } d->reloadsProperties = false; diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 8b676fb09..d4ba42b4e 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -86,8 +86,8 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co } } - connect(designerbtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(designbtnClicked())); - connect(continuebtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(continuebtnClicked())); + connect(designerbtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(designbtnClicked())); + connect(continuebtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(continuebtnClicked())); } KexiMacroError::~KexiMacroError() @@ -125,6 +125,6 @@ void KexiMacroError::designbtnClicked() void KexiMacroError::continuebtnClicked() { - TQTimer::singleShot(200, d->context, TQT_SLOT(activateNext())); + TQTimer::singleShot(200, d->context, TQ_SLOT(activateNext())); close(); } diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 3bb5629d1..45d21b10f 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -543,14 +543,14 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, d->combobox->setFocusProxy( d->listbox->editItem()->widget() ); setFocusWidget( d->combobox->lineEdit() ); - connect(d->combobox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotComboBoxChanged())); - connect(d->combobox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotComboBoxActivated())); - connect(d->listbox->editItem()->widget(), TQT_SIGNAL(valueChanged(Widget*)), - this, TQT_SLOT(slotWidgetValueChanged())); - connect(d->macroproperty, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(slotPropertyValueChanged())); + connect(d->combobox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotComboBoxChanged())); + connect(d->combobox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotComboBoxActivated())); + connect(d->listbox->editItem()->widget(), TQ_SIGNAL(valueChanged(Widget*)), + this, TQ_SLOT(slotWidgetValueChanged())); + connect(d->macroproperty, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(slotPropertyValueChanged())); } KexiMacroPropertyWidget::~KexiMacroPropertyWidget() diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index 540dcc39d..afbd0e8da 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -51,7 +51,7 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, d->editor->setWordWrap(TQTextEdit::NoWrap); layout->addWidget(d->editor); - connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged())); + connect(d->editor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(editorChanged())); } KexiMacroTextView::~KexiMacroTextView() diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index f0e7ea0b3..34f577125 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -67,7 +67,7 @@ KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, KoMacro: , d( new Private(macro) ) { //kdDebug() << "KexiMacroView::KexiMacroView() Ctor" << endl; - plugSharedAction( "data_execute", this, TQT_SLOT(execute()) ); + plugSharedAction( "data_execute", this, TQ_SLOT(execute()) ); } KexiMacroView::~KexiMacroView() diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp index af29da57a..a5f84be7a 100644 --- a/kexi/plugins/macros/lib/macro.cpp +++ b/kexi/plugins/macros/lib/macro.cpp @@ -115,7 +115,7 @@ TDESharedPtr<Context> Macro::execute(TQObject* sender) // set the sender-variable if we got a sender TQObject. c->setVariable("[sender]", TDESharedPtr<Variable>( new Variable(sender) )); } - //connect(context, TQT_SIGNAL(activated()), this, TQT_SIGNAL(activated())); + //connect(context, TQ_SIGNAL(activated()), this, TQ_SIGNAL(activated())); //call activate in the context of the macro c->activate( c ); diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 6d5d557c9..d3725728a 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -148,12 +148,12 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( d->spl = new TQSplitter(TQt::Vertical, this); d->spl->setChildrenCollapsible(false); d->relations = new KexiRelationWidget(mainWin, d->spl, "relations"); - connect(d->relations, TQT_SIGNAL(tableAdded(KexiDB::TableSchema&)), - this, TQT_SLOT(slotTableAdded(KexiDB::TableSchema&))); - connect(d->relations, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)), - this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); - connect(d->relations, TQT_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)), - this, TQT_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&))); + connect(d->relations, TQ_SIGNAL(tableAdded(KexiDB::TableSchema&)), + this, TQ_SLOT(slotTableAdded(KexiDB::TableSchema&))); + connect(d->relations, TQ_SIGNAL(tableHidden(KexiDB::TableSchema&)), + this, TQ_SLOT(slotTableHidden(KexiDB::TableSchema&))); + connect(d->relations, TQ_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)), + this, TQ_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&))); d->head = new KexiSectionHeader(i18n("Query Columns"),TQt::Vertical, d->spl); d->dataTable = new KexiDataTable(mainWin, d->head, "guieditor_dataTable", false); @@ -171,21 +171,21 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( d->dataTable->tableView()->adjustColumnWidthToContents(COLUMN_ID_SORTING); d->dataTable->tableView()->maximizeColumnsWidth( c ); d->dataTable->tableView()->setDropsAtRowEnabled(true); - connect(d->dataTable->tableView(), TQT_SIGNAL(dragOverRow(KexiTableItem*,int,TQDragMoveEvent*)), - this, TQT_SLOT(slotDragOverTableRow(KexiTableItem*,int,TQDragMoveEvent*))); - connect(d->dataTable->tableView(), TQT_SIGNAL(droppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)), - this, TQT_SLOT(slotDroppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&))); - connect(d->dataTable->tableView(), TQT_SIGNAL(newItemAppendedForAfterDeletingInSpreadSheetMode()), - this, TQT_SLOT(slotNewItemAppendedForAfterDeletingInSpreadSheetMode())); + connect(d->dataTable->tableView(), TQ_SIGNAL(dragOverRow(KexiTableItem*,int,TQDragMoveEvent*)), + this, TQ_SLOT(slotDragOverTableRow(KexiTableItem*,int,TQDragMoveEvent*))); + connect(d->dataTable->tableView(), TQ_SIGNAL(droppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)), + this, TQ_SLOT(slotDroppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&))); + connect(d->dataTable->tableView(), TQ_SIGNAL(newItemAppendedForAfterDeletingInSpreadSheetMode()), + this, TQ_SLOT(slotNewItemAppendedForAfterDeletingInSpreadSheetMode())); } - connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), - this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); - connect(d->data, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), - this, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); - connect(d->relations, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), - this, TQT_SLOT(slotTablePositionChanged(KexiRelationViewTableContainer*))); - connect(d->relations, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), - this, TQT_SLOT(slotAboutConnectionRemove(KexiRelationViewConnection*))); + connect(d->data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), + this, TQ_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + connect(d->data, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), + this, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); + connect(d->relations, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), + this, TQ_SLOT(slotTablePositionChanged(KexiRelationViewTableContainer*))); + connect(d->relations, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), + this, TQ_SLOT(slotAboutConnectionRemove(KexiRelationViewConnection*))); TQVBoxLayout *l = new TQVBoxLayout(this); l->addWidget(d->spl); @@ -1742,8 +1742,8 @@ KexiQueryDesignerGuiEditor::createPropertySet( int row, set->addProperty(prop = new KoProperty::Property("isExpression", TQVariant(false)) ); prop->setVisible(false); - connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); d->sets->insert(row, set, newOne); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index f443c92ff..fbd43f311 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -108,7 +108,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi d->head = new KexiSectionHeader(i18n("SQL Query Text"),TQt::Vertical, d->splitter); d->editor = new KexiQueryDesignerSQLEditor(mainWin, d->head, "sqle"); // d->editor->installEventFilter(this);//for keys - connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(d->editor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); addChildView(d->editor); setViewWidget(d->editor); d->splitter->setFocusProxy(d->editor); @@ -136,8 +136,8 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi TQHBoxLayout *b = new TQHBoxLayout(this); b->addWidget(d->splitter); - plugSharedAction("querypart_check_query", this, TQT_SLOT(slotCheckQuery())); - plugSharedAction("querypart_view_toggle_history", this, TQT_SLOT(slotUpdateMode())); + plugSharedAction("querypart_check_query", this, TQ_SLOT(slotCheckQuery())); + plugSharedAction("querypart_view_toggle_history", this, TQ_SLOT(slotUpdateMode())); d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) ); d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),TQt::Vertical, d->history_section); @@ -146,11 +146,11 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi static const TQString msg_back = i18n("Back to Selected Query"); static const TQString msg_clear = i18n("Clear History"); - d->historyHead->addButton("select_item", msg_back, this, TQT_SLOT(slotSelectQuery())); - d->historyHead->addButton("edit-clear", msg_clear, d->history, TQT_SLOT(clear())); - d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, this, TQT_SLOT(slotSelectQuery())); - d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQT_SLOT(clear())); - connect(d->history, TQT_SIGNAL(currentItemDoubleClicked()), this, TQT_SLOT(slotSelectQuery())); + d->historyHead->addButton("select_item", msg_back, this, TQ_SLOT(slotSelectQuery())); + d->historyHead->addButton("edit-clear", msg_clear, d->history, TQ_SLOT(clear())); + d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, this, TQ_SLOT(slotSelectQuery())); + d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQ_SLOT(clear())); + connect(d->history, TQ_SIGNAL(currentItemDoubleClicked()), this, TQ_SLOT(slotSelectQuery())); d->heightForHistoryMode = -1; //height() / 2; //d->historyHead->hide(); @@ -320,7 +320,7 @@ KexiQueryDesignerSQLView::afterSwitchFrom(int mode) d->slotTextChangedEnabled = false; d->editor->setText( d->origStatement ); d->slotTextChangedEnabled = true; - TQTimer::singleShot(100, d->editor, TQT_SLOT(setFocus())); + TQTimer::singleShot(100, d->editor, TQ_SLOT(setFocus())); return true; } diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 883bf3cad..4c1c1c6e6 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -41,7 +41,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const m_history->setAutoDelete(true); m_popup = new TDEPopupMenu(this); - m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); + m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQ_SLOT(slotToClipboard())); } KexiQueryDesignerSQLHistory::~KexiQueryDesignerSQLHistory() @@ -162,12 +162,12 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e) KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *) { TDEPopupMenu p(this); - p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); + p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQ_SLOT(slotToClipboard())); #ifndef KEXI_NO_UNFINISHED p.insertSeparator(); - p.insertItem(SmallIcon("edit"), i18n("Edit"), this, TQT_SLOT(slotEdit())); + p.insertItem(SmallIcon("edit"), i18n("Edit"), this, TQ_SLOT(slotEdit())); p.insertItem(SmallIcon("reload"), i18n("Requery")); #endif diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp index aad6c9920..4882ea9d8 100644 --- a/kexi/plugins/queries/kexiquerypart.cpp +++ b/kexi/plugins/queries/kexiquerypart.cpp @@ -79,15 +79,15 @@ KexiQueryPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::It dialog->mainWin(), parent, "guieditor"); //needed for updating tables combo box: KexiProject *prj = dialog->mainWin()->project(); - connect(prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), - view, TQT_SLOT(slotNewItemStored(KexiPart::Item&))); - connect(prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), - view, TQT_SLOT(slotItemRemoved(const KexiPart::Item&))); - connect(prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), - view, TQT_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&))); - -// connect(dialog->mainWin()->project(), TQT_SIGNAL(tableCreated(KexiDB::TableSchema&)), -// view, TQT_SLOT(slotTableCreated(KexiDB::TableSchema&))); + connect(prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)), + view, TQ_SLOT(slotNewItemStored(KexiPart::Item&))); + connect(prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), + view, TQ_SLOT(slotItemRemoved(const KexiPart::Item&))); + connect(prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), + view, TQ_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&))); + +// connect(dialog->mainWin()->project(), TQ_SIGNAL(tableCreated(KexiDB::TableSchema&)), +// view, TQ_SLOT(slotTableCreated(KexiDB::TableSchema&))); return view; } else if (viewMode == Kexi::TextViewMode) { @@ -128,9 +128,9 @@ void KexiQueryPart::initInstanceActions( int mode, TDEActionCollection *col ) else if (mode==Kexi::DesignViewMode) { } else if (mode==Kexi::TextViewMode) { -// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query"); +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQ_SLOT(slotCheckQuery()), col, "querypart_check_query"); -//TODO new TDEAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query"); +//TODO new TDEAction(i18n("Execute Query"), "?????", 0, this, TQ_SLOT(checkQuery()), col, "querypart_execute_query"); } } #endif @@ -141,7 +141,7 @@ void KexiQueryPart::initPartActions() void KexiQueryPart::initInstanceActions() { -// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQ_SLOT(slotCheckQuery()), // m_instanceGuiClients[Kexi::DesignViewMode]->actionCollection(), "querypart_check_query"); TDEAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index 57753a302..2d11892dd 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -121,7 +121,7 @@ KexiReportFactory::createMenuActions(const TQCString &classname, TQWidget *w, Q_UNUSED(container); if(classname == "Label") { /*! @todo use TDEAction */ - menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); + menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQ_SLOT(editText())); return true; } return false; diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp index 2de5f4a7f..902bc1791 100644 --- a/kexi/plugins/reports/kexireportview.cpp +++ b/kexi/plugins/reports/kexireportview.cpp @@ -47,7 +47,7 @@ KexiReportScrollView::KexiReportScrollView(TQWidget *parent, bool preview) recordNavigator()->setLabelText(i18n("Page:")); recordNavigator()->setInsertingButtonVisible(false); } - connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted())); + connect(this, TQ_SIGNAL(resizingStarted()), this, TQ_SLOT(slotResizingStarted())); } KexiReportScrollView::~KexiReportScrollView() @@ -102,52 +102,52 @@ KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *parent, const char if (viewMode()==Kexi::DataViewMode) { m_scrollView->viewport()->setPaletteBackgroundColor(m_reportform->palette().active().background()); #if 0 - connect(reportPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); + connect(reportPart()->manager(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected())); #endif } else { - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set *, bool)), - this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set *, bool))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form *, bool)), - this, TQT_SLOT(slotDirty(KFormDesigner::Form *, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set *, bool)), + this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set *, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form *, bool)), + this, TQ_SLOT(slotDirty(KFormDesigner::Form *, bool))); // action stuff - /*connect(reportPart()->manager(), TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); - connect(reportPart()->manager(), TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); - connect(reportPart()->manager(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), this, TQT_SLOT(setUndoEnabled(bool))); - connect(reportPart()->manager(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), this, TQT_SLOT(setRedoEnabled(bool)));*/ - - plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget())); - plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget())); - plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget())); - plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget())); - plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQT_SLOT(selectAll())); - plugSharedAction("reportpart_clear_contents", KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent())); - plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQT_SLOT(undo())); - plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo())); - - plugSharedAction("reportpart_format_raise", KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()) ); - plugSharedAction("reportpart_format_lower", KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()) ); + /*connect(reportPart()->manager(), TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); + connect(reportPart()->manager(), TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); + connect(reportPart()->manager(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), this, TQ_SLOT(setUndoEnabled(bool))); + connect(reportPart()->manager(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), this, TQ_SLOT(setRedoEnabled(bool)));*/ + + plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget())); + plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget())); + plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget())); + plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget())); + plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQ_SLOT(selectAll())); + plugSharedAction("reportpart_clear_contents", KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent())); + plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQ_SLOT(undo())); + plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQ_SLOT(redo())); + + plugSharedAction("reportpart_format_raise", KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()) ); + plugSharedAction("reportpart_format_lower", KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()) ); plugSharedAction("reportpart_align_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("reportpart_align_to_left", KFormDesigner::FormManager::self(),TQT_SLOT(alignWidgetsToLeft()) ); - plugSharedAction("reportpart_align_to_right", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()) ); - plugSharedAction("reportpart_align_to_top", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()) ); - plugSharedAction("reportpart_align_to_bottom", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()) ); - plugSharedAction("reportpart_align_to_grid", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()) ); + plugSharedAction("reportpart_align_to_left", KFormDesigner::FormManager::self(),TQ_SLOT(alignWidgetsToLeft()) ); + plugSharedAction("reportpart_align_to_right", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()) ); + plugSharedAction("reportpart_align_to_top", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()) ); + plugSharedAction("reportpart_align_to_bottom", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()) ); + plugSharedAction("reportpart_align_to_grid", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()) ); plugSharedAction("reportpart_adjust_size_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("reportpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()) ); - plugSharedAction("reportpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()) ); - plugSharedAction("reportpart_adjust_height_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()) ); - plugSharedAction("reportpart_adjust_height_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()) ); - plugSharedAction("reportpart_adjust_width_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()) ); - plugSharedAction("reportpart_adjust_width_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()) ); + plugSharedAction("reportpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()) ); + plugSharedAction("reportpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()) ); + plugSharedAction("reportpart_adjust_height_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()) ); + plugSharedAction("reportpart_adjust_height_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()) ); + plugSharedAction("reportpart_adjust_width_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()) ); + plugSharedAction("reportpart_adjust_width_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()) ); } initForm(); - connect(this, TQT_SIGNAL(focus(bool)), this, TQT_SLOT(slotFocus(bool))); + connect(this, TQ_SIGNAL(focus(bool)), this, TQ_SLOT(slotFocus(bool))); /// @todo skip this if ther're no borders // m_reportform->resize( m_reportform->size()+TQSize(m_scrollView->verticalScrollBar()->width(), m_scrollView->horizontalScrollBar()->height()) ); } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index 4348aae2c..b6cf85f48 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -88,18 +88,18 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa d->statusbrowser->installEventFilter(this); splitter->setResizeMode(d->statusbrowser, TQSplitter::KeepSize); - plugSharedAction( "data_execute", this, TQT_SLOT(execute()) ); + plugSharedAction( "data_execute", this, TQ_SLOT(execute()) ); if(KexiEditor::isAdvancedEditor()) // the configeditor is only in advanced mode avaiable. - plugSharedAction( "script_config_editor", d->editor, TQT_SLOT(slotConfigureEditor()) ); + plugSharedAction( "script_config_editor", d->editor, TQ_SLOT(slotConfigureEditor()) ); loadData(); d->properties = new KoProperty::Set(this, "KexiScripting"); - connect(d->properties, TQT_SIGNAL( propertyChanged(KoProperty::Set&, KoProperty::Property&) ), - this, TQT_SLOT( slotPropertyChanged(KoProperty::Set&, KoProperty::Property&) )); + connect(d->properties, TQ_SIGNAL( propertyChanged(KoProperty::Set&, KoProperty::Property&) ), + this, TQ_SLOT( slotPropertyChanged(KoProperty::Set&, KoProperty::Property&) )); // To schedule the initialize fixes a crasher in Kate. - TQTimer::singleShot(50, this, TQT_SLOT( initialize() )); + TQTimer::singleShot(50, this, TQ_SLOT( initialize() )); } KexiScriptDesignView::~KexiScriptDesignView() diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp index 8e4db059a..75afc420c 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -62,7 +62,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction) d->scriptaction = scriptaction; Q_ASSERT(d->scriptaction); - disconnect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + disconnect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); TQString code = d->scriptaction->getCode(); if(code.isNull()) { @@ -85,7 +85,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction) clearUndoRedo(); KexiEditor::setDirty(false); - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); } void KexiScriptEditor::slotTextChanged() diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index fe3453ab4..22527f532 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -102,7 +102,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender) } if(exec) { - //TQTimer::singleShot(10, scriptaction, TQT_SLOT(activate())); + //TQTimer::singleShot(10, scriptaction, TQ_SLOT(activate())); d->scriptguiclient->executeScriptAction( scriptaction ); } } diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py index 6ecbea5ff..4bde164bb 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py @@ -105,10 +105,10 @@ def runGuiApp(copycenter, name): btnbox.setSpacing(6) self.okbtn = tqt.TQPushButton(btnbox) self.okbtn.setText("Ok") - #tqt.TQObject.connect(okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + #tqt.TQObject.connect(okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) self.cancelbtn = tqt.TQPushButton(btnbox) self.cancelbtn.setText("Cancel") - tqt.TQObject.connect(self.cancelbtn, tqt.SIGNAL("clicked()"), self.close) + tqt.TQObject.connect(self.cancelbtn, tqt.TQ_SIGNAL("clicked()"), self.close) box.setMinimumSize(tqt.TQSize(460,380)) def addItem(self,valuelist,afteritem = None): if afteritem == None: @@ -136,7 +136,7 @@ def runGuiApp(copycenter, name): self.jobfilecombobox.setEditable(True) self.jobfilecombobox.insertItem("") label.setBuddy(self.jobfilecombobox) - tqt.TQObject.connect(self.jobfilecombobox, tqt.SIGNAL("textChanged(const TQString&)"), self.jobfilecomboboxChanged) + tqt.TQObject.connect(self.jobfilecombobox, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.jobfilecomboboxChanged) import os import re @@ -147,10 +147,10 @@ def runGuiApp(copycenter, name): loadbtn = tqt.TQPushButton(typebox) loadbtn.setText("Open...") - tqt.TQObject.connect(loadbtn, tqt.SIGNAL("clicked()"), self.openClicked) + tqt.TQObject.connect(loadbtn, tqt.TQ_SIGNAL("clicked()"), self.openClicked) savebtn = tqt.TQPushButton(typebox) savebtn.setText("Save...") - tqt.TQObject.connect(savebtn, tqt.SIGNAL("clicked()"), self.saveClicked) + tqt.TQObject.connect(savebtn, tqt.TQ_SIGNAL("clicked()"), self.saveClicked) self.listview = tqt.TQListView(self) self.listview.setAllColumnsShowFocus(True) @@ -159,8 +159,8 @@ def runGuiApp(copycenter, name): self.listview.header().setClickEnabled(False) self.listview.addColumn("Name") self.listview.addColumn("Value") - tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.doubleClicked) - #tqt.TQObject.connect(self.listview, tqt.SIGNAL("itemRenamed(TQListViewItem*, int, const TQString&)"), self.itemRenamed) + tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.doubleClicked) + #tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("itemRenamed(TQListViewItem*, int, const TQString&)"), self.itemRenamed) def doubleClicked(self, **args): print("CopyJobWidget.doubleClicked") @@ -339,10 +339,10 @@ def runGuiApp(copycenter, name): self.donebtn = tqt.TQPushButton(btnbox) self.donebtn.setText("Done") self.donebtn.setEnabled(False) - tqt.TQObject.connect(self.donebtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(self.donebtn,tqt.TQ_SIGNAL("clicked()"),self.close) self.cancelbtn = tqt.TQPushButton(btnbox) self.cancelbtn.setText("Cancel") - tqt.TQObject.connect(self.cancelbtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(self.cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close) box.setMinimumSize( tqt.TQSize(500,380) ) def updateStates(self): @@ -375,7 +375,7 @@ def runGuiApp(copycenter, name): self.starttime = tqt.TQTime() self.updatetimer = tqt.TQTimer(self) - tqt.TQObject.connect(self.updatetimer,tqt.SIGNAL("timeout()"),self.updateStates) + tqt.TQObject.connect(self.updatetimer,tqt.TQ_SIGNAL("timeout()"),self.updateStates) # Initialize the source sourcename = self.dialog.getSourcePluginName() @@ -469,7 +469,7 @@ def runGuiApp(copycenter, name): except: import traceback print("".join( traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2]) )) - tqt.TQObject.connect(self.combobox, tqt.SIGNAL("activated(int)"), self.activated) + tqt.TQObject.connect(self.combobox, tqt.TQ_SIGNAL("activated(int)"), self.activated) def updatePlugin(self): print("DataSelector.updatePlugin") @@ -570,10 +570,10 @@ def runGuiApp(copycenter, name): okbtn = tqt.TQPushButton(btnbox) okbtn.setText("Start Copy") okbtn.setDefault(True) - tqt.TQObject.connect(okbtn,tqt.SIGNAL("clicked()"),self.startCopy) + tqt.TQObject.connect(okbtn,tqt.TQ_SIGNAL("clicked()"),self.startCopy) cancelbtn = tqt.TQPushButton(btnbox) cancelbtn.setText("Cancel") - tqt.TQObject.connect(cancelbtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close) self.tab.addTab(self.splitter,"Copy") self.tab.setCurrentPage(1) @@ -582,7 +582,7 @@ def runGuiApp(copycenter, name): self.helpbrowser.setLinkUnderline(False) self.helpbrowser.setUndoRedoEnabled(False) self.tab.addTab(self.helpbrowser,"Help") - tqt.TQObject.connect(self.tab,tqt.SIGNAL("currentChanged(TQWidget*)"),self.currentTabChanged) + tqt.TQObject.connect(self.tab,tqt.TQ_SIGNAL("currentChanged(TQWidget*)"),self.currentTabChanged) box.setMinimumSize( tqt.TQSize(760,500) ) diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py index 8c6c431b7..87cbfb89b 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py @@ -227,8 +227,8 @@ class CopyCenterPlugin: prjlabel.setBuddy(self.prjcombo) prjsavebtn = tqt.TQPushButton("...",self) - tqt.TQObject.connect(prjsavebtn, tqt.SIGNAL("clicked()"),self.buttonClicked) - tqt.TQObject.connect(self.prjcombo, tqt.SIGNAL("textChanged(const TQString&)"), self.main.projectChanged) + tqt.TQObject.connect(prjsavebtn, tqt.TQ_SIGNAL("clicked()"),self.buttonClicked) + tqt.TQObject.connect(self.prjcombo, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.main.projectChanged) self.setStretchFactor(self.prjcombo,1) def buttonClicked(self): text = str(self.prjcombo.currentText()) @@ -258,7 +258,7 @@ class CopyCenterPlugin: for driver in self.copycenterplugin.drivermanager.driverNames(): self.drivercombo.insertItem(driver) - tqt.TQObject.connect(self.drivercombo, tqt.SIGNAL("activated(int)"), self.activated) + tqt.TQObject.connect(self.drivercombo, tqt.TQ_SIGNAL("activated(int)"), self.activated) driverlabel.setBuddy(self.drivercombo) driverbox.setStretchFactor(self.drivercombo,1) @@ -291,7 +291,7 @@ class CopyCenterPlugin: filelabel.setBuddy(self.fileedit) filebox.setStretchFactor(self.fileedit,1) filebtn = tqt.TQPushButton("...",filebox) - tqt.TQObject.connect(filebtn, tqt.SIGNAL("clicked()"), self.fileClicked) + tqt.TQObject.connect(filebtn, tqt.TQ_SIGNAL("clicked()"), self.fileClicked) else: hostbox = tqt.TQHBox(mainbox) hostlabel = tqt.TQLabel("Hostname:",hostbox) @@ -307,13 +307,13 @@ class CopyCenterPlugin: sockbox = tqt.TQHBox(mainbox) self.sockfilecheckbox = tqt.TQCheckBox("Socket File:",sockbox) - tqt.TQObject.connect(self.sockfilecheckbox, tqt.SIGNAL("toggled(bool)"), self.sockfilecheckboxClicked) + tqt.TQObject.connect(self.sockfilecheckbox, tqt.TQ_SIGNAL("toggled(bool)"), self.sockfilecheckboxClicked) self.sockfilebox = tqt.TQHBox(sockbox) self.sockfileedit = tqt.TQLineEdit(self.plugin.options['socketfile'],self.sockfilebox) self.sockfilebox.setEnabled(False) sockfilebtn = tqt.TQPushButton("...",self.sockfilebox) self.sockfilecheckbox.setChecked( str(self.plugin.options['usesocketfile']) == str(True) ) - tqt.TQObject.connect(sockfilebtn, tqt.SIGNAL("clicked()"), self.sockfileClicked) + tqt.TQObject.connect(sockfilebtn, tqt.TQ_SIGNAL("clicked()"), self.sockfileClicked) self.sockfilebox.setStretchFactor(self.sockfileedit,1) sockbox.setStretchFactor(self.sockfilebox,1) @@ -372,7 +372,7 @@ class CopyCenterPlugin: self.tableedit = tqt.TQLineEdit(self.plugin.options['table'],self) self.tablebtn = tqt.TQPushButton("...",self) self.tablebtn.setEnabled(False) - tqt.TQObject.connect(self.tablebtn, tqt.SIGNAL("clicked()"), self.buttonClicked) + tqt.TQObject.connect(self.tablebtn, tqt.TQ_SIGNAL("clicked()"), self.buttonClicked) tablelabel.setBuddy(self.tableedit) self.setStretchFactor(self.tableedit,1) def buttonClicked(self): @@ -392,8 +392,8 @@ class CopyCenterPlugin: if table == text: self.listview.setSelected(item,True) self.listview.ensureItemVisible(item) - tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): item = self.listview.selectedItem() if item == None: @@ -416,7 +416,7 @@ class CopyCenterPlugin: fieldslabel.setBuddy(self.fieldsedit) self.fieldsbtn = tqt.TQPushButton("...",self) self.fieldsbtn.setEnabled(False) - tqt.TQObject.connect(self.fieldsbtn, tqt.SIGNAL("clicked()"), self.fieldsClicked) + tqt.TQObject.connect(self.fieldsbtn, tqt.TQ_SIGNAL("clicked()"), self.fieldsClicked) def fieldsClicked(self): ListViewDialog = self.copycenterplugin.dialog.ListViewDialog class FieldsDialog(ListViewDialog): @@ -441,7 +441,7 @@ class CopyCenterPlugin: item = self.addItem(( field.name(),field.type(),",".join(opts) ),item) if allfields or field.name() in fieldslist: self.listview.setSelected(item,True) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): selitems = [] item = self.listview.firstChild() @@ -477,15 +477,15 @@ class CopyCenterPlugin: statusbar.setStretchFactor(tqt.TQWidget(statusbar),1) self.connectbtn = tqt.TQPushButton("Connect",statusbar) self.connectbtn.setEnabled(False) - tqt.TQObject.connect(self.connectbtn, tqt.SIGNAL("clicked()"),self.connectClicked) + tqt.TQObject.connect(self.connectbtn, tqt.TQ_SIGNAL("clicked()"),self.connectClicked) self.disconnectbtn = tqt.TQPushButton("Disconnect",statusbar) self.disconnectbtn.setEnabled(False) - tqt.TQObject.connect(self.disconnectbtn, tqt.SIGNAL("clicked()"),self.disconnectClicked) + tqt.TQObject.connect(self.disconnectbtn, tqt.TQ_SIGNAL("clicked()"),self.disconnectClicked) #self.connectionbox = ConnectionBox(copycenterplugin,plugin,parent) self.tablebox = TableBox(copycenterplugin,plugin,parent) self.fieldbox = FieldBox(copycenterplugin,plugin,parent) - tqt.TQObject.connect(self.tablebox.tableedit, tqt.SIGNAL("textChanged(const TQString&)"), self.fieldbox.tableChanged) + tqt.TQObject.connect(self.tablebox.tableedit, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.fieldbox.tableChanged) if self.plugin.options['project'] != '': self.prjbox.prjcombo.setCurrentText(self.plugin.options['project']) diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py index 8f983eb51..9cb8ef932 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py @@ -234,8 +234,8 @@ class CopyCenterPlugin: if table == text: self.listview.setSelected(item,True) self.listview.ensureItemVisible(item) - tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): item = self.listview.selectedItem() if item == None: @@ -267,7 +267,7 @@ class CopyCenterPlugin: item = self.addItem((fieldinfo.name(), tqt.TQVariant.typeToName(fieldinfo.type()), opts),item) if allfields or fieldinfo.name() in fieldslist: self.listview.setSelected(item,True) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): selitems = [] item = self.listview.firstChild() @@ -335,18 +335,18 @@ class CopyCenterPlugin: statusbar.setSpacing(2) statusbar.setStretchFactor(tqt.TQWidget(statusbar),1) self.connectbtn = tqt.TQPushButton("Connect",statusbar) - tqt.TQObject.connect(self.connectbtn, tqt.SIGNAL("clicked()"),self.connectClicked) + tqt.TQObject.connect(self.connectbtn, tqt.TQ_SIGNAL("clicked()"),self.connectClicked) self.disconnectbtn = tqt.TQPushButton("Disconnect",statusbar) self.disconnectbtn.setEnabled(False) - tqt.TQObject.connect(self.disconnectbtn, tqt.SIGNAL("clicked()"),self.disconnectClicked) + tqt.TQObject.connect(self.disconnectbtn, tqt.TQ_SIGNAL("clicked()"),self.disconnectClicked) tablebox = tqt.TQHBox(parent) tablelabel = tqt.TQLabel("Table:",tablebox) self.tableedit = tqt.TQLineEdit(self.plugin.options['table'],tablebox) - tqt.TQObject.connect(self.tableedit, tqt.SIGNAL("textChanged(const TQString&)"), self.tableEditChanged) + tqt.TQObject.connect(self.tableedit, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.tableEditChanged) self.tablebtn = tqt.TQPushButton("...",tablebox) self.tablebtn.setEnabled(False) - tqt.TQObject.connect(self.tablebtn, tqt.SIGNAL("clicked()"), self.tableBtnClicked) + tqt.TQObject.connect(self.tablebtn, tqt.TQ_SIGNAL("clicked()"), self.tableBtnClicked) tablelabel.setBuddy(self.tableedit) tablebox.setStretchFactor(self.tableedit,1) @@ -355,7 +355,7 @@ class CopyCenterPlugin: self.fieldedit = tqt.TQLineEdit(self.plugin.options['fields'],fieldbox) self.fieldbtn = tqt.TQPushButton("...",fieldbox) self.fieldbtn.setEnabled(False) - tqt.TQObject.connect(self.fieldbtn, tqt.SIGNAL("clicked()"), self.fieldBtnClicked) + tqt.TQObject.connect(self.fieldbtn, tqt.TQ_SIGNAL("clicked()"), self.fieldBtnClicked) fieldlabel.setBuddy(self.fieldedit) fieldbox.setStretchFactor(self.fieldedit,1) @@ -381,7 +381,7 @@ class CopyCenterPlugin: operationlabel.setBuddy(self.mainwidget.operationedit) opbox.setStretchFactor(self.mainwidget.operationedit,1) self.box = None - tqt.TQObject.connect(self.mainwidget.operationedit, tqt.SIGNAL("activated(int)"), self.operationActivated) + tqt.TQObject.connect(self.mainwidget.operationedit, tqt.TQ_SIGNAL("activated(int)"), self.operationActivated) self.operationActivated() def operationActivated(self, **args): if self.box: diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index f718efd0c..c25bbc99a 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -152,14 +152,14 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) d->gotoRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight()); TQToolTip::add(d->gotoRowSourceButton, i18n("Go to selected row source")); hlyr->addWidget(d->gotoRowSourceButton); - connect(d->gotoRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelectedRowSource())); + connect(d->gotoRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelectedRowSource())); d->clearRowSourceButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearRowSourceButton"); d->clearRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight()); TQToolTip::add(d->clearRowSourceButton, i18n("Clear row source")); hlyr->addWidget(d->clearRowSourceButton); - connect(d->clearRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearRowSourceSelection())); + connect(d->clearRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearRowSourceSelection())); d->rowSourceCombo = new KexiDataSourceComboBox(contents, "rowSourceCombo"); d->rowSourceLabel->setBuddy(d->rowSourceCombo); @@ -181,7 +181,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) d->clearBoundColumnButton->setMinimumHeight(d->boundColumnLabel->minimumHeight()); TQToolTip::add(d->clearBoundColumnButton, i18n("Clear bound column")); hlyr->addWidget(d->clearBoundColumnButton); - connect(d->clearBoundColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearBoundColumnSelection())); + connect(d->clearBoundColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearBoundColumnSelection())); d->boundColumnCombo = new KexiFieldComboBox(contents, "boundColumnCombo"); d->boundColumnLabel->setBuddy(d->boundColumnCombo); @@ -203,7 +203,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) d->clearVisibleColumnButton->setMinimumHeight(d->visibleColumnLabel->minimumHeight()); TQToolTip::add(d->clearVisibleColumnButton, i18n("Clear visible column")); hlyr->addWidget(d->clearVisibleColumnButton); - connect(d->clearVisibleColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearVisibleColumnSelection())); + connect(d->clearVisibleColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearVisibleColumnSelection())); d->visibleColumnCombo = new KexiFieldComboBox(contents, "visibleColumnCombo"); d->visibleColumnLabel->setBuddy(d->visibleColumnCombo); @@ -211,11 +211,11 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) vlyr->addStretch(1); - connect(d->rowSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotRowSourceTextChanged(const TQString &))); - connect(d->rowSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotRowSourceChanged())); - connect(d->boundColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotBoundColumnSelected())); - connect(d->visibleColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotVisibleColumnSelected())); + connect(d->rowSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotRowSourceTextChanged(const TQString &))); + connect(d->rowSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotRowSourceChanged())); + connect(d->boundColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotBoundColumnSelected())); + connect(d->visibleColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotVisibleColumnSelected())); clearBoundColumnSelection(); clearVisibleColumnSelection(); diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index d092bf899..c641c9cd2 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -159,46 +159,46 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare d->view->setSpreadSheetMode(); - connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), - this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); - connect(d->data, TQT_SIGNAL(rowUpdated(KexiTableItem*)), - this, TQT_SLOT(slotRowUpdated(KexiTableItem*))); - //connect(d->data, TQT_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)), - // this, TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool))); - connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), - this, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); + connect(d->data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), + this, TQ_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + connect(d->data, TQ_SIGNAL(rowUpdated(KexiTableItem*)), + this, TQ_SLOT(slotRowUpdated(KexiTableItem*))); + //connect(d->data, TQ_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)), + // this, TQ_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool))); + connect(d->data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), + this, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height()); d->view->setFocus(); d->sets = new KexiDataAwarePropertySet( this, d->view ); - connect(d->sets, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(updateActions())); - connect(d->sets, TQT_SIGNAL(rowInserted()), this, TQT_SLOT(slotRowInserted())); + connect(d->sets, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(updateActions())); + connect(d->sets, TQ_SIGNAL(rowInserted()), this, TQ_SLOT(slotRowInserted())); d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu()); d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0); - connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowContextMenu())); + connect(d->view->contextMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowContextMenu())); - plugSharedAction("tablepart_toggle_pkey", this, TQT_SLOT(slotTogglePrimaryKey())); + plugSharedAction("tablepart_toggle_pkey", this, TQ_SLOT(slotTogglePrimaryKey())); d->action_toggle_pkey = static_cast<TDEToggleAction*>( sharedAction("tablepart_toggle_pkey") ); d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning d->view->contextMenu()->insertSeparator(2); setAvailable("tablepart_toggle_pkey", !conn->isReadOnly()); #ifndef KEXI_NO_UNDOREDO_ALTERTABLE - plugSharedAction("edit_undo", this, TQT_SLOT(slotUndo())); - plugSharedAction("edit_redo", this, TQT_SLOT(slotRedo())); + plugSharedAction("edit_undo", this, TQ_SLOT(slotUndo())); + plugSharedAction("edit_redo", this, TQ_SLOT(slotRedo())); setAvailable("edit_undo", false); setAvailable("edit_redo", false); - connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), this, TQT_SLOT(slotCommandExecuted(KCommand*))); + connect(d->history, TQ_SIGNAL(commandExecuted(KCommand*)), this, TQ_SLOT(slotCommandExecuted(KCommand*))); #endif #ifdef KEXI_DEBUG_GUI KexiUtils::addAlterTableActionDebug(TQString()); //to create the tab KexiUtils::connectPushButtonActionForDebugWindow( - "simulateAlterTableExecution", this, TQT_SLOT(slotSimulateAlterTableExecution())); + "simulateAlterTableExecution", this, TQ_SLOT(slotSimulateAlterTableExecution())); KexiUtils::connectPushButtonActionForDebugWindow( - "executeRealAlterTable", this, TQT_SLOT(executeRealAlterTable())); + "executeRealAlterTable", this, TQ_SLOT(executeRealAlterTable())); #endif } @@ -308,8 +308,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b KoProperty::Set *set = new KoProperty::Set(d->sets, typeName); if (mainWin()->project()->dbConnection()->isReadOnly()) set->setReadOnly( true ); -// connect(buff,TQT_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)), -// this, TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&))); +// connect(buff,TQ_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)), +// this, TQ_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&))); KoProperty::Property *prop; @@ -456,8 +456,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b //---- d->updatePropertiesVisibility(field.type(), *set); - connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); d->sets->insert(row, set, newOne); return set; @@ -1556,7 +1556,7 @@ void KexiTableDesignerView::slotSimulateAlterTableExecution() tristate KexiTableDesignerView::executeRealAlterTable() { TQSignal signal; - signal.connect( mainWin(), TQT_SLOT(slotProjectSave()) ); + signal.connect( mainWin(), TQ_SLOT(slotProjectSave()) ); d->tempStoreDataUsingRealAlterTable = true; d->recentResultOfStoreData = false; signal.activate(); //will call KexiMainWindowImpl::slotProjectSaveAs() and thus storeData() diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index e1c3cd22d..d709da335 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -222,18 +222,18 @@ void KexiTablePart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow { if (!d->lookupColumnPage) { d->lookupColumnPage = new KexiLookupColumnPage(0); - connect(d->lookupColumnPage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), - mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&))); + connect(d->lookupColumnPage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), + mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&))); //! @todo add "Table" tab /* - connect(d->dataSourcePage, TQT_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), - KFormDesigner::FormManager::self(), TQT_SLOT(setFormDataSource(const TQCString&, const TQCString&))); - connect(d->dataSourcePage, TQT_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), - KFormDesigner::FormManager::self(), TQT_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); - connect(d->dataSourcePage, TQT_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), - KFormDesigner::FormManager::self(), TQT_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));*/ + connect(d->dataSourcePage, TQ_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), + KFormDesigner::FormManager::self(), TQ_SLOT(setFormDataSource(const TQCString&, const TQCString&))); + connect(d->dataSourcePage, TQ_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), + KFormDesigner::FormManager::self(), TQ_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); + connect(d->dataSourcePage, TQ_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), + KFormDesigner::FormManager::self(), TQ_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));*/ } KexiProject *prj = mainWin->project(); diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp index 39e8e684b..8aea3dd9c 100644 --- a/kexi/tests/altertable/altertable.cpp +++ b/kexi/tests/altertable/altertable.cpp @@ -220,8 +220,8 @@ AlterTableTester::AlterTableTester() TQPtrList<TQNetworkOperation> list = m_copyOperator.copy( "file://" + TQDir::current().path() + "/" + origDbFilename, "file://" + TQDir::current().path() + "/" + dbFilename, false, false ); - connect(&m_copyOperator, TQT_SIGNAL(finished(TQNetworkOperation*)), - this, TQT_SLOT(slotFinishedCopying(TQNetworkOperation*))); + connect(&m_copyOperator, TQ_SIGNAL(finished(TQNetworkOperation*)), + this, TQ_SLOT(slotFinishedCopying(TQNetworkOperation*))); } AlterTableTester::~AlterTableTester() @@ -698,7 +698,7 @@ int main(int argc, char *argv[]) win = KexiMainWindowImpl::self(); AlterTableTester tester; - //TQObject::connect(win, TQT_SIGNAL(projectOpened()), &tester, TQT_SLOT(run())); + //TQObject::connect(win, TQ_SIGNAL(projectOpened()), &tester, TQ_SLOT(run())); bool closeAppRequested; res = tester.run(closeAppRequested); diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp index 88de40e8b..86e127324 100644 --- a/kexi/tests/widgets/kexidbdrivercombotest.cpp +++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp @@ -67,7 +67,7 @@ int main(int argc, char** argv) vbLayout->addWidget(quit); // Show the whole lot - TQObject::connect(quit, TQT_SIGNAL(clicked()), app, TQT_SLOT(quit())); + TQObject::connect(quit, TQ_SIGNAL(clicked()), app, TQ_SLOT(quit())); vbox->show(); app->exec(); diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 6a17bc94b..44b957af9 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -91,7 +91,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features lyr->addWidget(m_list); m_list->installEventFilter(this); m_list->renameLineEdit()->installEventFilter(this); - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); slotSettingsChanged(0); m_list->header()->hide(); @@ -103,28 +103,28 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_list->setTooltipColumn(0); m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(this) ); m_list->setResizeMode(TQListView::LastColumn); - connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); - connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, - TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_list, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); + connect(m_list, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, + TQ_SLOT(slotSelectionChanged(TQListViewItem*))); TDEConfig *config = kapp->config(); config->setGroup("MainWindow"); if ((m_features & SingleClickOpensItemOptionEnabled) && config->readBoolEntry("SingleClickOpensItem", false)) { - connect(m_list, TQT_SIGNAL(executed(TQListViewItem*)), this, - TQT_SLOT(slotExecuteItem(TQListViewItem*))); + connect(m_list, TQ_SIGNAL(executed(TQListViewItem*)), this, + TQ_SLOT(slotExecuteItem(TQListViewItem*))); } else { - connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, - TQT_SLOT(slotExecuteItem(TQListViewItem*))); + connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, + TQ_SLOT(slotExecuteItem(TQListViewItem*))); m_list->enableExecuteArea = false; } // actions m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, this, - TQT_SLOT(slotOpenObject()), this, "open_object"); + TQ_SLOT(slotOpenObject()), this, "open_object"); m_openAction->setToolTip(i18n("Open object")); m_openAction->setWhatsThis(i18n("Opens object selected in the list")); @@ -146,20 +146,20 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } else { m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", 0/*TQt::Key_Delete*/, - this, TQT_SLOT(slotRemove()), m_actions, "edit_delete"); + this, TQ_SLOT(slotRemove()), m_actions, "edit_delete"); //! @todo 1.1: just add "Delete" tooltip and what's this m_deleteAction->setToolTip(i18n("&Delete").replace("&","")); m_renameAction = new TDEAction(i18n("&Rename"), "", 0, - this, TQT_SLOT(slotRename()), m_actions, "edit_rename"); + this, TQ_SLOT(slotRename()), m_actions, "edit_rename"); #ifdef KEXI_SHOW_UNIMPLEMENTED - //todo plugSharedAction("edit_cut",TQT_SLOT(slotCut())); - //todo plugSharedAction("edit_copy",TQT_SLOT(slotCopy())); - //todo plugSharedAction("edit_paste",TQT_SLOT(slotPaste())); + //todo plugSharedAction("edit_cut",TQ_SLOT(slotCut())); + //todo plugSharedAction("edit_copy",TQ_SLOT(slotCopy())); + //todo plugSharedAction("edit_paste",TQ_SLOT(slotPaste())); #endif m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, this, - TQT_SLOT(slotDesignObject()), this, "design_object"); + TQ_SLOT(slotDesignObject()), this, "design_object"); m_designAction->setToolTip(i18n("Design object")); m_designAction->setWhatsThis(i18n("Starts designing of the object selected in the list")); if (m_features & Toolbar) { @@ -168,20 +168,20 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, this, - TQT_SLOT(slotEditTextObject()), this, "editText_object"); + TQ_SLOT(slotEditTextObject()), this, "editText_object"); m_editTextAction->setToolTip(i18n("Open object in text view")); m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view")); - m_newObjectAction = new TDEAction("", "document-new", 0, this, TQT_SLOT(slotNewObject()), this, "new_object"); + m_newObjectAction = new TDEAction("", "document-new", 0, this, TQ_SLOT(slotNewObject()), this, "new_object"); if (m_features & Toolbar) { m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object"); m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup"); - connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotNewObjectPopupAboutToShow())); + connect(m_newObjectPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotNewObjectPopupAboutToShow())); // KexiPart::Part* part = Kexi::partManager().part("kexi/table"); // m_newObjectPopup->insertItem( SmallIconSet(part->info()->createItemIcon()), part->instanceName() ); m_newObjectToolButton->setPopup(m_newObjectPopup); m_newObjectToolButton->setPopupDelay(TQApplication::startDragTime()); - connect(m_newObjectToolButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewObject())); + connect(m_newObjectToolButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewObject())); buttons_flyr->add(m_newObjectToolButton); m_deleteObjectToolButton = new KexiSmallToolButton(this, m_deleteAction); @@ -191,21 +191,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, this, - TQT_SLOT(slotExecuteObject()), this, "data_execute"); + TQ_SLOT(slotExecuteObject()), this, "data_execute"); m_exportActionMenu = new TDEActionMenu(i18n("Export")); m_dataExportAction = new TDEAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), - "table", 0, this, TQT_SLOT(slotExportAsDataTable()), this, "exportAsDataTable"); + "table", 0, this, TQ_SLOT(slotExportAsDataTable()), this, "exportAsDataTable"); m_dataExportAction->setWhatsThis( i18n("Exports data from the currently selected table or query data to a file.")); m_exportActionMenu->insert( m_dataExportAction ); m_printAction = new TDEAction(i18n("&Print..."), "document-print", 0, this, - TQT_SLOT(slotPrintItem()), this, "printItem"); + TQ_SLOT(slotPrintItem()), this, "printItem"); m_printAction->setWhatsThis( i18n("Prints data from the currently selected table or query.")); m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, this, - TQT_SLOT(slotPageSetupForItem()), this, "pageSetupForItem"); + TQ_SLOT(slotPageSetupForItem()), this, "pageSetupForItem"); m_pageSetupAction->setWhatsThis( i18n("Shows page setup for printing the active table or query.")); diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 6c61009bf..893a91033 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -45,15 +45,15 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti setViewWidget(m_internalView, true); if (!noDataAware) { - m_dataAwareObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int))); + m_dataAwareObject->connectCellSelectedSignal(this, TQ_SLOT(slotCellSelected(int,int))); //! before closing - we'are accepting editing - connect(this, TQT_SIGNAL(closing(bool&)), this, TQT_SLOT(slotClosing(bool&))); + connect(this, TQ_SIGNAL(closing(bool&)), this, TQ_SLOT(slotClosing(bool&))); //! updating actions on start/stop editing - m_dataAwareObject->connectRowEditStartedSignal(this, TQT_SLOT(slotUpdateRowActions(int))); - m_dataAwareObject->connectRowEditTerminatedSignal(this, TQT_SLOT(slotUpdateRowActions(int))); - m_dataAwareObject->connectReloadActionsSignal(this, TQT_SLOT(reloadActions())); + m_dataAwareObject->connectRowEditStartedSignal(this, TQ_SLOT(slotUpdateRowActions(int))); + m_dataAwareObject->connectRowEditTerminatedSignal(this, TQ_SLOT(slotUpdateRowActions(int))); + m_dataAwareObject->connectReloadActionsSignal(this, TQ_SLOT(reloadActions())); } TQVBoxLayout *box = new TQVBoxLayout(this); @@ -72,37 +72,37 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti void KexiDataAwareView::initActions() { - plugSharedAction("edit_delete_row", this, TQT_SLOT(deleteCurrentRow())); + plugSharedAction("edit_delete_row", this, TQ_SLOT(deleteCurrentRow())); m_actionClient->plugSharedAction(sharedAction("edit_delete_row")); //for proper shortcut - plugSharedAction("edit_delete", this, TQT_SLOT(deleteAndStartEditCurrentCell())); + plugSharedAction("edit_delete", this, TQ_SLOT(deleteAndStartEditCurrentCell())); m_actionClient->plugSharedAction(sharedAction("edit_delete")); //for proper shortcut - plugSharedAction("edit_edititem", this, TQT_SLOT(startEditOrToggleValue())); + plugSharedAction("edit_edititem", this, TQ_SLOT(startEditOrToggleValue())); m_actionClient->plugSharedAction(sharedAction("edit_edititem")); //for proper shortcut - plugSharedAction("data_save_row", this, TQT_SLOT(acceptRowEdit())); + plugSharedAction("data_save_row", this, TQ_SLOT(acceptRowEdit())); m_actionClient->plugSharedAction(sharedAction("data_save_row")); //for proper shortcut - plugSharedAction("data_cancel_row_changes", this, TQT_SLOT(cancelRowEdit())); + plugSharedAction("data_cancel_row_changes", this, TQ_SLOT(cancelRowEdit())); m_actionClient->plugSharedAction(sharedAction("data_cancel_row_changes")); //for proper shortcut if (m_dataAwareObject->isSortingEnabled()) { - plugSharedAction("data_sort_az", this, TQT_SLOT(sortAscending())); - plugSharedAction("data_sort_za", this, TQT_SLOT(sortDescending())); + plugSharedAction("data_sort_az", this, TQ_SLOT(sortAscending())); + plugSharedAction("data_sort_za", this, TQ_SLOT(sortDescending())); } m_actionClient->plugSharedAction(sharedAction("edit_insert_empty_row")); //for proper shortcut setAvailable("data_sort_az", m_dataAwareObject->isSortingEnabled()); setAvailable("data_sort_za", m_dataAwareObject->isSortingEnabled()); -//! \todo plugSharedAction("data_filter", this, TQT_SLOT(???())); +//! \todo plugSharedAction("data_filter", this, TQ_SLOT(???())); - plugSharedAction("data_go_to_first_record", this, TQT_SLOT(slotGoToFirstRow())); - plugSharedAction("data_go_to_previous_record", this, TQT_SLOT(slotGoToPreviusRow())); - plugSharedAction("data_go_to_next_record", this, TQT_SLOT(slotGoToNextRow())); - plugSharedAction("data_go_to_last_record", this, TQT_SLOT(slotGoToLastRow())); - plugSharedAction("data_go_to_new_record", this, TQT_SLOT(slotGoToNewRow())); + plugSharedAction("data_go_to_first_record", this, TQ_SLOT(slotGoToFirstRow())); + plugSharedAction("data_go_to_previous_record", this, TQ_SLOT(slotGoToPreviusRow())); + plugSharedAction("data_go_to_next_record", this, TQ_SLOT(slotGoToNextRow())); + plugSharedAction("data_go_to_last_record", this, TQ_SLOT(slotGoToLastRow())); + plugSharedAction("data_go_to_new_record", this, TQ_SLOT(slotGoToNewRow())); //! \todo update availability setAvailable("data_go_to_first_record", true); @@ -111,25 +111,25 @@ void KexiDataAwareView::initActions() setAvailable("data_go_to_last_record", true); setAvailable("data_go_to_new_record", true); - plugSharedAction("edit_copy", this, TQT_SLOT(copySelection())); + plugSharedAction("edit_copy", this, TQ_SLOT(copySelection())); m_actionClient->plugSharedAction(sharedAction("edit_copy")); //for proper shortcut - plugSharedAction("edit_cut", this, TQT_SLOT(cutSelection())); + plugSharedAction("edit_cut", this, TQ_SLOT(cutSelection())); m_actionClient->plugSharedAction(sharedAction("edit_cut")); //for proper shortcut - plugSharedAction("edit_paste", this, TQT_SLOT(paste())); + plugSharedAction("edit_paste", this, TQ_SLOT(paste())); m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut -// plugSharedAction("edit_find", this, TQT_SLOT(editFind())); +// plugSharedAction("edit_find", this, TQ_SLOT(editFind())); // m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut -// plugSharedAction("edit_findnext", this, TQT_SLOT(editFindNext())); +// plugSharedAction("edit_findnext", this, TQ_SLOT(editFindNext())); // m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut -// plugSharedAction("edit_findprevious", this, TQT_SLOT(editFindPrevious())); +// plugSharedAction("edit_findprevious", this, TQ_SLOT(editFindPrevious())); // m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut -//! @todo plugSharedAction("edit_replace", this, TQT_SLOT(editReplace())); +//! @todo plugSharedAction("edit_replace", this, TQ_SLOT(editReplace())); //! @todo m_actionClient->plugSharedAction(sharedAction("edit_replace")); //for proper shortcut // setAvailable("edit_find", true); @@ -188,7 +188,7 @@ void KexiDataAwareView::reloadActions() //warning FIXME Move this to the table part /* kdDebug()<<"INIT ACTIONS***********************************************************************"<<endl; - new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), actionCollection(), "tablepart_filter"); + new TDEAction(i18n("Filter"), "filter", 0, this, TQ_SLOT(filter()), actionCollection(), "tablepart_filter"); setXMLFile("kexidatatableui.rc"); */ m_dataAwareObject->contextMenu()->clear(); @@ -200,11 +200,11 @@ void KexiDataAwareView::reloadActions() bool separatorNeeded = true; unplugSharedAction("edit_clear_table"); - plugSharedAction("edit_clear_table", this, TQT_SLOT(deleteAllRows())); + plugSharedAction("edit_clear_table", this, TQ_SLOT(deleteAllRows())); if (m_dataAwareObject->isEmptyRowInsertingEnabled()) { unplugSharedAction("edit_insert_empty_row"); - plugSharedAction("edit_insert_empty_row", m_internalView, TQT_SLOT(insertEmptyRow())); + plugSharedAction("edit_insert_empty_row", m_internalView, TQ_SLOT(insertEmptyRow())); if (separatorNeeded) m_dataAwareObject->contextMenu()->insertSeparator(); plugSharedAction("edit_insert_empty_row", m_dataAwareObject->contextMenu()); diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp index 4299017d4..dab210a97 100644 --- a/kexi/widget/kexidatasourcecombobox.cpp +++ b/kexi/widget/kexidatasourcecombobox.cpp @@ -76,8 +76,8 @@ KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *nam setInsertionPolicy(NoInsertion); setCompletionMode(TDEGlobalSettings::CompletionPopupAuto); setSizeLimit( 16 ); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); - connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); + connect(this, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &))); d->tableIcon = SmallIcon("table"); d->queryIcon = SmallIcon("query"); @@ -110,12 +110,12 @@ void KexiDataSourceComboBox::setProject(KexiProject *prj, bool showTables, bool return; //needed for updating contents of the combo box - connect(d->prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), - this, TQT_SLOT(slotNewItemStored(KexiPart::Item&))); - connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), - this, TQT_SLOT(slotItemRemoved(const KexiPart::Item&))); - connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), - this, TQT_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&))); + connect(d->prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)), + this, TQ_SLOT(slotNewItemStored(KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), + this, TQ_SLOT(slotItemRemoved(const KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), + this, TQ_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&))); KexiDB::Connection *conn = d->prj->dbConnection(); if (!conn) diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp index c36df02f3..f3a9f0ad7 100644 --- a/kexi/widget/kexidbconnectionwidget.cpp +++ b/kexi/widget/kexidbconnectionwidget.cpp @@ -105,10 +105,10 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent, const char* n TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection); d->btnTestConnection->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); - connect( locationBGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotLocationBGrpClicked(int)) ); - connect( chkPortDefault, TQT_SIGNAL(toggled(bool)), this , TQT_SLOT(slotCBToggled(bool)) ); - connect( btnLoadDBList, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(loadDBList()) ); - connect( d->btnSaveChanges, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(saveChanges()) ); + connect( locationBGrp, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotLocationBGrpClicked(int)) ); + connect( chkPortDefault, TQ_SIGNAL(toggled(bool)), this , TQ_SLOT(slotCBToggled(bool)) ); + connect( btnLoadDBList, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(loadDBList()) ); + connect( d->btnSaveChanges, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(saveChanges()) ); } KexiDBConnectionWidget::~KexiDBConnectionWidget() @@ -237,7 +237,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch detailsWidget = new KexiDBConnectionWidgetDetailsBase(this, "detailsWidget"); addTab( detailsWidget, i18n("Details") ); - connect( mainWidget->testConnectionButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTestConnection()) ); + connect( mainWidget->testConnectionButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTestConnection()) ); } KexiDBConnectionTabWidget::~KexiDBConnectionTabWidget() @@ -372,10 +372,10 @@ KexiDBConnectionDialog::~KexiDBConnectionDialog() void KexiDBConnectionDialog::init() { - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(accept())); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(accept())); setMainWidget(tabWidget); - connect(tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), this, TQT_SIGNAL(saveChanges())); - connect(tabWidget, TQT_SIGNAL(testConnection()), this, TQT_SIGNAL(testConnection())); + connect(tabWidget->mainWidget, TQ_SIGNAL(saveChanges()), this, TQ_SIGNAL(saveChanges())); + connect(tabWidget, TQ_SIGNAL(testConnection()), this, TQ_SIGNAL(testConnection())); adjustSize(); resize(width(), tabWidget->height()); diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index 6f722f0e0..fb78ca043 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -39,7 +39,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent) TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this); lText->setAlignment(AlignTop | AlignLeft | WordBreak); TQCheckBox *useWizard = new TQCheckBox(i18n("Create %1 using the \"%1 Wizard\""), this); - connect(useWizard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setUseWizard(bool))); + connect(useWizard, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setUseWizard(bool))); useWizard->setChecked(true); TQSpacerItem *spacer = new TQSpacerItem(320, 220); diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 010008824..ff598a056 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -54,13 +54,13 @@ public: : KexiSharedActionConnector( proxy, obj ) { #ifdef KTEXTEDIT_BASED_SQL_EDITOR - plugSharedAction("edit_cut", TQT_SLOT(cut())); - plugSharedAction("edit_copy", TQT_SLOT(copy())); - plugSharedAction("edit_paste", TQT_SLOT(paste())); - plugSharedAction("edit_clear", TQT_SLOT(clear())); - plugSharedAction("edit_undo", TQT_SLOT(undo())); - plugSharedAction("edit_redo", TQT_SLOT(redo())); - plugSharedAction("edit_select_all", TQT_SLOT(selectAll())); + plugSharedAction("edit_cut", TQ_SLOT(cut())); + plugSharedAction("edit_copy", TQ_SLOT(copy())); + plugSharedAction("edit_paste", TQ_SLOT(paste())); + plugSharedAction("edit_clear", TQ_SLOT(clear())); + plugSharedAction("edit_undo", TQ_SLOT(undo())); + plugSharedAction("edit_redo", TQ_SLOT(redo())); + plugSharedAction("edit_select_all", TQ_SLOT(selectAll())); #else TQValueList<TQCString> actions; actions << "edit_cut" << "edit_copy" << "edit_paste" << "edit_clear" @@ -89,7 +89,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na #ifdef KTEXTEDIT_BASED_SQL_EDITOR d->view = new KTextEdit( "", TQString(), this, "kexi_editor" ); //adjust font - connect(d->view, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged())); + connect(d->view, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(textChanged())); TQFont f("Courier"); f.setStyleStrategy(TQFont::PreferAntialias); f.setPointSize(d->view->font().pointSize()); @@ -116,7 +116,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na } } - connect(d->doc, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged())); + connect(d->doc, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(textChanged())); #endif KexiEditorSharedActionConnector c(this, d->view); d->view->installEventFilter(this); diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index 875425de1..eb65fe226 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -77,8 +77,8 @@ KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name) setInsertionPolicy(NoInsertion); setCompletionMode(TDEGlobalSettings::CompletionPopupAuto); setSizeLimit( 16 ); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); - connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); + connect(this, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &))); // setAcceptDrops(true); // viewport()->setAcceptDrops(true); diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 348e9ee04..64d38a326 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -65,8 +65,8 @@ KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int opt setSorting(-1, true); // disable sorting setDragEnabled(true); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*))); } KexiFieldListView::~KexiFieldListView() diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 6af497d1c..35d5d0f38 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -134,8 +134,8 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget d->objectInfoLabel->setBuddy(d->editor); setFocusPolicy(TQWidget::WheelFocus); - connect(d->editor, TQT_SIGNAL(propertySetChanged(KoProperty::Set*)), - this, TQT_SLOT(slotPropertySetChanged(KoProperty::Set*))); + connect(d->editor, TQ_SIGNAL(propertySetChanged(KoProperty::Set*)), + this, TQ_SLOT(slotPropertySetChanged(KoProperty::Set*))); // d->iconName = "dummy"; slotPropertySetChanged(0); diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index ea456b217..c5f050323 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -73,7 +73,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) m_gridSize = 0; m_outerAreaVisible = true; - connect(&m_delayedResize, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshContentsSize())); + connect(&m_delayedResize, TQ_SIGNAL(timeout()), this, TQ_SLOT(refreshContentsSize())); m_smodeSet = false; if (m_preview) { refreshContentsSizeLater(true, true); diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 7ff39106b..2ad8b4287 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -85,7 +85,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip, btn->setFocusPolicy(TQWidget::NoFocus); btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); if (receiver && member) { - connect(btn, TQT_SIGNAL(clicked()), receiver, member); + connect(btn, TQ_SIGNAL(clicked()), receiver, member); } if (!icon.isEmpty()) { @@ -151,7 +151,7 @@ void KexiSectionHeader::BoxLayout::addItem( TQLayoutItem * item ) if (item->widget()->inherits("KexiViewBase")) { view = static_cast<KexiViewBase*>(item->widget()); KexiSectionHeader *sh = static_cast<KexiSectionHeader*>(mainWidget()); - connect(view,TQT_SIGNAL(focus(bool)),sh,TQT_SLOT(slotFocus(bool))); + connect(view,TQ_SIGNAL(focus(bool)),sh,TQ_SLOT(slotFocus(bool))); sh->d->lbl->setBuddy(item->widget()); } } diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index e7d5c6b9c..890d55498 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -49,8 +49,8 @@ KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, TDEAction* action) , m_action(action) { init(); - connect(this, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate())); - connect(action, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate())); + connect(action, TQ_SIGNAL(enabled(bool)), this, TQ_SLOT(setEnabled(bool))); updateAction(); } diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 9248916c0..d28759e97 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -176,7 +176,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) list << i18n("Small") << i18n("Medium") << i18n("Large") << i18n("Huge"); combo->insertStringList(list); combo->setCurrentItem(2); - connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeIconSize(int))); + connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeIconSize(int))); // Icon chooser button @@ -184,8 +184,8 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) m_button->setIcon("kexi"); m_button->setIconSize(TDEIcon::SizeMedium); l->addMultiCellWidget(m_button, 0, 1, 2, 2); - connect(m_button, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(updateIconName(TQString))); - connect(m_nameInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setIcon(const TQString &))); + connect(m_button, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(updateIconName(TQString))); + connect(m_nameInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(setIcon(const TQString &))); } void @@ -246,21 +246,21 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW newItemPath->setTextLabel(i18n("&Add File"), true); vlayout->addWidget(newItemPath); m_buttons.insert(BNewItemPath, newItemPath); - connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath())); + connect(newItemPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItemByPath())); TQToolButton *newItemName = new TQToolButton(frame); newItemName->setIconSet(BarIconSet("icons")); newItemName->setTextLabel(i18n("&Add an Icon"), true); vlayout->addWidget(newItemName); m_buttons.insert(BNewItemName, newItemName); - connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName())); + connect(newItemName, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItemByName())); TQToolButton *delItem = new TQToolButton(frame); delItem->setIconSet(BarIconSet("edit_remove")); delItem->setTextLabel(i18n("&Remove Selected Item"), true); vlayout->addWidget(delItem); m_buttons.insert(BDelItem, delItem); - connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); + connect(delItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem())); vlayout->addStretch(); // Setup the iconView @@ -270,8 +270,8 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW m_iconView->setAutoArrange(true); m_iconView->setMode(TDEIconView::Select); l->addWidget(m_iconView); - connect(m_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(displayMenu(TQIconViewItem*, const TQPoint&))); - connect(m_iconView, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQT_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&))); + connect(m_iconView, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQ_SLOT(displayMenu(TQIconViewItem*, const TQPoint&))); + connect(m_iconView, TQ_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQ_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&))); PixmapMap::ConstIterator it; PixmapMap::ConstIterator endIt = collection->m_pixmaps.end(); @@ -366,8 +366,8 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p) { if(!it) return; TDEPopupMenu *menu = new TDEPopupMenu(); - menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQT_SLOT(renameItem())); - menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQT_SLOT(removeItem())); + menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQ_SLOT(renameItem())); + menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQ_SLOT(removeItem())); menu->exec(p); } diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 81ce13823..150ab65f5 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -55,7 +55,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) m_focusedTableView = 0; setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); -// connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *))); +// connect(relation, TQ_SIGNAL(relationListUpdated(TQObject *)), this, TQ_SLOT(slotListUpdate(TQObject *))); viewport()->setPaletteBackgroundColor(colorGroup().mid()); setFocusPolicy(TQWidget::WheelFocus); @@ -70,15 +70,15 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup); plugSharedAction("edit_delete",m_connectionPopup); - plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); + plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject())); */ #if 0 m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "edit-delete", "", - this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); + this, TQ_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "", - this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); + this, TQ_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); m_openSelectedTableQueryAction = new TDEAction(i18n("&Open Selected Table/Query"), "", "", - this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); + this, TQ_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); #endif // invalidateActions(); @@ -137,12 +137,12 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) /*! @todo what about query? */ new KexiDB::TableOrQuerySchema(t) ); - connect(c, TQT_SIGNAL(endDrag()), this, TQT_SLOT(slotTableViewEndDrag())); - connect(c, TQT_SIGNAL(gotFocus()), this, TQT_SLOT(slotTableViewGotFocus())); -// connect(c, TQT_SIGNAL(headerContextMenuRequest(const TQPoint&)), -// this, TQT_SLOT(tableHeaderContextMenuRequest(const TQPoint&))); - connect(c, TQT_SIGNAL(contextMenuRequest(const TQPoint&)), - this, TQT_SIGNAL(tableContextMenuRequest(const TQPoint&))); + connect(c, TQ_SIGNAL(endDrag()), this, TQ_SLOT(slotTableViewEndDrag())); + connect(c, TQ_SIGNAL(gotFocus()), this, TQ_SLOT(slotTableViewGotFocus())); +// connect(c, TQ_SIGNAL(headerContextMenuRequest(const TQPoint&)), +// this, TQ_SLOT(tableHeaderContextMenuRequest(const TQPoint&))); + connect(c, TQ_SIGNAL(contextMenuRequest(const TQPoint&)), + this, TQ_SIGNAL(tableContextMenuRequest(const TQPoint&))); addChild(c, 100,100); if (rect.isValid()) {//predefined size @@ -195,8 +195,8 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) m_tables.insert(t->name(), c); - connect(c, TQT_SIGNAL(moved(KexiRelationViewTableContainer *)), this, - TQT_SLOT(containerMoved(KexiRelationViewTableContainer *))); + connect(c, TQ_SIGNAL(moved(KexiRelationViewTableContainer *)), this, + TQ_SLOT(containerMoved(KexiRelationViewTableContainer *))); if (hasFocus()) //ok? c->setFocus(); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 7053c7781..7c28d4638 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -63,8 +63,8 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( m_tableHeader->unsetFocus(); m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); lyr->addWidget(m_tableHeader); - connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved())); - connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag())); + connect(m_tableHeader,TQ_SIGNAL(moved()),this,TQ_SLOT(moved())); + connect(m_tableHeader, TQ_SIGNAL(endDrag()), this, TQ_SIGNAL(endDrag())); m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable"); //m_tableHeader->setFocusProxy( m_tableView ); @@ -74,9 +74,9 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( // m_tableView->resize( m_tableView->sizeHint() ); lyr->addWidget(m_tableView, 0); - connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved())); - connect(m_tableView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(m_tableView, TQ_SIGNAL(tableScrolling()), this, TQ_SLOT(moved())); + connect(m_tableView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } KexiRelationViewTableContainer::~KexiRelationViewTableContainer() @@ -299,8 +299,8 @@ KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOr setSchema(tableOrQuerySchema); header()->hide(); - connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQT_SLOT(slotDropped(TQDropEvent *))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotContentsMoving(int,int))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQ_SLOT(slotDropped(TQDropEvent *))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotContentsMoving(int,int))); } KexiRelationViewTable::~KexiRelationViewTable() diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index e3a2e8b2d..2fbda78ec 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -65,7 +65,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, m_btnAdd = new KPushButton(i18n("&Add"), this); hlyr->addWidget(m_btnAdd); hlyr->addStretch(1); - connect(m_btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddTable())); + connect(m_btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddTable())); m_relationView = new KexiRelationView(this, "relation_view"); setViewWidget(m_relationView); @@ -75,19 +75,19 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, //actions m_tableQueryPopup = new TDEPopupMenu(this, "m_popup"); m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), ""); - connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu())); + connect(m_tableQueryPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu())); m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopupTitleID = m_connectionPopup->insertTitle(""); - connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu())); + connect(m_connectionPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu())); m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("document-open"), TDEShortcut(), - this, TQT_SLOT(openSelectedTable()), this, "relationsview_openTable"); + this, TQ_SLOT(openSelectedTable()), this, "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(), - this, TQT_SLOT(designSelectedTable()), this, "relationsview_designTable"); + this, TQ_SLOT(designSelectedTable()), this, "relationsview_designTable"); m_designSelectedTableAction->plug( m_tableQueryPopup ); m_tableQueryPopup->insertSeparator(); @@ -95,24 +95,24 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, hide_action->setIconSet(TQIconSet()); plugSharedAction("edit_delete",m_connectionPopup); - plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); - - connect(m_relationView, TQT_SIGNAL(tableViewGotFocus()), - this, TQT_SLOT(tableViewGotFocus())); - connect(m_relationView, TQT_SIGNAL(connectionViewGotFocus()), - this, TQT_SLOT(connectionViewGotFocus())); - connect(m_relationView, TQT_SIGNAL(emptyAreaGotFocus()), - this, TQT_SLOT(emptyAreaGotFocus())); - connect(m_relationView, TQT_SIGNAL(tableContextMenuRequest( const TQPoint& )), - this, TQT_SLOT(tableContextMenuRequest( const TQPoint& ))); - connect(m_relationView, TQT_SIGNAL(connectionContextMenuRequest( const TQPoint& )), - this, TQT_SLOT(connectionContextMenuRequest( const TQPoint& ))); - connect(m_relationView, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)), - this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); - connect(m_relationView, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), - this, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); - connect(m_relationView, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), - this, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); + plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject())); + + connect(m_relationView, TQ_SIGNAL(tableViewGotFocus()), + this, TQ_SLOT(tableViewGotFocus())); + connect(m_relationView, TQ_SIGNAL(connectionViewGotFocus()), + this, TQ_SLOT(connectionViewGotFocus())); + connect(m_relationView, TQ_SIGNAL(emptyAreaGotFocus()), + this, TQ_SLOT(emptyAreaGotFocus())); + connect(m_relationView, TQ_SIGNAL(tableContextMenuRequest( const TQPoint& )), + this, TQ_SLOT(tableContextMenuRequest( const TQPoint& ))); + connect(m_relationView, TQ_SIGNAL(connectionContextMenuRequest( const TQPoint& )), + this, TQ_SLOT(connectionContextMenuRequest( const TQPoint& ))); + connect(m_relationView, TQ_SIGNAL(tableHidden(KexiDB::TableSchema&)), + this, TQ_SLOT(slotTableHidden(KexiDB::TableSchema&))); + connect(m_relationView, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), + this, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); + connect(m_relationView, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), + this, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); #if 0 if(!embedd) @@ -126,7 +126,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, #ifdef TESTING_KexiRelationWidget for (int i=0;i<(int)m_db->tableNames().count();i++) - TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable())); + TQTimer::singleShot(100,this,TQ_SLOT(slotAddTable())); #endif invalidateActions(); @@ -171,8 +171,8 @@ KexiRelationWidget::addTable(KexiDB::TableSchema *t, const TQRect &rect) kdDebug() << "KexiRelationWidget::slotAddTable(): adding table " << t->name() << endl; if (!c) return; - connect(c->tableView(), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); + connect(c->tableView(), TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); } const TQString tname = t->name().lower(); diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index b3de34193..b02a74a6b 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -101,25 +101,25 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *pare d->button->setPopup( d->popup ); //force edit requested to start editing... (this will call slotUpdateActionsAvailabilityRequested()) - //connect(d->popup, TQT_SIGNAL(aboutToShow()), this, TQT_SIGNAL(editRequested())); - - connect(d->popup, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), - this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&))); - - connect(d->popup, TQT_SIGNAL(insertFromFileRequested(const KURL&)), - this, TQT_SLOT(handleInsertFromFileAction(const KURL&))); - connect(d->popup, TQT_SIGNAL(saveAsRequested(const TQString&)), - this, TQT_SLOT(handleSaveAsAction(const TQString&))); - connect(d->popup, TQT_SIGNAL(cutRequested()), - this, TQT_SLOT(handleCutAction())); - connect(d->popup, TQT_SIGNAL(copyRequested()), - this, TQT_SLOT(handleCopyAction())); - connect(d->popup, TQT_SIGNAL(pasteRequested()), - this, TQT_SLOT(handlePasteAction())); - connect(d->popup, TQT_SIGNAL(clearRequested()), - this, TQT_SLOT(clear())); - connect(d->popup, TQT_SIGNAL(showPropertiesRequested()), - this, TQT_SLOT(handleShowPropertiesAction())); + //connect(d->popup, TQ_SIGNAL(aboutToShow()), this, TQ_SIGNAL(editRequested())); + + connect(d->popup, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), + this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&))); + + connect(d->popup, TQ_SIGNAL(insertFromFileRequested(const KURL&)), + this, TQ_SLOT(handleInsertFromFileAction(const KURL&))); + connect(d->popup, TQ_SIGNAL(saveAsRequested(const TQString&)), + this, TQ_SLOT(handleSaveAsAction(const TQString&))); + connect(d->popup, TQ_SIGNAL(cutRequested()), + this, TQ_SLOT(handleCutAction())); + connect(d->popup, TQ_SIGNAL(copyRequested()), + this, TQ_SLOT(handleCopyAction())); + connect(d->popup, TQ_SIGNAL(pasteRequested()), + this, TQ_SLOT(handlePasteAction())); + connect(d->popup, TQ_SIGNAL(clearRequested()), + this, TQ_SLOT(clear())); + connect(d->popup, TQ_SIGNAL(showPropertiesRequested()), + this, TQ_SLOT(handleShowPropertiesAction())); } KexiBlobTableEdit::~KexiBlobTableEdit() diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp index 89ba63cf9..d2aaee78a 100644 --- a/kexi/widget/tableview/kexicomboboxbase.cpp +++ b/kexi/widget/tableview/kexicomboboxbase.cpp @@ -357,10 +357,10 @@ void KexiComboBoxBase::createPopup(bool show) if (!popup()) { setPopup( column() ? new KexiComboBoxPopup(thisWidget, *column()) : new KexiComboBoxPopup(thisWidget, *field()) ); - TQObject::connect(popup(), TQT_SIGNAL(rowAccepted(KexiTableItem*,int)), - thisWidget, TQT_SLOT(slotRowAccepted(KexiTableItem*,int))); - TQObject::connect(popup()->tableView(), TQT_SIGNAL(itemSelected(KexiTableItem*)), - thisWidget, TQT_SLOT(slotItemSelected(KexiTableItem*))); + TQObject::connect(popup(), TQ_SIGNAL(rowAccepted(KexiTableItem*,int)), + thisWidget, TQ_SLOT(slotRowAccepted(KexiTableItem*,int))); + TQObject::connect(popup()->tableView(), TQ_SIGNAL(itemSelected(KexiTableItem*)), + thisWidget, TQ_SLOT(slotItemSelected(KexiTableItem*))); popup()->setFocusProxy( widgetToFocus ); popup()->tableView()->setFocusProxy( widgetToFocus ); diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 6877bd780..b0f6621c1 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -134,14 +134,14 @@ void KexiComboBoxPopup::init() d->tv = new KexiComboBoxPopup_KexiTableView(this); installEventFilter(this); - connect(d->tv, TQT_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)), - this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int))); + connect(d->tv, TQ_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)), + this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int))); - connect(d->tv, TQT_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)), - this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int))); + connect(d->tv, TQ_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)), + this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int))); - connect(d->tv, TQT_SIGNAL(itemDblClicked(KexiTableItem*,int,int)), - this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int))); + connect(d->tv, TQ_SIGNAL(itemDblClicked(KexiTableItem*,int,int)), + this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int))); } void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *field) @@ -258,7 +258,7 @@ void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *fiel d->tv->KexiDataAwareObjectInterface::data()->disconnect( this ); d->tv->setData( cursor ); - connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested())); + connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested())); updateSize(); return; } @@ -287,7 +287,7 @@ void KexiComboBoxPopup::setDataInternal( KexiTableViewData *data, bool owner ) if (d->tv->KexiDataAwareObjectInterface::data()) d->tv->KexiDataAwareObjectInterface::data()->disconnect( this ); d->tv->setData( data, owner ); - connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested())); + connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested())); updateSize(); } diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 0ac9923e6..2d771041b 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -71,9 +71,9 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ ); d->button->hide(); d->button->setFocusPolicy( TQWidget::NoFocus ); - connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked())); + connect(d->button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotButtonClicked())); - connect(m_lineedit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLineEditTextChanged(const TQString&))); + connect(m_lineedit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLineEditTextChanged(const TQString&))); // m_lineedit = new KLineEdit(this, "lineedit"); // m_lineedit->setFrame(false); diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 2ba852944..bcb510d20 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -158,29 +158,29 @@ void KexiDataAwareObjectInterface::setData( KexiTableViewData *data, bool owner if (m_data && !theSameData) { //! @todo: store sorting settings? setSorting(-1); -// connect(m_data, TQT_SIGNAL(refreshRequested()), this, TQT_SLOT(slotRefreshRequested())); - connectToReloadDataSlot(m_data, TQT_SIGNAL(reloadRequested())); +// connect(m_data, TQ_SIGNAL(refreshRequested()), this, TQ_SLOT(slotRefreshRequested())); + connectToReloadDataSlot(m_data, TQ_SIGNAL(reloadRequested())); TQObject* thisObject = dynamic_cast<TQObject*>(this); if (thisObject) { - TQObject::connect(m_data, TQT_SIGNAL(destroying()), thisObject, TQT_SLOT(slotDataDestroying())); - TQObject::connect(m_data, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )), - thisObject, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & ))); - TQObject::connect(m_data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), - thisObject, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); - TQObject::connect(m_data, TQT_SIGNAL(rowDeleted()), thisObject, TQT_SLOT(slotRowDeleted())); - TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,bool)), - thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,bool))); - TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), - thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware - TQObject::connect(m_data, TQT_SIGNAL(rowRepaintRequested(KexiTableItem&)), - thisObject, TQT_SLOT(slotRowRepaintRequested(KexiTableItem&))); + TQObject::connect(m_data, TQ_SIGNAL(destroying()), thisObject, TQ_SLOT(slotDataDestroying())); + TQObject::connect(m_data, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )), + thisObject, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & ))); + TQObject::connect(m_data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), + thisObject, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); + TQObject::connect(m_data, TQ_SIGNAL(rowDeleted()), thisObject, TQ_SLOT(slotRowDeleted())); + TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,bool)), + thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,bool))); + TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), + thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware + TQObject::connect(m_data, TQ_SIGNAL(rowRepaintRequested(KexiTableItem&)), + thisObject, TQ_SLOT(slotRowRepaintRequested(KexiTableItem&))); // setup scrollbar's tooltip - TQObject::connect(verticalScrollBar(),TQT_SIGNAL(sliderReleased()), - thisObject,TQT_SLOT(vScrollBarSliderReleased())); - TQObject::connect(verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), - thisObject,TQT_SLOT(vScrollBarValueChanged(int))); - TQObject::connect(&m_scrollBarTipTimer,TQT_SIGNAL(timeout()), - thisObject,TQT_SLOT(scrollBarTipTimeout())); + TQObject::connect(verticalScrollBar(),TQ_SIGNAL(sliderReleased()), + thisObject,TQ_SLOT(vScrollBarSliderReleased())); + TQObject::connect(verticalScrollBar(),TQ_SIGNAL(valueChanged(int)), + thisObject,TQ_SLOT(vScrollBarValueChanged(int))); + TQObject::connect(&m_scrollBarTipTimer,TQ_SIGNAL(timeout()), + thisObject,TQ_SLOT(scrollBarTipTimeout())); } } diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h index d9819f5d3..31bfcc29b 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.h +++ b/kexi/widget/tableview/kexidataawareobjectiface.h @@ -896,23 +896,23 @@ inline KexiTableItem *KexiDataAwareObjectInterface::itemAt(int row) const #define KEXI_DATAAWAREOBJECTINTERFACE \ public: \ void connectCellSelectedSignal(const TQObject* receiver, const char* intIntMember) { \ - connect(this, TQT_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \ + connect(this, TQ_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \ } \ void connectRowEditStartedSignal(const TQObject* receiver, const char* intMember) { \ - connect(this, TQT_SIGNAL(rowEditStarted(int)), receiver, intMember); \ + connect(this, TQ_SIGNAL(rowEditStarted(int)), receiver, intMember); \ } \ void connectRowEditTerminatedSignal(const TQObject* receiver, const char* voidMember) { \ - connect(this, TQT_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \ + connect(this, TQ_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \ } \ void connectReloadActionsSignal(const TQObject* receiver, const char* voidMember) { \ - connect(this, TQT_SIGNAL(reloadActions()), receiver, voidMember); \ + connect(this, TQ_SIGNAL(reloadActions()), receiver, voidMember); \ } \ void connectDataSetSignal(const TQObject* receiver, \ const char* kexiTableViewDataMember) { \ - connect(this, TQT_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \ + connect(this, TQ_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \ } \ void connectToReloadDataSlot(const TQObject* sender, const char* voidSignal) { \ - connect(sender, voidSignal, this, TQT_SLOT(reloadData())); \ + connect(sender, voidSignal, this, TQ_SLOT(reloadData())); \ } #endif diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp index 8b0fdff78..2219cf97d 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.cpp +++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp @@ -35,12 +35,12 @@ KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view, { m_sets.setAutoDelete(true); -// connect(m_dataObject, TQT_SIGNAL(dataSet(KexiTableViewData*)), -// this, TQT_SLOT(slotDataSet(KexiTableViewData*))); - m_dataObject->connectDataSetSignal(this, TQT_SLOT(slotDataSet(KexiTableViewData*))); -// connect(m_dataObject, TQT_SIGNAL(cellSelected(int,int)), -// this, TQT_SLOT(slotCellSelected(int,int))); - m_dataObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int))); +// connect(m_dataObject, TQ_SIGNAL(dataSet(KexiTableViewData*)), +// this, TQ_SLOT(slotDataSet(KexiTableViewData*))); + m_dataObject->connectDataSetSignal(this, TQ_SLOT(slotDataSet(KexiTableViewData*))); +// connect(m_dataObject, TQ_SIGNAL(cellSelected(int,int)), +// this, TQ_SLOT(slotCellSelected(int,int))); + m_dataObject->connectCellSelectedSignal(this, TQ_SLOT(slotCellSelected(int,int))); // slotDataSet( m_dataObject->data() ); const bool wasDirty = view->dirty(); @@ -61,13 +61,13 @@ void KexiDataAwarePropertySet::slotDataSet( KexiTableViewData *data ) } m_currentTVData = data; if (!m_currentTVData.isNull()) { - connect(m_currentTVData, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(slotRowDeleted())); - connect(m_currentTVData, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )), - this, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & ))); - connect(m_currentTVData, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), - this, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); - connect(m_currentTVData, TQT_SIGNAL(reloadRequested()), - this, TQT_SLOT(slotReloadRequested())); + connect(m_currentTVData, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(slotRowDeleted())); + connect(m_currentTVData, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )), + this, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & ))); + connect(m_currentTVData, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), + this, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); + connect(m_currentTVData, TQ_SIGNAL(reloadRequested()), + this, TQ_SLOT(slotReloadRequested())); } } @@ -118,7 +118,7 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn m_sets.insert(row, set); - connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQT_SLOT(setDirty())); + connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQ_SLOT(setDirty())); if (newOne) { //add a special property indicating that this is brand new set, diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index 800c76e79..3c7a3e27c 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -59,14 +59,14 @@ KexiDataTableView::init() // m_records = 0; // m_first = false; -// connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotMoving(int))); -// connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int))); +// connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotMoving(int))); +// connect(verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(slotMoving(int))); } /*void KexiDataTableView::initActions(TDEActionCollection *col) { KexiTableView::initActions(col); - new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter"); + new TDEAction(i18n("Filter"), "filter", 0, this, TQ_SLOT(filter()), col, "tablepart_filter"); }*/ bool KexiDataTableView::setData(KexiDB::Cursor *cursor) diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index b68530379..5fe56aa99 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -107,10 +107,10 @@ void KexiInputTableEdit::init() m_calculatedCell = false; #if 0 //js TODO - connect(m_cview->completionBox(), TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(completed(const TQString &))); - connect(m_cview->completionBox(), TQT_SIGNAL(highlighted(const TQString &)), - this, TQT_SLOT(completed(const TQString &))); + connect(m_cview->completionBox(), TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(completed(const TQString &))); + connect(m_cview->completionBox(), TQ_SIGNAL(highlighted(const TQString &)), + this, TQ_SLOT(completed(const TQString &))); m_cview->completionBox()->setTabHandling(true); #endif diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 11ff828d2..61655424e 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -184,7 +184,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch d = new KexiTableViewPrivate(this); - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS); m_data = new KexiTableViewData(); //to prevent crash because m_data==0 @@ -219,10 +219,10 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch //context menu m_popupMenu = new TDEPopupMenu(this, "contextMenu"); #if 0 //moved to mainwindow's actions - d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert); + d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQ_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert); d->menu_id_removeRecord = m_popupMenu->insertItem( kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small), - i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete); + i18n("Remove Record"), this, TQ_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete); #endif #ifdef TQ_WS_WIN @@ -244,7 +244,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch m_horizontalHeader->setOrientation(TQt::Horizontal); m_horizontalHeader->setTracking(false); m_horizontalHeader->setMovingEnabled(false); - connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int))); + connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int,int,int)), this, TQ_SLOT(slotTopHeaderSizeChange(int,int,int))); m_verticalHeader = new KexiRecordMarker(this, "rm"); m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() ); @@ -268,7 +268,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch #if 0//(js) doesn't work! d->scrollTimer = new TQTimer(this); - connect(d->scrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoScroll())); + connect(d->scrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoScroll())); #endif // setBackgroundAltering(true); @@ -278,13 +278,13 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch viewport()->setAcceptDrops(true); // Connect header, table and scrollbars - connect(horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_horizontalHeader, TQT_SLOT(setOffset(int))); - connect(verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_verticalHeader, TQT_SLOT(setOffset(int))); - connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnWidthChanged(int, int, int))); - connect(m_horizontalHeader, TQT_SIGNAL(sectionHandleDoubleClicked(int)), this, TQT_SLOT(slotSectionHandleDoubleClicked(int))); - connect(m_horizontalHeader, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortColumnInternal(int))); + connect(horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_horizontalHeader, TQ_SLOT(setOffset(int))); + connect(verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_verticalHeader, TQ_SLOT(setOffset(int))); + connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotColumnWidthChanged(int, int, int))); + connect(m_horizontalHeader, TQ_SIGNAL(sectionHandleDoubleClicked(int)), this, TQ_SLOT(slotSectionHandleDoubleClicked(int))); + connect(m_horizontalHeader, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortColumnInternal(int))); - connect(d->pUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdate())); + connect(d->pUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdate())); // horizontalScrollBar()->show(); updateScrollBars(); @@ -1010,7 +1010,7 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e ) } // d->contentsMousePressEvent_ev = *e; // d->contentsMousePressEvent_enabled = true; -// TQTimer::singleShot(2000, this, TQT_SLOT( contentsMousePressEvent_Internal() )); +// TQTimer::singleShot(2000, this, TQ_SLOT( contentsMousePressEvent_Internal() )); // d->contentsMousePressEvent_timer.start(100,true); // if (!d->contentsMousePressEvent_enabled) @@ -1495,9 +1495,9 @@ KexiDataItemInterface *KexiTableView::editor( int col, bool ignoreMissingEditor if (m_data->cursor() && m_data->cursor()->query()) editor->createInternalEditor(*m_data->cursor()->query()); - connect(editor,TQT_SIGNAL(editRequested()),this,TQT_SLOT(slotEditRequested())); - connect(editor,TQT_SIGNAL(cancelRequested()),this,TQT_SLOT(cancelEditor())); - connect(editor,TQT_SIGNAL(acceptRequested()),this,TQT_SLOT(acceptEditor())); + connect(editor,TQ_SIGNAL(editRequested()),this,TQ_SLOT(slotEditRequested())); + connect(editor,TQ_SIGNAL(cancelRequested()),this,TQ_SLOT(cancelEditor())); + connect(editor,TQ_SIGNAL(acceptRequested()),this,TQ_SLOT(acceptEditor())); editor->resize(columnWidth(col)-1, rowHeight()-1); editor->installEventFilter(this); diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp index 305222ca2..ec1326aed 100644 --- a/kexi/widget/tableview/kexitableviewheader.cpp +++ b/kexi/widget/tableview/kexitableviewheader.cpp @@ -67,8 +67,8 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) { styleChange( style() ); installEventFilter(this); - connect(this, TQT_SIGNAL(sizeChange(int,int,int)), - this, TQT_SLOT(slotSizeChange(int,int,int))); + connect(this, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(slotSizeChange(int,int,int))); } KexiTableViewHeader::~KexiTableViewHeader() diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp index f22248e67..027af36ef 100644 --- a/kexi/widget/utils/kexiarrowtip.cpp +++ b/kexi/widget/utils/kexiarrowtip.cpp @@ -88,7 +88,7 @@ void KexiArrowTip::increaseOpacity() m_opacity += 0.10; setWindowOpacity(m_opacity); if (m_opacity < 1.0) - TQTimer::singleShot(25, this, TQT_SLOT(increaseOpacity())); + TQTimer::singleShot(25, this, TQ_SLOT(increaseOpacity())); } void KexiArrowTip::decreaseOpacity() @@ -100,7 +100,7 @@ void KexiArrowTip::decreaseOpacity() } m_opacity -= 0.10; setWindowOpacity(m_opacity); - TQTimer::singleShot(25, this, TQT_SLOT(decreaseOpacity())); + TQTimer::singleShot(25, this, TQ_SLOT(decreaseOpacity())); } bool KexiArrowTip::close ( bool alsoDelete ) diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index e127bea65..e59d93f18 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -63,30 +63,30 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) insertTitle(TQString()); d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("document-open"), 0, - this, TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); + this, TQ_SLOT(insertFromFile()), &d->actionCollection, "insert"); d->insertFromFileAction->plug(this); - d->saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), &d->actionCollection); + d->saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), &d->actionCollection); // d->saveAsAction->setText(i18n("&Save &As...")); d->saveAsAction->plug(this); insertSeparator(); - d->cutAction = KStdAction::cut(this, TQT_SLOT(cut()), &d->actionCollection); + d->cutAction = KStdAction::cut(this, TQ_SLOT(cut()), &d->actionCollection); d->cutAction->plug(this); - d->copyAction = KStdAction::copy(this, TQT_SLOT(copy()), &d->actionCollection); + d->copyAction = KStdAction::copy(this, TQ_SLOT(copy()), &d->actionCollection); d->copyAction->plug(this); - d->pasteAction = KStdAction::paste(this, TQT_SLOT(paste()), &d->actionCollection); + d->pasteAction = KStdAction::paste(this, TQ_SLOT(paste()), &d->actionCollection); d->pasteAction->plug(this); d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("edit-delete"), 0, - this, TQT_SLOT(clear()), &d->actionCollection, "delete"); + this, TQ_SLOT(clear()), &d->actionCollection, "delete"); d->deleteAction->plug(this); #ifdef KEXI_NO_UNFINISHED d->propertiesAction = 0; #else insertSeparator(); d->propertiesAction = new TDEAction(i18n("Properties"), 0, 0, - this, TQT_SLOT(showProperties()), &d->actionCollection, "properties"); + this, TQ_SLOT(showProperties()), &d->actionCollection, "properties"); d->propertiesAction->plug(this); #endif - connect(this, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updateActionsAvailability())); + connect(this, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(updateActionsAvailability())); } KexiImageContextMenu::~KexiImageContextMenu() diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index 4aa7341c1..331fabe95 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -40,7 +40,7 @@ KexiGradientWidget::KexiGradientWidget( TQWidget *parent, const char *name, WFla p_backgroundColor = TQWidget::paletteBackgroundColor(); - connect ( &p_rebuildDelayTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( setCacheDirty() ) ); + connect ( &p_rebuildDelayTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( setCacheDirty() ) ); installEventFilter( this ); } diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 5e3cfae8e..a7ff7d01f 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -157,11 +157,11 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addSpacing( 6 ); d->lyr->addStretch(10); - connect(m_navBtnPrev,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPrevButtonClicked())); - connect(m_navBtnNext,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextButtonClicked())); - connect(m_navBtnLast,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotLastButtonClicked())); - connect(m_navBtnFirst,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotFirstButtonClicked())); - connect(m_navBtnNew,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNewButtonClicked())); + connect(m_navBtnPrev,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPrevButtonClicked())); + connect(m_navBtnNext,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNextButtonClicked())); + connect(m_navBtnLast,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotLastButtonClicked())); + connect(m_navBtnFirst,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotFirstButtonClicked())); + connect(m_navBtnNew,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNewButtonClicked())); setRecordCount(0); setCurrentRecordNumber(0); diff --git a/kformula/formulastring.cpp b/kformula/formulastring.cpp index f86b113a4..0d07634e3 100644 --- a/kformula/formulastring.cpp +++ b/kformula/formulastring.cpp @@ -79,11 +79,11 @@ FormulaString::FormulaString( KFormulaPartView* parent, const char* name, bool m FormulaStringLayout->addLayout( Layout1 ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); - connect( buttonHelp, TQT_SIGNAL(clicked() ), this, TQT_SLOT( helpButtonClicked() ) ); - connect( textWidget, TQT_SIGNAL( cursorPositionChanged( int, int ) ), - this, TQT_SLOT( cursorPositionChanged( int, int ) ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); + connect( buttonHelp, TQ_SIGNAL(clicked() ), this, TQ_SLOT( helpButtonClicked() ) ); + connect( textWidget, TQ_SIGNAL( cursorPositionChanged( int, int ) ), + this, TQ_SLOT( cursorPositionChanged( int, int ) ) ); } /* diff --git a/kformula/kfconfig.cpp b/kformula/kfconfig.cpp index 82e3ae65f..228fb0665 100644 --- a/kformula/kfconfig.cpp +++ b/kformula/kfconfig.cpp @@ -46,7 +46,7 @@ KFConfig::KFConfig( KFormulaPartView* parent ) // KFormulaFactory::global()->config(), // page2 ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApply() ) ); } void KFConfig::slotApply() diff --git a/kformula/kformula_doc.cpp b/kformula/kformula_doc.cpp index 61b84d517..2ce07d1f5 100644 --- a/kformula/kformula_doc.cpp +++ b/kformula/kformula_doc.cpp @@ -72,8 +72,8 @@ KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObjec document->setEnabled( true ); // the modify flag - connect(history, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(commandExecuted())); - connect(history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(documentRestored())); + connect(history, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(commandExecuted())); + connect(history, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(documentRestored())); dcopObject(); } diff --git a/kformula/kformula_view.cpp b/kformula/kformula_view.cpp index baa244a4c..1b8a2091b 100644 --- a/kformula/kformula_view.cpp +++ b/kformula/kformula_view.cpp @@ -76,14 +76,14 @@ KFormulaPartView::KFormulaPartView(KFormulaDoc* _doc, TQWidget* _parent, const c KFormula::Document* document = m_pDoc->getDocument(); // copy&paste - cutAction = KStdAction::cut(document->wrapper(), TQT_SLOT(cut()), actionCollection()); - copyAction = KStdAction::copy(document->wrapper(), TQT_SLOT(copy()), actionCollection()); - pasteAction = KStdAction::paste(document->wrapper(), TQT_SLOT(paste()), actionCollection()); + cutAction = KStdAction::cut(document->wrapper(), TQ_SLOT(cut()), actionCollection()); + copyAction = KStdAction::copy(document->wrapper(), TQ_SLOT(copy()), actionCollection()); + pasteAction = KStdAction::paste(document->wrapper(), TQ_SLOT(paste()), actionCollection()); cutAction->setEnabled(false); copyAction->setEnabled(false); // tip of the day - KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() ); // elements addBracketAction = document->wrapper()->getAddBracketAction(); @@ -101,55 +101,55 @@ KFormulaPartView::KFormulaPartView(KFormulaDoc* _doc, TQWidget* _parent, const c addGenericLowerAction = document->wrapper()->getAddGenericLowerAction(); removeEnclosingAction = document->wrapper()->getRemoveEnclosingAction(); - (void) KStdAction::selectAll(formulaWidget, TQT_SLOT(slotSelectAll()), actionCollection()); + (void) KStdAction::selectAll(formulaWidget, TQ_SLOT(slotSelectAll()), actionCollection()); //------------------------ Settings menu - KStdAction::preferences( this, TQT_SLOT(configure()), actionCollection(), "configure" ); + KStdAction::preferences( this, TQ_SLOT(configure()), actionCollection(), "configure" ); // font stuff // TDEFontAction* actionElement_Text_Font = new TDEFontAction(i18n( "Font Family" ),0, // actionCollection(),"textfont"); -// connect( actionElement_Text_Font, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( fontSelected( const TQString& ) ) ); +// connect( actionElement_Text_Font, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( fontSelected( const TQString& ) ) ); TDEFontSizeAction* actionTextSize = new TDEFontSizeAction(i18n( "Size" ),0, actionCollection(),"formula_textsize"); actionTextSize->setFontSize( m_pDoc->getFormula()->fontSize() ); - connect( actionTextSize, TQT_SIGNAL( fontSizeChanged( int ) ), this, TQT_SLOT( sizeSelected( int ) ) ); - connect( formula, TQT_SIGNAL( baseSizeChanged( int ) ), actionTextSize, TQT_SLOT( setFontSize( int ) ) ); + connect( actionTextSize, TQ_SIGNAL( fontSizeChanged( int ) ), this, TQ_SLOT( sizeSelected( int ) ) ); + connect( formula, TQ_SIGNAL( baseSizeChanged( int ) ), actionTextSize, TQ_SLOT( setFontSize( int ) ) ); // TDEToggleAction* actionElement_Text_Bold = new TDEToggleAction(i18n( "Bold" ), // "bold", // 0, // actionCollection(),"textbold"); -// connect( actionElement_Text_Bold, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( bold( bool ) ) ); +// connect( actionElement_Text_Bold, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( bold( bool ) ) ); // TDEToggleAction* actionElement_Text_Italic = new TDEToggleAction(i18n( "Italic" ), // "italic", // 0, // actionCollection(),"textitalic"); -// connect( actionElement_Text_Italic, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( italic( bool ) ) ); +// connect( actionElement_Text_Italic, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( italic( bool ) ) ); // TDEToggleAction* actionElement_Text_Under = new TDEToggleAction(i18n( "Underlined" ), // "underl", // 0, // actionCollection(),"textunder"); -// connect(actionElement_Text_Under, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( underline( bool ) ) ); +// connect(actionElement_Text_Under, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( underline( bool ) ) ); formulaStringAction = new TDEAction( i18n( "Edit Formula String..." ), 0, - this, TQT_SLOT( formulaString() ), + this, TQ_SLOT( formulaString() ), actionCollection(), "formula_formulastring" ); // notify on cursor change - connect(formulaWidget, TQT_SIGNAL(cursorChanged(bool, bool)), - this, TQT_SLOT(cursorChanged(bool, bool))); + connect(formulaWidget, TQ_SIGNAL(cursorChanged(bool, bool)), + this, TQ_SLOT(cursorChanged(bool, bool))); - connect( formula, TQT_SIGNAL( statusMsg( const TQString& ) ), - this, TQT_SLOT( slotActionStatusText( const TQString& ) ) ); + connect( formula, TQ_SIGNAL( statusMsg( const TQString& ) ), + this, TQ_SLOT( slotActionStatusText( const TQString& ) ) ); if ( !_doc->isEmbedded() && first_window ) { - TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) ); first_window = false; } } diff --git a/kformula/kformulawidget.cpp b/kformula/kformulawidget.cpp index 05ada79fb..f921f6567 100644 --- a/kformula/kformulawidget.cpp +++ b/kformula/kformulawidget.cpp @@ -38,10 +38,10 @@ KFormulaWidget::KFormulaWidget(KFormula::Container* doc, : TQWidget(parent, name, f | WRepaintNoErase | WResizeNoErase), formulaView(doc) { - connect(doc, TQT_SIGNAL(formulaChanged(int, int)), - this, TQT_SLOT(slotFormulaChanged(int, int))); - connect(&formulaView, TQT_SIGNAL(cursorChanged(bool, bool)), - this, TQT_SLOT(slotCursorChanged(bool, bool))); + connect(doc, TQ_SIGNAL(formulaChanged(int, int)), + this, TQ_SLOT(slotFormulaChanged(int, int))); + connect(&formulaView, TQ_SIGNAL(cursorChanged(bool, bool)), + this, TQ_SLOT(slotCursorChanged(bool, bool))); setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(NoBackground/*TQWidget::PaletteBase*/); 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() diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index 5ca46ebbc..1a7870b10 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -51,16 +51,16 @@ ConnectorTool::ConnectorTool( KivioView* parent ) : Kivio::MouseTool(parent, "Co { m_connectorAction = new Kivio::MouseToolAction(i18n("Straight Connector"), "kivio_connector", 0, actionCollection(), "connector"); - connect(m_connectorAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); - connect(m_connectorAction, TQT_SIGNAL(activated()), this, TQT_SLOT(activateStraight())); - connect(m_connectorAction, TQT_SIGNAL(doubleClicked()), this, TQT_SLOT(makePermanent())); + connect(m_connectorAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); + connect(m_connectorAction, TQ_SIGNAL(activated()), this, TQ_SLOT(activateStraight())); + connect(m_connectorAction, TQ_SIGNAL(doubleClicked()), this, TQ_SLOT(makePermanent())); m_connectorAction->setExclusiveGroup("ConnectorTool"); m_polyLineAction = new Kivio::MouseToolAction(i18n("Polyline Connector"), "kivio_connector", 0, actionCollection(), "polyLineConnector"); - connect(m_polyLineAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); - connect(m_polyLineAction, TQT_SIGNAL(activated()), this, TQT_SLOT(activatePolyline())); - connect(m_connectorAction, TQT_SIGNAL(doubleClicked()), this, TQT_SLOT(makePermanent())); + connect(m_polyLineAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); + connect(m_polyLineAction, TQ_SIGNAL(activated()), this, TQ_SLOT(activatePolyline())); + connect(m_connectorAction, TQ_SIGNAL(doubleClicked()), this, TQ_SLOT(makePermanent())); m_polyLineAction->setExclusiveGroup("ConnectorTool"); m_permanent = false; diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index dd8ce7b9a..8ef8977b4 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -55,13 +55,13 @@ SelectTool::SelectTool( KivioView* parent ) : Kivio::MouseTool(parent, "Selectio TDEShortcut selectShortCut(Key_Space); selectShortCut.setSeq(1, TQKeySequence(Key_Escape)); m_selectAction = new TDERadioAction(i18n("&Select"), "select", selectShortCut, actionCollection(), "select"); - connect(m_selectAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); + connect(m_selectAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); m_textEditAction = new TDEAction(i18n("&Edit Text..."), "text", Key_F2, - this, TQT_SLOT(editStencilText()), actionCollection(), "editText"); - (void) new TDEAction(i18n("Format &Stencils && Connectors..."), 0, 0, view(), TQT_SLOT(stencilFormat()), + this, TQ_SLOT(editStencilText()), actionCollection(), "editText"); + (void) new TDEAction(i18n("Format &Stencils && Connectors..."), 0, 0, view(), TQ_SLOT(stencilFormat()), actionCollection(), "formatStencil"); - m_arrowHeadAction = new TDEAction(i18n("Format &Arrowheads..."), 0, 0, view(), TQT_SLOT(arrowHeadFormat()), + m_arrowHeadAction = new TDEAction(i18n("Format &Arrowheads..."), 0, 0, view(), TQ_SLOT(arrowHeadFormat()), actionCollection(), "formatConnector"); m_mode = stmNone; diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp index 966cb4c53..f5d670997 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp @@ -46,7 +46,7 @@ SMLConnector::SMLConnector( KivioView* view ) { m_connectorAction = new TDEToggleAction(i18n("Polyline Connector"), "", 0, actionCollection(), "sml_connector"); - connect(m_connectorAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); + connect(m_connectorAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); m_mode = stmNone; diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.cpp b/kivio/plugins/kiviotargettool/kiviotargettool.cpp index 46f6b5c59..c8eb55618 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettool.cpp +++ b/kivio/plugins/kiviotargettool/kiviotargettool.cpp @@ -36,8 +36,8 @@ namespace Kivio { { m_targetAction = new Kivio::MouseToolAction(i18n("Add Connector Target"), "add_target", 0, actionCollection(), "addTargetTool"); - connect(m_targetAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); - connect(m_targetAction, TQT_SIGNAL(doubleClicked()), this, TQT_SLOT(makePermanent())); + connect(m_targetAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); + connect(m_targetAction, TQ_SIGNAL(doubleClicked()), this, TQ_SLOT(makePermanent())); m_permanent = false; } diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index 575f5df5b..9242180f1 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -53,8 +53,8 @@ StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent, menu->insertItem(SmallIconSet("text_center", 16), i18n("Align Center"), TQt::AlignHCenter); menu->insertItem(SmallIconSet("format-text-direction-rtl", 16), i18n("Align Right"), TQt::AlignRight); m_mainWidget->m_hAlignButton->setPopup(menu); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setHorizontalAlign(int))); - connect(m_mainWidget->m_hAlignButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showHAlignPopup())); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setHorizontalAlign(int))); + connect(m_mainWidget->m_hAlignButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showHAlignPopup())); menu = new TQPopupMenu(m_mainWidget->m_vAlignButton, "hAlignMenu"); menu->setCheckable(true); @@ -62,15 +62,15 @@ StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent, menu->insertItem(SmallIconSet("align_vcenter", 16), i18n("Align Vertical Center"), TQt::AlignVCenter); menu->insertItem(SmallIconSet("align_bottom", 16), i18n("Align Bottom"), TQt::AlignBottom); m_mainWidget->m_vAlignButton->setPopup(menu); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVerticalAlign(int))); - connect(m_mainWidget->m_vAlignButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showVAlignPopup())); - - connect(m_mainWidget->m_fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateFormating())); - connect(m_mainWidget->m_fontSizeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateFormating())); - connect(m_mainWidget->m_boldButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateFormating())); - connect(m_mainWidget->m_italicsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateFormating())); - connect(m_mainWidget->m_underLineButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateFormating())); - connect(m_mainWidget->m_textColorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateFormating())); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setVerticalAlign(int))); + connect(m_mainWidget->m_vAlignButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showVAlignPopup())); + + connect(m_mainWidget->m_fontCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateFormating())); + connect(m_mainWidget->m_fontSizeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateFormating())); + connect(m_mainWidget->m_boldButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateFormating())); + connect(m_mainWidget->m_italicsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateFormating())); + connect(m_mainWidget->m_underLineButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateFormating())); + connect(m_mainWidget->m_textColorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateFormating())); m_mainWidget->m_textArea->setFocus(); } diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index 8803b19dd..9c1d9486d 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -49,8 +49,8 @@ TextTool::TextTool( KivioView* parent ) : Kivio::MouseTool(parent, "Text Mouse Tool") { m_textAction = new Kivio::MouseToolAction( i18n("Text Tool"), "text", Key_F2, actionCollection(), "text" ); - connect(m_textAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); - connect(m_textAction, TQT_SIGNAL(doubleClicked()), this, TQT_SLOT(makePermanent())); + connect(m_textAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); + connect(m_textAction, TQ_SIGNAL(doubleClicked()), this, TQ_SLOT(makePermanent())); m_permanent = false; m_mode = stmNone; diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index 2ae6cfea9..40d4dc596 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -46,41 +46,41 @@ ZoomTool::ZoomTool(KivioView* parent) : Kivio::MouseTool(parent, "Zoom Mouse Too m_panAction->setWhatsThis(i18n("You can drag the document by using the mouse.")); m_zoomAction->setExclusiveGroup("zoomAction"); m_panAction->setExclusiveGroup("zoomAction"); - connect(m_zoomAction,TQT_SIGNAL(activated()),TQT_SLOT(zoomActivated())); - connect(m_panAction,TQT_SIGNAL(activated()),TQT_SLOT(handActivated())); - connect(m_zoomAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); - connect(m_panAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); + connect(m_zoomAction,TQ_SIGNAL(activated()),TQ_SLOT(zoomActivated())); + connect(m_panAction,TQ_SIGNAL(activated()),TQ_SLOT(handActivated())); + connect(m_zoomAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); + connect(m_panAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setActivated(bool))); KoZoomAction* viewZoom = new KoZoomAction(i18n("Zoom &Level"), "viewmag", 0, actionCollection(), "viewZoom" ); viewZoom->setWhatsThis(i18n("This allows you to zoom in or out of a document. You can either choose one of the predefined zoomfactors or enter a new zoomfactor (in percent).")); - connect(viewZoom, TQT_SIGNAL(zoomChanged(const TQString&)), parent, TQT_SLOT(viewZoom(const TQString&))); - connect(parent, TQT_SIGNAL(zoomChanged(int)), viewZoom, TQT_SLOT(setZoom(int))); + connect(viewZoom, TQ_SIGNAL(zoomChanged(const TQString&)), parent, TQ_SLOT(viewZoom(const TQString&))); + connect(parent, TQ_SIGNAL(zoomChanged(int)), viewZoom, TQ_SLOT(setZoom(int))); - m_pPlus = KStdAction::zoomIn(this, TQT_SLOT(zoomPlus()), actionCollection(), "zoomPlus"); + m_pPlus = KStdAction::zoomIn(this, TQ_SLOT(zoomPlus()), actionCollection(), "zoomPlus"); m_pPlus->setWhatsThis(i18n("You can zoom in on the document by pressing this button.")); - m_pMinus = KStdAction::zoomOut(this, TQT_SLOT(zoomMinus()), actionCollection(), "zoomMinus"); + m_pMinus = KStdAction::zoomOut(this, TQ_SLOT(zoomMinus()), actionCollection(), "zoomMinus"); m_pMinus->setWhatsThis(i18n("By pressing this button you can zoom out of the document.")); m_pZoomWidth = new TDEAction( i18n("Zoom Width"), "kivio_zoom_width", SHIFT+Key_F4, actionCollection(), "zoomWidth" ); m_pZoomWidth->setWhatsThis(i18n("You can zoom the document that it fits into the window width.")); - connect(m_pZoomWidth,TQT_SIGNAL(activated()),TQT_SLOT(zoomWidth())); + connect(m_pZoomWidth,TQ_SIGNAL(activated()),TQ_SLOT(zoomWidth())); m_pZoomHeight = new TDEAction( i18n("Zoom Height"), "kivio_zoom_height", SHIFT+Key_F5, actionCollection(), "zoomHeight" ); m_pZoomHeight->setWhatsThis(i18n("You can zoom the document that it fits into the window height.")); - connect(m_pZoomHeight,TQT_SIGNAL(activated()),TQT_SLOT(zoomHeight())); + connect(m_pZoomHeight,TQ_SIGNAL(activated()),TQ_SLOT(zoomHeight())); m_pZoomPage = new TDEAction( i18n("Zoom Page"), "kivio_zoom_page", SHIFT+Key_F6, actionCollection(), "zoomPage" ); m_pZoomPage->setWhatsThis(i18n("The Zoom Page button shows the entire page.")); - connect(m_pZoomPage,TQT_SIGNAL(activated()),TQT_SLOT(zoomPage())); + connect(m_pZoomPage,TQ_SIGNAL(activated()),TQ_SLOT(zoomPage())); m_pZoomSelected = new TDEAction( i18n("Zoom Selected"), "kivio_zoom_selected", CTRL+Key_Y, actionCollection(), "zoomSelected" ); m_pZoomSelected->setWhatsThis(i18n("By pressing this button you zoom in on the document, so that all <b>selected</b> objects are visible.")); - connect(m_pZoomSelected,TQT_SIGNAL(activated()),TQT_SLOT(zoomSelected())); + connect(m_pZoomSelected,TQ_SIGNAL(activated()),TQ_SLOT(zoomSelected())); m_pZoomAllObjects = new TDEAction( i18n("Zoom All Objects"), "kivio_zoom_allobject", 0, actionCollection(), "zoomAllObjects" ); m_pZoomAllObjects->setWhatsThis(i18n("You are able to zoom in on the document, so that all objects are visible by pressing this button.")); - connect(m_pZoomAllObjects,TQT_SIGNAL(activated()),TQT_SLOT(zoomAllobjects())); + connect(m_pZoomAllObjects,TQ_SIGNAL(activated()),TQ_SLOT(zoomAllobjects())); TQPixmap pix; diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index c92fa97a1..392aacf77 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -218,11 +218,11 @@ Navigator::Navigator(bool _selectable, TDEPopupMenu * menu, IconSidePane *_icons setFocusPolicy( TQWidget::NoFocus ); - connect( this, TQT_SIGNAL( clicked( TQListBoxItem* ) ), - TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); + connect( this, TQ_SIGNAL( clicked( TQListBoxItem* ) ), + TQ_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + TQ_SLOT( slotMouseOn( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( slotMouseOff() ) ); TQToolTip::remove( this ); if ( !mSidePane->showText() ) @@ -485,15 +485,15 @@ void IconSidePane::removeItem( int _grp, int _id ) int IconSidePane::insertGroup(const TQString &_text, bool _selectable, TQObject *_obj, const char *_slot) { mCurrentNavigator = new Navigator(_selectable, mPopupMenu, this, mWidgetstack ); - //connect( mCurrentNavigator, TQT_SIGNAL( itemSelected( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); + //connect( mCurrentNavigator, TQ_SIGNAL( itemSelected( int ) ), this, TQ_SLOT( itemSelected( int ) ) ); if ( _obj != 0L && _slot != 0L ) - connect( mCurrentNavigator, TQT_SIGNAL( itemSelected(int ) ), _obj, _slot ); - connect( mCurrentNavigator, TQT_SIGNAL( updateAllWidgets() ), this, TQT_SLOT(updateAllWidgets()) ); + connect( mCurrentNavigator, TQ_SIGNAL( itemSelected(int ) ), _obj, _slot ); + connect( mCurrentNavigator, TQ_SIGNAL( updateAllWidgets() ), this, TQ_SLOT(updateAllWidgets()) ); int const id = mWidgetstack->addWidget(mCurrentNavigator); mWidgetStackIds.append( id ); KPushButton *b = new KPushButton( _text, m_buttongroup ); m_buttongroup->insert( b, id ); - connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) ); + connect( b, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); b->setToggleButton( true ); b->setFocusPolicy( TQWidget::NoFocus ); if (m_buttongroup->count()==1) diff --git a/koshell/koshell_shell.cpp b/koshell/koshell_shell.cpp index b3cbef712..e7fb17fef 100644 --- a/koshell/koshell_shell.cpp +++ b/koshell/koshell_shell.cpp @@ -69,8 +69,8 @@ KoShellWindow::KoShellWindow() m_pSidebar->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); m_pSidebar->setActionCollection( actionCollection() ); - m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, this, TQT_SLOT( slotSidebar_Part(int ))); - m_grpDocuments = m_pSidebar->insertGroup(i18n("Documents"), true, this, TQT_SLOT(slotSidebar_Document(int))); + m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, this, TQ_SLOT( slotSidebar_Part(int ))); + m_grpDocuments = m_pSidebar->insertGroup(i18n("Documents"), true, this, TQ_SLOT(slotSidebar_Document(int))); m_pLayout->setResizeMode(m_pSidebar,TQSplitter::FollowSizeHint); // Setup the tabbar @@ -80,8 +80,8 @@ KoShellWindow::KoShellWindow() m_pFrame->setTabPosition( KTabWidget::Bottom ); m_tabCloseButton = new TQToolButton( m_pFrame ); - connect( m_tabCloseButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotFileClose() ) ); + connect( m_tabCloseButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotFileClose() ) ); m_tabCloseButton->setIconSet( SmallIconSet( "tab_remove" ) ); m_tabCloseButton->adjustSize(); TQToolTip::add(m_tabCloseButton, i18n("Close")); @@ -112,12 +112,12 @@ KoShellWindow::KoShellWindow() list.append( this->width() - KoShellSettings::sidebarWidth() ); m_pLayout->setSizes( list ); - connect( this, TQT_SIGNAL( documentSaved() ), - this, TQT_SLOT( slotNewDocumentName() ) ); + connect( this, TQ_SIGNAL( documentSaved() ), + this, TQ_SLOT( slotNewDocumentName() ) ); - connect( m_pFrame, TQT_SIGNAL( currentChanged( TQWidget* ) ), - this, TQT_SLOT( slotUpdatePart( TQWidget* ) ) ); - connect( m_pFrame, TQT_SIGNAL( contextMenu(TQWidget * ,const TQPoint &)), this, TQT_SLOT( tab_contextMenu(TQWidget * ,const TQPoint &)) ); + connect( m_pFrame, TQ_SIGNAL( currentChanged( TQWidget* ) ), + this, TQ_SLOT( slotUpdatePart( TQWidget* ) ) ); + connect( m_pFrame, TQ_SIGNAL( contextMenu(TQWidget * ,const TQPoint &)), this, TQ_SLOT( tab_contextMenu(TQWidget * ,const TQPoint &)) ); m_client = new KoShellGUIClient( this ); createShellGUI(); @@ -208,9 +208,9 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) return false; } - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotKSLoadCompleted())); - connect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotKSLoadCanceled( const TQString & ))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotKSLoadCompleted())); + connect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotKSLoadCanceled( const TQString & ))); newdoc->addShell( this ); // used by openURL bool openRet = (!isImporting ()) ? newdoc->openURL(tmpUrl) : newdoc->import(tmpUrl); if ( !openRet ) @@ -292,9 +292,9 @@ void KoShellWindow::slotKSLoadCompleted() partManager()->addPart( newdoc, false ); setRootDocument( newdoc ); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotKSLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotKSLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotKSLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotKSLoadCanceled( const TQString & ))); } void KoShellWindow::slotKSLoadCanceled( const TQString & errMsg ) @@ -304,9 +304,9 @@ void KoShellWindow::slotKSLoadCanceled( const TQString & errMsg ) // ###### FIXME: This can be done in 3.0 with deleteLater, I assume (Werner) KoDocument* newdoc = (KoDocument *)(sender()); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotKSLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotKSLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotKSLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotKSLoadCanceled( const TQString & ))); } void KoShellWindow::saveAll() @@ -729,9 +729,9 @@ void KoShellWindow::showPartSpecificHelp() KoShellGUIClient::KoShellGUIClient( KoShellWindow *window ) : KXMLGUIClient() { setXMLFile( "koshellui.rc", true, true ); - window->mnuSaveAll = new TDEAction( i18n("Save All"), 0, window, TQT_SLOT( saveAll() ), actionCollection(), "save_all" ); + window->mnuSaveAll = new TDEAction( i18n("Save All"), 0, window, TQ_SLOT( saveAll() ), actionCollection(), "save_all" ); window->mnuSaveAll->setEnabled(false); - window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, window, TQT_SLOT(showPartSpecificHelp()), + window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, window, TQ_SLOT(showPartSpecificHelp()), actionCollection(), "partSpecificHelp"); window->partSpecificHelpAction->setEnabled(false); } diff --git a/kplato/kptaccountsdialog.cpp b/kplato/kptaccountsdialog.cpp index 7ecc7bf1e..febc4034f 100644 --- a/kplato/kptaccountsdialog.cpp +++ b/kplato/kptaccountsdialog.cpp @@ -33,7 +33,7 @@ AccountsDialog::AccountsDialog(Accounts &acc, TQWidget *p, const char *n) setMainWidget(m_panel); enableButtonOK(false); - connect(m_panel, TQT_SIGNAL(changed(bool)), TQT_SLOT(enableButtonOK(bool))); + connect(m_panel, TQ_SIGNAL(changed(bool)), TQ_SLOT(enableButtonOK(bool))); } KCommand *AccountsDialog::buildCommand(Part *part) { diff --git a/kplato/kptaccountspanel.cpp b/kplato/kptaccountspanel.cpp index 3a6015d8b..ad4c16034 100644 --- a/kplato/kptaccountspanel.cpp +++ b/kplato/kptaccountspanel.cpp @@ -99,21 +99,21 @@ AccountsPanel::AccountsPanel(Accounts &acc, TQWidget *p, const char *n) slotSelectionChanged(); - connect(accountList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(accountList, TQT_SIGNAL(itemRenamed(TQListViewItem*, int)), TQT_SLOT(slotItemRenamed(TQListViewItem*, int))); - connect(accountList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), TQT_SLOT(slotListDoubleClicked(TQListViewItem*, const TQPoint &, int))); + connect(accountList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(accountList, TQ_SIGNAL(itemRenamed(TQListViewItem*, int)), TQ_SLOT(slotItemRenamed(TQListViewItem*, int))); + connect(accountList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), TQ_SLOT(slotListDoubleClicked(TQListViewItem*, const TQPoint &, int))); - connect(removeBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveBtn())); - connect(newBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewBtn())); - connect(subBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSubBtn())); + connect(removeBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveBtn())); + connect(newBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewBtn())); + connect(subBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSubBtn())); - connect(accountsComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); + connect(accountsComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); // Internal hacks, to get renaming to behave along with unique names // Uses signals to not get in the way of TQListView - connect(this, TQT_SIGNAL(renameStarted(TQListViewItem*, int)), TQT_SLOT(slotRenameStarted(TQListViewItem*, int))); - connect(this, TQT_SIGNAL(startRename(TQListViewItem*, int)), TQT_SLOT(slotStartRename(TQListViewItem*, int))); - connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(renameStarted(TQListViewItem*, int)), TQ_SLOT(slotRenameStarted(TQListViewItem*, int))); + connect(this, TQ_SIGNAL(startRename(TQListViewItem*, int)), TQ_SLOT(slotStartRename(TQListViewItem*, int))); + connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); } void AccountsPanel::addItems(TQListView *lv, Accounts &acc) { diff --git a/kplato/kptaccountsview.cpp b/kplato/kptaccountsview.cpp index 3352a87de..6e599f2e9 100644 --- a/kplato/kptaccountsview.cpp +++ b/kplato/kptaccountsview.cpp @@ -124,8 +124,8 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) lay1->addWidget(m_dlv); - connect(this, TQT_SIGNAL(update()), TQT_SLOT(slotUpdate())); - connect(m_changeBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotConfigure())); + connect(this, TQ_SIGNAL(update()), TQ_SLOT(slotUpdate())); + connect(m_changeBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotConfigure())); TQValueList<int> list = m_dlv->sizes(); int tot = list[0] + list[1]; diff --git a/kplato/kptaccountsviewconfigdialog.cpp b/kplato/kptaccountsviewconfigdialog.cpp index 18e63fb66..4fb19fc88 100644 --- a/kplato/kptaccountsviewconfigdialog.cpp +++ b/kplato/kptaccountsviewconfigdialog.cpp @@ -45,7 +45,7 @@ AccountsviewConfigDialog::AccountsviewConfigDialog(const TQDate &date, int perio enableButtonOK(false); - connect(m_panel, TQT_SIGNAL(changed(bool)), TQT_SLOT( enableButtonOK(bool))); + connect(m_panel, TQ_SIGNAL(changed(bool)), TQ_SLOT( enableButtonOK(bool))); } @@ -70,9 +70,9 @@ bool AccountsviewConfigDialog::isCumulative() { AccountsviewConfigPanel::AccountsviewConfigPanel(TQWidget *parent) : AccountsviewConfigurePanelBase(parent) { - connect(dateEdit, TQT_SIGNAL(changed(TQDate)), TQT_SLOT(slotChanged())); - connect(periodBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(cumulative, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(dateEdit, TQ_SIGNAL(changed(TQDate)), TQ_SLOT(slotChanged())); + connect(periodBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(cumulative, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); } void AccountsviewConfigPanel::slotChanged() { diff --git a/kplato/kptcalendaredit.cpp b/kplato/kptcalendaredit.cpp index 427645d7b..46c052307 100644 --- a/kplato/kptcalendaredit.cpp +++ b/kplato/kptcalendaredit.cpp @@ -59,15 +59,15 @@ CalendarEdit::CalendarEdit (TQWidget *parent, const char */*name*/) intervalList->setShowSortIndicator(true); intervalList->setSorting(0); - connect (calendarPanel, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(slotDateSelected(TQDate))); - connect (calendarPanel, TQT_SIGNAL(weekdaySelected(int)), TQT_SLOT(slotWeekdaySelected(int))); - connect(calendarPanel, TQT_SIGNAL(selectionCleared()), TQT_SLOT(slotSelectionCleared())); + connect (calendarPanel, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(slotDateSelected(TQDate))); + connect (calendarPanel, TQ_SIGNAL(weekdaySelected(int)), TQ_SLOT(slotWeekdaySelected(int))); + connect(calendarPanel, TQ_SIGNAL(selectionCleared()), TQ_SLOT(slotSelectionCleared())); - connect (state, TQT_SIGNAL(activated(int)), TQT_SLOT(slotStateActivated(int))); - connect (bClear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearClicked())); - connect (bAddInterval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddIntervalClicked())); + connect (state, TQ_SIGNAL(activated(int)), TQ_SLOT(slotStateActivated(int))); + connect (bClear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearClicked())); + connect (bAddInterval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddIntervalClicked())); - connect (bApply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyClicked())); + connect (bApply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyClicked())); } void CalendarEdit::slotStateActivated(int id) { diff --git a/kplato/kptcalendarlistdialog.cpp b/kplato/kptcalendarlistdialog.cpp index 496cc786b..4df39d2e6 100644 --- a/kplato/kptcalendarlistdialog.cpp +++ b/kplato/kptcalendarlistdialog.cpp @@ -188,7 +188,7 @@ CalendarListDialog::CalendarListDialog(Project &p, TQWidget *parent, const char setMainWidget(dia); enableButtonOK(false); - connect(dia, TQT_SIGNAL(enableButtonOk(bool)), TQT_SLOT(enableButtonOK(bool))); + connect(dia, TQ_SIGNAL(enableButtonOk(bool)), TQ_SLOT(enableButtonOK(bool))); } KCommand *CalendarListDialog::buildCommand(Part *part) { @@ -239,23 +239,23 @@ CalendarListDialogImpl::CalendarListDialogImpl (Project &p, TQWidget *parent) slotSelectionChanged(); - connect(calendar, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(slotEnableButtonOk(bool))); - connect(calendar, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotCalendarModified())); + connect(calendar, TQ_SIGNAL(obligatedFieldsFilled(bool)), TQ_SLOT(slotEnableButtonOk(bool))); + connect(calendar, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotCalendarModified())); - connect(bDelete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteClicked())); - connect(bAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); - //connect(editName, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotAddClicked())); + connect(bDelete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteClicked())); + connect(bAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); + //connect(editName, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotAddClicked())); - connect(calendarList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(calendarList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotListDoubleClicked(TQListViewItem*, const TQPoint&, int))); - connect(calendarList, TQT_SIGNAL(itemRenamed(TQListViewItem*, int)), TQT_SLOT(slotItemRenamed(TQListViewItem*, int))); + connect(calendarList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(calendarList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(slotListDoubleClicked(TQListViewItem*, const TQPoint&, int))); + connect(calendarList, TQ_SIGNAL(itemRenamed(TQListViewItem*, int)), TQ_SLOT(slotItemRenamed(TQListViewItem*, int))); - connect (baseCalendar, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBaseCalendarActivated(int))); + connect (baseCalendar, TQ_SIGNAL(activated(int)), TQ_SLOT(slotBaseCalendarActivated(int))); // Internal rename stuff - connect(this, TQT_SIGNAL(renameStarted(TQListViewItem*, int)), TQT_SLOT(slotRenameStarted(TQListViewItem*, int))); - connect(this, TQT_SIGNAL(startRename(TQListViewItem*, int)), TQT_SLOT(slotStartRename(TQListViewItem*, int))); - connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(renameStarted(TQListViewItem*, int)), TQ_SLOT(slotRenameStarted(TQListViewItem*, int))); + connect(this, TQ_SIGNAL(startRename(TQListViewItem*, int)), TQ_SLOT(slotStartRename(TQListViewItem*, int))); + connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); } void CalendarListDialogImpl::setBaseCalendars() { diff --git a/kplato/kptcalendarpanel.cpp b/kplato/kptcalendarpanel.cpp index 4c98fac09..c6bb6da83 100644 --- a/kplato/kptcalendarpanel.cpp +++ b/kplato/kptcalendarpanel.cpp @@ -101,20 +101,20 @@ void CalendarPanel::init( const TQDate &dt ) monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); setDate(dt); // set button texts - connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); - connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); - connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked())); - connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked())); - connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked())); - connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked())); - connect(d->selectWeek, TQT_SIGNAL(clicked()), TQT_SLOT(selectWeekClicked())); - connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked())); - connect(selectYear, TQT_SIGNAL(clicked()), TQT_SLOT(selectYearClicked())); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed())); - - connect(table, TQT_SIGNAL(weekdaySelected(int)), TQT_SLOT(slotWeekdaySelected(int))); - connect(table, TQT_SIGNAL(weekSelected(int, int)), TQT_SLOT(slotWeekSelected(int, int))); - connect(table, TQT_SIGNAL(selectionCleared()), TQT_SLOT(slotSelectionCleared())); + connect(table, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(dateChangedSlot(TQDate))); + connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot())); + connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked())); + connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked())); + connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked())); + connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked())); + connect(d->selectWeek, TQ_SIGNAL(clicked()), TQ_SLOT(selectWeekClicked())); + connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked())); + connect(selectYear, TQ_SIGNAL(clicked()), TQ_SLOT(selectYearClicked())); + connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed())); + + connect(table, TQ_SIGNAL(weekdaySelected(int)), TQ_SLOT(slotWeekdaySelected(int))); + connect(table, TQ_SIGNAL(weekSelected(int, int)), TQ_SLOT(slotWeekSelected(int, int))); + connect(table, TQ_SIGNAL(selectionCleared()), TQ_SLOT(slotSelectionCleared())); table->setFocus(); } @@ -287,7 +287,7 @@ CalendarPanel::selectWeekClicked() // ----- picker->resize(picker->sizeHint()); popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); picker->setFocus(); if(popup->exec(d->selectWeek->mapToGlobal(TQPoint(0, d->selectWeek->height())))) { @@ -325,7 +325,7 @@ CalendarPanel::selectMonthClicked() picker->resize(picker->sizeHint()); popup->setMainWidget(picker); picker->setFocus(); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); if(popup->exec(selectMonth->mapToGlobal(TQPoint(0, selectMonth->height())))) { TQDate date; @@ -354,7 +354,7 @@ CalendarPanel::selectYearClicked() // ----- picker->resize(picker->sizeHint()); popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); picker->setFocus(); if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height())))) { @@ -489,8 +489,8 @@ CalendarPanel::setCloseButton( bool enable ) d->closeButton = new TQToolButton( this ); TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); - connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + connect( d->closeButton, TQ_SIGNAL( clicked() ), + topLevelWidget(), TQ_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kplato/kptconfigdialog.cpp b/kplato/kptconfigdialog.cpp index 384c4abde..e0371f804 100644 --- a/kplato/kptconfigdialog.cpp +++ b/kplato/kptconfigdialog.cpp @@ -61,8 +61,8 @@ ConfigDialog::ConfigDialog(Config &config, Project &project, TQWidget *parent, c enableButtonOK(false); enableButtonApply(false); -// connect(m_behaviorPage, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged())); - connect(m_taskDefaultPage, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged())); +// connect(m_behaviorPage, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged())); + connect(m_taskDefaultPage, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged())); } diff --git a/kplato/kptdatetable.cpp b/kplato/kptdatetable.cpp index 5c10eb0ba..c7e61ed93 100644 --- a/kplato/kptdatetable.cpp +++ b/kplato/kptdatetable.cpp @@ -726,7 +726,7 @@ DateInternalWeekSelector::DateInternalWeekSelector setFrameStyle(TQFrame::NoFrame); val->setRange(1, 53); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot())); } void @@ -939,7 +939,7 @@ DateInternalYearSelector::DateInternalYearSelector // we have to respect the limits of TQDate here, I fear: val->setRange(0, 8000); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot())); } void diff --git a/kplato/kptdoublelistviewbase.cpp b/kplato/kptdoublelistviewbase.cpp index e2c54df55..6df157ad9 100644 --- a/kplato/kptdoublelistviewbase.cpp +++ b/kplato/kptdoublelistviewbase.cpp @@ -380,11 +380,11 @@ DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description) m_slaveList->setHScrollBarMode(TQScrollView::AlwaysOn); - connect(m_slaveList->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - m_masterList->verticalScrollBar(), TQT_SLOT(setValue(int))); + connect(m_slaveList->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + m_masterList->verticalScrollBar(), TQ_SLOT(setValue(int))); - connect(m_masterList, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(slotExpanded(TQListViewItem*))); - connect(m_masterList, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(slotCollapsed(TQListViewItem*))); + connect(m_masterList, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(slotExpanded(TQListViewItem*))); + connect(m_masterList, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(slotCollapsed(TQListViewItem*))); } diff --git a/kplato/kptganttview.cpp b/kplato/kptganttview.cpp index 63a1383da..40dfbf75e 100644 --- a/kplato/kptganttview.cpp +++ b/kplato/kptganttview.cpp @@ -124,13 +124,13 @@ GanttView::GanttView(TQWidget *parent, bool readWrite, const char* name) setReadWriteMode(readWrite); - connect(m_gantt, TQT_SIGNAL(lvContextMenuRequested ( KDGanttViewItem *, const TQPoint &, int )), - this, TQT_SLOT (popupMenuRequested(KDGanttViewItem *, const TQPoint &, int))); + connect(m_gantt, TQ_SIGNAL(lvContextMenuRequested ( KDGanttViewItem *, const TQPoint &, int )), + this, TQ_SLOT (popupMenuRequested(KDGanttViewItem *, const TQPoint &, int))); - connect(m_gantt, TQT_SIGNAL(lvCurrentChanged(KDGanttViewItem*)), this, TQT_SLOT (currentItemChanged(KDGanttViewItem*))); + connect(m_gantt, TQ_SIGNAL(lvCurrentChanged(KDGanttViewItem*)), this, TQ_SLOT (currentItemChanged(KDGanttViewItem*))); // HACK: kdgantt emits 2 signals for each *double* click, so we go direct to listview - connect(lv, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT (slotItemDoubleClicked(TQListViewItem*))); + connect(lv, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT (slotItemDoubleClicked(TQListViewItem*))); m_taskLinks.setAutoDelete(true); @@ -1214,14 +1214,14 @@ void GanttView::getContextClosedNodes(Context::Ganttview &context, KDGanttViewIt void GanttView::setReadWriteMode(bool on) { m_readWrite = on; - disconnect(m_gantt, TQT_SIGNAL(linkItems(KDGanttViewItem*, KDGanttViewItem*, int)), this, TQT_SLOT(slotLinkItems(KDGanttViewItem*, KDGanttViewItem*, int))); - disconnect(m_gantt, TQT_SIGNAL(taskLinkDoubleClicked(KDGanttViewTaskLink*)), this, TQT_SLOT(slotModifyLink(KDGanttViewTaskLink*))); + disconnect(m_gantt, TQ_SIGNAL(linkItems(KDGanttViewItem*, KDGanttViewItem*, int)), this, TQ_SLOT(slotLinkItems(KDGanttViewItem*, KDGanttViewItem*, int))); + disconnect(m_gantt, TQ_SIGNAL(taskLinkDoubleClicked(KDGanttViewTaskLink*)), this, TQ_SLOT(slotModifyLink(KDGanttViewTaskLink*))); m_gantt->setLinkItemsEnabled(on); if (on) { - connect(m_gantt, TQT_SIGNAL(linkItems(KDGanttViewItem*, KDGanttViewItem*, int)), TQT_SLOT(slotLinkItems(KDGanttViewItem*, KDGanttViewItem*, int))); + connect(m_gantt, TQ_SIGNAL(linkItems(KDGanttViewItem*, KDGanttViewItem*, int)), TQ_SLOT(slotLinkItems(KDGanttViewItem*, KDGanttViewItem*, int))); - connect(m_gantt, TQT_SIGNAL(taskLinkDoubleClicked(KDGanttViewTaskLink*)), TQT_SLOT(slotModifyLink(KDGanttViewTaskLink*))); + connect(m_gantt, TQ_SIGNAL(taskLinkDoubleClicked(KDGanttViewTaskLink*)), TQ_SLOT(slotModifyLink(KDGanttViewTaskLink*))); } setRenameEnabled(m_gantt->firstChild(), on); } diff --git a/kplato/kptintervaledit.cpp b/kplato/kptintervaledit.cpp index a37ec064c..8c18ff772 100644 --- a/kplato/kptintervaledit.cpp +++ b/kplato/kptintervaledit.cpp @@ -51,9 +51,9 @@ IntervalEditImpl::IntervalEditImpl(TQWidget *parent) intervalList->header()->setStretchEnabled(true); intervalList->setSortColumn(0); - connect(bClear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearClicked())); - connect(bAddInterval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddIntervalClicked())); - connect(intervalList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotIntervalSelectionChanged(TQListViewItem*))); + connect(bClear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearClicked())); + connect(bAddInterval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddIntervalClicked())); + connect(intervalList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotIntervalSelectionChanged(TQListViewItem*))); } diff --git a/kplato/kptmainprojectdialog.cpp b/kplato/kptmainprojectdialog.cpp index 3d9065e20..57e0dd39c 100644 --- a/kplato/kptmainprojectdialog.cpp +++ b/kplato/kptmainprojectdialog.cpp @@ -40,7 +40,7 @@ MainProjectDialog::MainProjectDialog(Project &p, TQWidget *parent, const char *n setMainWidget(panel); enableButtonOK(false); resize( TQSize(500, 410).expandedTo(minimumSizeHint())); - connect(panel, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(enableButtonOK(bool))); + connect(panel, TQ_SIGNAL(obligatedFieldsFilled(bool)), TQ_SLOT(enableButtonOK(bool))); } diff --git a/kplato/kptmainprojectpanel.cpp b/kplato/kptmainprojectpanel.cpp index 375b04f12..cedc693b5 100644 --- a/kplato/kptmainprojectpanel.cpp +++ b/kplato/kptmainprojectpanel.cpp @@ -146,21 +146,21 @@ MainProjectPanelImpl::MainProjectPanelImpl(TQWidget *parent, const char *name) : MainProjectPanelBase(parent, name) { // signals and slots connections - connect( bStartDate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStartDateClicked() ) ); - connect( bEndDate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEndDateClicked() ) ); - connect( bStartDate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( bEndDate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( descriptionfield, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( endDate, TQT_SIGNAL( changed(TQDate) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( endTime, TQT_SIGNAL( valueChanged(const TQTime&) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( startDate, TQT_SIGNAL( changed(TQDate) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( startTime, TQT_SIGNAL( valueChanged(const TQTime&) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - //connect( baseline, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); FIXME: Removed for this release - connect( namefield, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( idfield, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - connect( leaderfield, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotCheckAllFieldsFilled() ) ); - //connect( baseline, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotBaseline() ) ); FIXME: Removed for this release - connect( chooseLeader, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChooseLeader() ) ); + connect( bStartDate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStartDateClicked() ) ); + connect( bEndDate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEndDateClicked() ) ); + connect( bStartDate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( bEndDate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( descriptionfield, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( endDate, TQ_SIGNAL( changed(TQDate) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( endTime, TQ_SIGNAL( valueChanged(const TQTime&) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( startDate, TQ_SIGNAL( changed(TQDate) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( startTime, TQ_SIGNAL( valueChanged(const TQTime&) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + //connect( baseline, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); FIXME: Removed for this release + connect( namefield, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( idfield, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + connect( leaderfield, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotCheckAllFieldsFilled() ) ); + //connect( baseline, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotBaseline() ) ); FIXME: Removed for this release + connect( chooseLeader, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChooseLeader() ) ); } void MainProjectPanelImpl::slotCheckAllFieldsFilled() diff --git a/kplato/kptmilestoneprogressdialog.cpp b/kplato/kptmilestoneprogressdialog.cpp index f9bf729e9..c8ad6599a 100644 --- a/kplato/kptmilestoneprogressdialog.cpp +++ b/kplato/kptmilestoneprogressdialog.cpp @@ -37,7 +37,7 @@ MilestoneProgressDialog::MilestoneProgressDialog(Task &task, TQWidget *p) enableButtonOK(false); - connect(m_panel, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged())); + connect(m_panel, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged())); } void MilestoneProgressDialog::slotChanged() { diff --git a/kplato/kptmilestoneprogresspanel.cpp b/kplato/kptmilestoneprogresspanel.cpp index 977878f10..2ecbdd31e 100644 --- a/kplato/kptmilestoneprogresspanel.cpp +++ b/kplato/kptmilestoneprogresspanel.cpp @@ -71,10 +71,10 @@ KCommand *MilestoneProgressPanel::buildCommand(Part *part) { MilestoneProgressPanelImpl::MilestoneProgressPanelImpl(TQWidget *parent, const char *name, WFlags f) : MilestoneProgressPanelBase(parent, name, f) { - connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFinishedChanged(bool))); - connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(finished, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFinishedChanged(bool))); + connect(finished, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); - connect(finishTime, TQT_SIGNAL(valueChanged(const TQDateTime &)), TQT_SLOT(slotChanged())); + connect(finishTime, TQ_SIGNAL(valueChanged(const TQDateTime &)), TQ_SLOT(slotChanged())); } diff --git a/kplato/kptpart.cpp b/kplato/kptpart.cpp index 53ed107f0..ddebf0f0b 100644 --- a/kplato/kptpart.cpp +++ b/kplato/kptpart.cpp @@ -67,13 +67,13 @@ Part::Part(TQWidget *parentWidget, const char *widgetName, delete m_project; m_project = new Project(); // after config is loaded - connect(m_commandHistory, TQT_SIGNAL(commandExecuted()), TQT_SLOT(slotCommandExecuted())); - connect(m_commandHistory, TQT_SIGNAL(documentRestored()), TQT_SLOT(slotDocumentRestored())); + connect(m_commandHistory, TQ_SIGNAL(commandExecuted()), TQ_SLOT(slotCommandExecuted())); + connect(m_commandHistory, TQ_SIGNAL(documentRestored()), TQ_SLOT(slotDocumentRestored())); //FIXME the following is really dirty, we should make KPlato::Context a real class // with getter and setter and signals when content changes, thus we can keep track TQTimer* timer = new TQTimer(this,"context update timer"); - connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotCopyContextFromView())); + connect(timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotCopyContextFromView())); timer->start(500); } @@ -147,7 +147,7 @@ bool Part::initDoc(InitDocFlags flags, TQWidget* parentWidget) { KoView *Part::createViewInstance(TQWidget *parent, const char *name) { m_view = new View(this, parent, name); - connect(m_view,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotViewDestroyed())); + connect(m_view,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotViewDestroyed())); // If there is a project dialog this should be deleted so it will // use the m_view as parent. If the dialog will be needed again, diff --git a/kplato/kptpertview.cpp b/kplato/kptpertview.cpp index f68d9eb8e..0c4c6ae41 100644 --- a/kplato/kptpertview.cpp +++ b/kplato/kptpertview.cpp @@ -59,11 +59,11 @@ void PertView::init(TQLayout */*layout*/) m_canvasview = new PertCanvas(this); gl->addWidget(m_canvasview, 0, 0); draw(); - connect(m_canvasview, TQT_SIGNAL(rightButtonPressed(Node *, const TQPoint &)), this, TQT_SLOT(slotRMBPressed(Node *,const TQPoint &))); - connect(m_canvasview, TQT_SIGNAL(updateView(bool)), m_mainview, TQT_SLOT(slotUpdate(bool))); + connect(m_canvasview, TQ_SIGNAL(rightButtonPressed(Node *, const TQPoint &)), this, TQ_SLOT(slotRMBPressed(Node *,const TQPoint &))); + connect(m_canvasview, TQ_SIGNAL(updateView(bool)), m_mainview, TQ_SLOT(slotUpdate(bool))); - connect(m_canvasview, TQT_SIGNAL(addRelation(Node*, Node*)), TQT_SLOT(slotAddRelation(Node*, Node*))); - connect(m_canvasview, TQT_SIGNAL(modifyRelation(Relation*)), TQT_SLOT(slotModifyRelation(Relation*))); + connect(m_canvasview, TQ_SIGNAL(addRelation(Node*, Node*)), TQ_SLOT(slotAddRelation(Node*, Node*))); + connect(m_canvasview, TQ_SIGNAL(modifyRelation(Relation*)), TQ_SLOT(slotModifyRelation(Relation*))); } void PertView::draw() diff --git a/kplato/kptprojectdialog.cpp b/kplato/kptprojectdialog.cpp index 1b547629b..0fe1a721a 100644 --- a/kplato/kptprojectdialog.cpp +++ b/kplato/kptprojectdialog.cpp @@ -57,13 +57,13 @@ ProjectDialog::ProjectDialog(Project &p, TQWidget *parent, const char *name) dia->namefield->setText(project.name()); dia->leaderfield->setText(project.leader()); - connect(dia, TQT_SIGNAL( obligatedFieldsFilled(bool) ), this, TQT_SLOT( enableButtonOK(bool) )); - connect(dia, TQT_SIGNAL( schedulingTypeChanged(int) ), this, TQT_SLOT( slotSchedulingChanged(int) )); + connect(dia, TQ_SIGNAL( obligatedFieldsFilled(bool) ), this, TQ_SLOT( enableButtonOK(bool) )); + connect(dia, TQ_SIGNAL( schedulingTypeChanged(int) ), this, TQ_SLOT( slotSchedulingChanged(int) )); slotSchedulingChanged(dia->schedulerType->currentItem()); dia->namefield->setFocus(); - connect(resourcesTab, TQT_SIGNAL( changed() ), dia, TQT_SLOT( slotCheckAllFieldsFilled() )); + connect(resourcesTab, TQ_SIGNAL( changed() ), dia, TQ_SLOT( slotCheckAllFieldsFilled() )); } @@ -118,10 +118,10 @@ void ProjectDialog::slotSchedulingChanged(int activated) { } ProjectDialogImpl::ProjectDialogImpl (TQWidget *parent) : ProjectDialogBase(parent) { - connect (namefield, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotCheckAllFieldsFilled()) ); - connect (leaderfield, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotCheckAllFieldsFilled()) ); - connect (schedulerType, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSchedulingChanged( int )) ); - connect (chooseLeader, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseLeader())); + connect (namefield, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotCheckAllFieldsFilled()) ); + connect (leaderfield, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotCheckAllFieldsFilled()) ); + connect (schedulerType, TQ_SIGNAL(activated( int )), this, TQ_SLOT(slotSchedulingChanged( int )) ); + connect (chooseLeader, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChooseLeader())); } void ProjectDialogImpl::slotCheckAllFieldsFilled() { diff --git a/kplato/kptrelationdialog.cpp b/kplato/kptrelationdialog.cpp index 4de50c110..2b91b456a 100644 --- a/kplato/kptrelationdialog.cpp +++ b/kplato/kptrelationdialog.cpp @@ -61,8 +61,8 @@ AddRelationDialog::AddRelationDialog(Relation *rel, TQWidget *p, TQString captio m_panel->relationType->setFocus(); enableButtonOK(true); - connect(m_panel->relationType, TQT_SIGNAL(clicked(int)), TQT_SLOT(typeClicked(int))); - connect(m_panel->lag, TQT_SIGNAL(valueChanged()), TQT_SLOT(lagChanged())); + connect(m_panel->relationType, TQ_SIGNAL(clicked(int)), TQ_SLOT(typeClicked(int))); + connect(m_panel->lag, TQ_SIGNAL(valueChanged()), TQ_SLOT(lagChanged())); } KCommand *AddRelationDialog::buildCommand(Part *part) { diff --git a/kplato/kptreportview.cpp b/kplato/kptreportview.cpp index dbbae9a17..b346eef28 100644 --- a/kplato/kptreportview.cpp +++ b/kplato/kptreportview.cpp @@ -188,17 +188,17 @@ ReportView::ReportView(View *view, TQWidget *parent) initReportList(); - connect(m_reportList, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotReportListClicked(TQListViewItem*))); - connect(m_reportList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotReportListSelectionChanged(TQListViewItem*))); + connect(m_reportList, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotReportListClicked(TQListViewItem*))); + connect(m_reportList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotReportListSelectionChanged(TQListViewItem*))); //setCentralWidget(m_reportview); // Create the user interface. - //KStdAction::print(this,TQT_SLOT(slotPrint()),actionCollection()); - //KStdAction::quit(this,TQT_SLOT(slotFileQuit()),actionCollection()); + //KStdAction::print(this,TQ_SLOT(slotPrint()),actionCollection()); + //KStdAction::quit(this,TQ_SLOT(slotFileQuit()),actionCollection()); -// KStdAction::showToolbar(this,TQT_SLOT(slotViewToolBar()),actionCollection()); -// KStdAction::showStatusbar(this,TQT_SLOT(slotViewStatusBar()),actionCollection()); +// KStdAction::showToolbar(this,TQ_SLOT(slotViewToolBar()),actionCollection()); +// KStdAction::showStatusbar(this,TQ_SLOT(slotViewStatusBar()),actionCollection()); // statusBar(); diff --git a/kplato/kptrequestresourcespanel.cpp b/kplato/kptrequestresourcespanel.cpp index 790a61777..3544b0581 100644 --- a/kplato/kptrequestresourcespanel.cpp +++ b/kplato/kptrequestresourcespanel.cpp @@ -174,9 +174,9 @@ RequestResourcesPanel::RequestResourcesPanel(TQWidget *parent, Task &task, bool resourceTable->setReadOnly(baseline); - connect(groupList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(groupChanged(TQListViewItem*))); - connect(resourceTable, TQT_SIGNAL(valueChanged(int, int)), TQT_SLOT(resourceChanged(int, int))); -// connect(numUnits, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(unitsChanged(int))); + connect(groupList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(groupChanged(TQListViewItem*))); + connect(resourceTable, TQ_SIGNAL(valueChanged(int, int)), TQ_SLOT(resourceChanged(int, int))); +// connect(numUnits, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(unitsChanged(int))); } diff --git a/kplato/kptresourcedialog.cpp b/kplato/kptresourcedialog.cpp index 8e2c24fd8..1f2bc87da 100644 --- a/kplato/kptresourcedialog.cpp +++ b/kplato/kptresourcedialog.cpp @@ -53,23 +53,23 @@ ResourceDialogImpl::ResourceDialogImpl (TQWidget *parent) : ResourceDialogBase(parent) { - connect(type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(units, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); - connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(initialsEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(emailEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(units, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); + connect(nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(initialsEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(emailEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); - connect(calendarList, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); + connect(calendarList, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); - connect(rateEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(overtimeEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(rateEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(overtimeEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); - connect(chooseBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseResource())); + connect(chooseBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseResource())); - connect(availableFrom, TQT_SIGNAL(valueChanged(const TQDateTime&)), TQT_SLOT(slotChanged())); - connect(availableUntil, TQT_SIGNAL(valueChanged(const TQDateTime&)), TQT_SLOT(slotChanged())); - connect(availableFrom, TQT_SIGNAL(valueChanged(const TQDateTime&)), TQT_SLOT(slotAvailableFromChanged(const TQDateTime&))); - connect(availableUntil, TQT_SIGNAL(valueChanged(const TQDateTime&)), TQT_SLOT(slotAvailableUntilChanged(const TQDateTime&))); + connect(availableFrom, TQ_SIGNAL(valueChanged(const TQDateTime&)), TQ_SLOT(slotChanged())); + connect(availableUntil, TQ_SIGNAL(valueChanged(const TQDateTime&)), TQ_SLOT(slotChanged())); + connect(availableFrom, TQ_SIGNAL(valueChanged(const TQDateTime&)), TQ_SLOT(slotAvailableFromChanged(const TQDateTime&))); + connect(availableUntil, TQ_SIGNAL(valueChanged(const TQDateTime&)), TQ_SLOT(slotAvailableUntilChanged(const TQDateTime&))); } @@ -79,19 +79,19 @@ void ResourceDialogImpl::slotChanged() { void ResourceDialogImpl::slotAvailableFromChanged(const TQDateTime&) { if (availableUntil->dateTime() < availableFrom->dateTime()) { - disconnect(availableUntil, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(slotAvailableUntilChanged(const TQDateTime&))); + disconnect(availableUntil, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(slotAvailableUntilChanged(const TQDateTime&))); //kdDebug()<<"From: "<<availableFrom->dateTime().toString()<<" until="<<availableUntil->dateTime().toString()<<endl; availableUntil->setDateTime(availableFrom->dateTime()); - connect(availableUntil, TQT_SIGNAL(valueChanged(const TQDateTime&)), TQT_SLOT(slotAvailableUntilChanged(const TQDateTime&))); + connect(availableUntil, TQ_SIGNAL(valueChanged(const TQDateTime&)), TQ_SLOT(slotAvailableUntilChanged(const TQDateTime&))); } } void ResourceDialogImpl::slotAvailableUntilChanged(const TQDateTime&) { if (availableFrom->dateTime() > availableUntil->dateTime()) { - disconnect(availableFrom, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(slotAvailableFromChanged(const TQDateTime&))); + disconnect(availableFrom, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(slotAvailableFromChanged(const TQDateTime&))); //kdDebug()<<"Until: "<<availableUntil->dateTime().toString()<<" from="<<availableFrom->dateTime().toString()<<endl; availableFrom->setDateTime(availableUntil->dateTime()); - connect(availableFrom, TQT_SIGNAL(valueChanged(const TQDateTime&)), TQT_SLOT(slotAvailableFromChanged(const TQDateTime&))); + connect(availableFrom, TQ_SIGNAL(valueChanged(const TQDateTime&)), TQ_SLOT(slotAvailableFromChanged(const TQDateTime&))); } } @@ -151,9 +151,9 @@ ResourceDialog::ResourceDialog(Project &project, Resource *resource, TQWidget *p } dia->calendarList->setCurrentItem(cal); - connect(dia, TQT_SIGNAL(changed()), TQT_SLOT(enableButtonOk())); - connect(dia, TQT_SIGNAL(calculate()), TQT_SLOT(slotCalculationNeeded())); - connect(dia->calendarList, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCalendarChanged(int))); + connect(dia, TQ_SIGNAL(changed()), TQ_SLOT(enableButtonOk())); + connect(dia, TQ_SIGNAL(calculate()), TQ_SLOT(slotCalculationNeeded())); + connect(dia->calendarList, TQ_SIGNAL(activated(int)), TQ_SLOT(slotCalendarChanged(int))); } diff --git a/kplato/kptresourcesdialog.cpp b/kplato/kptresourcesdialog.cpp index 37ce45298..ea849ff81 100644 --- a/kplato/kptresourcesdialog.cpp +++ b/kplato/kptresourcesdialog.cpp @@ -41,7 +41,7 @@ ResourcesDialog::ResourcesDialog(Project &p, TQWidget *parent, const char *name) setMainWidget(panel); enableButtonOK(false); - connect(panel, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged())); + connect(panel, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged())); } diff --git a/kplato/kptresourcespanel.cpp b/kplato/kptresourcespanel.cpp index 86275cd73..1d38cbdad 100644 --- a/kplato/kptresourcespanel.cpp +++ b/kplato/kptresourcespanel.cpp @@ -262,25 +262,25 @@ ResourcesPanel::ResourcesPanel(TQWidget *parent, Project *p) : ResourcesPanelBas listOfGroups->setSelected(listOfGroups->firstChild(), true); slotGroupChanged(); - connect(bAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddGroup())); - connect(bRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteGroup())); - connect(listOfGroups, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotGroupChanged())); - connect(listOfGroups, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotListDoubleClicked(TQListViewItem*, const TQPoint&, int))); - connect(listOfGroups, TQT_SIGNAL(itemRenamed(TQListViewItem*, int)), TQT_SLOT(slotItemRenamed(TQListViewItem*, int))); + connect(bAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddGroup())); + connect(bRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteGroup())); + connect(listOfGroups, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotGroupChanged())); + connect(listOfGroups, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(slotListDoubleClicked(TQListViewItem*, const TQPoint&, int))); + connect(listOfGroups, TQ_SIGNAL(itemRenamed(TQListViewItem*, int)), TQ_SLOT(slotItemRenamed(TQListViewItem*, int))); - connect(bAddResource, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( slotAddResource() )); - connect(bEditResource, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( slotEditResource() )); - connect(bRemoveResource, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( slotDeleteResource() )); - connect(listOfResources, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotResourceChanged(TQListBoxItem*))); - connect(listOfResources, TQT_SIGNAL(currentChanged(TQListBoxItem*)), TQT_SLOT(slotCurrentChanged(TQListBoxItem*))); - connect(resourceName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotResourceRename(const TQString&))); + connect(bAddResource, TQ_SIGNAL( clicked() ), this, TQ_SLOT ( slotAddResource() )); + connect(bEditResource, TQ_SIGNAL( clicked() ), this, TQ_SLOT ( slotEditResource() )); + connect(bRemoveResource, TQ_SIGNAL( clicked() ), this, TQ_SLOT ( slotDeleteResource() )); + connect(listOfResources, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotResourceChanged(TQListBoxItem*))); + connect(listOfResources, TQ_SIGNAL(currentChanged(TQListBoxItem*)), TQ_SLOT(slotCurrentChanged(TQListBoxItem*))); + connect(resourceName, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotResourceRename(const TQString&))); // Internal hacks, to get renaming to behave // Uses signals to not get in the way of TQListView - connect(this, TQT_SIGNAL(renameStarted(TQListViewItem*, int)), TQT_SLOT(slotRenameStarted(TQListViewItem*, int))); - connect(this, TQT_SIGNAL(startRename(TQListViewItem*, int)), TQT_SLOT(slotStartRename(TQListViewItem*, int))); - connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotGroupChanged())); + connect(this, TQ_SIGNAL(renameStarted(TQListViewItem*, int)), TQ_SLOT(slotRenameStarted(TQListViewItem*, int))); + connect(this, TQ_SIGNAL(startRename(TQListViewItem*, int)), TQ_SLOT(slotStartRename(TQListViewItem*, int))); + connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotGroupChanged())); } void ResourcesPanel::slotAddGroup() { diff --git a/kplato/kptresourceview.cpp b/kplato/kptresourceview.cpp index fd07757e3..d30d302fd 100644 --- a/kplato/kptresourceview.cpp +++ b/kplato/kptresourceview.cpp @@ -405,11 +405,11 @@ ResourceView::ResourceView(View *view, TQWidget *parent) m_appview->hide(); draw(view->getProject()); - //connect(resList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(resSelectionChanged(TQListViewItem*))); - connect(resList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(resSelectionChanged())); - connect(resList, TQT_SIGNAL( contextMenuRequested(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(popupMenuRequested(TQListViewItem*, const TQPoint&, int))); + //connect(resList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(resSelectionChanged(TQListViewItem*))); + connect(resList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(resSelectionChanged())); + connect(resList, TQ_SIGNAL( contextMenuRequested(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(popupMenuRequested(TQListViewItem*, const TQPoint&, int))); //NOTE: using doubleClicked, not executed() to be consistent with ganttview - connect(resList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(resList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); } diff --git a/kplato/kptstandardworktimedialog.cpp b/kplato/kptstandardworktimedialog.cpp index 31fcae494..2060fcbaa 100644 --- a/kplato/kptstandardworktimedialog.cpp +++ b/kplato/kptstandardworktimedialog.cpp @@ -103,8 +103,8 @@ StandardWorktimeDialog::StandardWorktimeDialog(Project &p, TQWidget *parent, con setMainWidget(dia); enableButtonOK(false); - connect(dia, TQT_SIGNAL(obligatedFieldsFilled(bool) ), TQT_SLOT(enableButtonOK(bool))); - connect(dia, TQT_SIGNAL(enableButtonOk(bool)), TQT_SLOT(enableButtonOK(bool))); + connect(dia, TQ_SIGNAL(obligatedFieldsFilled(bool) ), TQ_SLOT(enableButtonOK(bool))); + connect(dia, TQ_SIGNAL(enableButtonOk(bool)), TQ_SLOT(enableButtonOK(bool))); } KMacroCommand *StandardWorktimeDialog::buildCommand(Part *part) { @@ -179,15 +179,15 @@ StandardWorktimeDialogImpl::StandardWorktimeDialogImpl(StandardWorktime *std, TQ weekdayList->insertItem(item); } } - connect(year, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotYearChanged(double))); - connect(month, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotMonthChanged(double))); - connect(week, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotWeekChanged(double))); - connect(day, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotDayChanged(double))); + connect(year, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotYearChanged(double))); + connect(month, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotMonthChanged(double))); + connect(week, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotWeekChanged(double))); + connect(day, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotDayChanged(double))); - connect(m_intervalEdit, TQT_SIGNAL(changed()), TQT_SLOT(slotIntervalChanged())); - connect(bApply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyClicked())); - connect(weekdayList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotWeekdaySelected())); - connect(state, TQT_SIGNAL(activated(int)), TQT_SLOT(slotStateChanged(int))); + connect(m_intervalEdit, TQ_SIGNAL(changed()), TQ_SLOT(slotIntervalChanged())); + connect(bApply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyClicked())); + connect(weekdayList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotWeekdaySelected())); + connect(state, TQ_SIGNAL(activated(int)), TQ_SLOT(slotStateChanged(int))); if (weekdayList->firstChild()) { weekdayList->setSelected(weekdayList->firstChild(), true); diff --git a/kplato/kptsummarytaskdialog.cpp b/kplato/kptsummarytaskdialog.cpp index adf152a19..2a2836aa7 100644 --- a/kplato/kptsummarytaskdialog.cpp +++ b/kplato/kptsummarytaskdialog.cpp @@ -37,7 +37,7 @@ SummaryTaskDialog::SummaryTaskDialog(Task &task, TQWidget *p) setMainWidget(m_generalTab); enableButtonOK(false); - connect(m_generalTab, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(enableButtonOK(bool))); + connect(m_generalTab, TQ_SIGNAL(obligatedFieldsFilled(bool)), TQ_SLOT(enableButtonOK(bool))); } diff --git a/kplato/kptsummarytaskgeneralpanel.cpp b/kplato/kptsummarytaskgeneralpanel.cpp index 8fff18211..bdf83791f 100644 --- a/kplato/kptsummarytaskgeneralpanel.cpp +++ b/kplato/kptsummarytaskgeneralpanel.cpp @@ -51,12 +51,12 @@ SummaryTaskGeneralPanel::SummaryTaskGeneralPanel(Task &task, TQWidget *p, const { setStartValues(task); - connect(namefield, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotObligatedFieldsFilled())); - connect(leaderfield, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotObligatedFieldsFilled())); - connect(idfield, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotObligatedFieldsFilled())); - connect(descriptionfield, TQT_SIGNAL(textChanged()), TQT_SLOT(slotObligatedFieldsFilled())); + connect(namefield, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotObligatedFieldsFilled())); + connect(leaderfield, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotObligatedFieldsFilled())); + connect(idfield, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotObligatedFieldsFilled())); + connect(descriptionfield, TQ_SIGNAL(textChanged()), TQ_SLOT(slotObligatedFieldsFilled())); - connect(chooseLeader, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseResponsible())); + connect(chooseLeader, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseResponsible())); } diff --git a/kplato/kpttaskcostpanel.cpp b/kplato/kpttaskcostpanel.cpp index d33e2c7cb..ddc44cb89 100644 --- a/kplato/kpttaskcostpanel.cpp +++ b/kplato/kpttaskcostpanel.cpp @@ -135,11 +135,11 @@ bool TaskCostPanel::ok() { TaskCostPanelImpl::TaskCostPanelImpl(TQWidget *p, const char *n) : TaskCostPanelBase(p, n) { - connect(runningAccount, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(startupAccount, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(shutdownAccount, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(startupCost, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(shutdownCost, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(runningAccount, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(startupAccount, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(shutdownAccount, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(startupCost, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(shutdownCost, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); } void TaskCostPanelImpl::slotChanged() { diff --git a/kplato/kpttaskdefaultpanel.cpp b/kplato/kpttaskdefaultpanel.cpp index d3fb322ed..042c85294 100644 --- a/kplato/kpttaskdefaultpanel.cpp +++ b/kplato/kpttaskdefaultpanel.cpp @@ -192,18 +192,18 @@ void TaskDefaultPanel::scheduleTypeChanged(int value) ConfigTaskPanelImpl::ConfigTaskPanelImpl(TQWidget *p, const char *n) : ConfigTaskPanelBase(p, n) { - connect(leaderfield, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(checkAllFieldsFilled())); - connect(chooseLeader, TQT_SIGNAL(clicked()), TQT_SLOT(changeLeader())); - connect(estimateType, TQT_SIGNAL(activated(int)), TQT_SLOT(estimationTypeChanged(int))); - connect(scheduleType, TQT_SIGNAL(activated(int)), TQT_SLOT(scheduleTypeChanged(int))); - connect(scheduleStartDate, TQT_SIGNAL(changed(TQDate)), TQT_SLOT(startDateChanged())); - connect(scheduleStartTime, TQT_SIGNAL(valueChanged(const TQTime&)), TQT_SLOT(startTimeChanged(const TQTime&))); - connect(scheduleEndDate, TQT_SIGNAL(changed(TQDate)), TQT_SLOT(endDateChanged())); - connect(scheduleEndTime, TQT_SIGNAL(valueChanged(const TQTime&)), TQT_SLOT(endTimeChanged(const TQTime&))); - connect(estimate, TQT_SIGNAL(valueChanged()), TQT_SLOT(checkAllFieldsFilled())); - connect(optimisticValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(checkAllFieldsFilled())); - connect(pessimisticValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(checkAllFieldsFilled())); - connect(descriptionfield, TQT_SIGNAL(textChanged()), TQT_SLOT(checkAllFieldsFilled())); + connect(leaderfield, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(checkAllFieldsFilled())); + connect(chooseLeader, TQ_SIGNAL(clicked()), TQ_SLOT(changeLeader())); + connect(estimateType, TQ_SIGNAL(activated(int)), TQ_SLOT(estimationTypeChanged(int))); + connect(scheduleType, TQ_SIGNAL(activated(int)), TQ_SLOT(scheduleTypeChanged(int))); + connect(scheduleStartDate, TQ_SIGNAL(changed(TQDate)), TQ_SLOT(startDateChanged())); + connect(scheduleStartTime, TQ_SIGNAL(valueChanged(const TQTime&)), TQ_SLOT(startTimeChanged(const TQTime&))); + connect(scheduleEndDate, TQ_SIGNAL(changed(TQDate)), TQ_SLOT(endDateChanged())); + connect(scheduleEndTime, TQ_SIGNAL(valueChanged(const TQTime&)), TQ_SLOT(endTimeChanged(const TQTime&))); + connect(estimate, TQ_SIGNAL(valueChanged()), TQ_SLOT(checkAllFieldsFilled())); + connect(optimisticValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(checkAllFieldsFilled())); + connect(pessimisticValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(checkAllFieldsFilled())); + connect(descriptionfield, TQ_SIGNAL(textChanged()), TQ_SLOT(checkAllFieldsFilled())); } void ConfigTaskPanelImpl::setSchedulingType(int type) diff --git a/kplato/kpttaskdialog.cpp b/kplato/kpttaskdialog.cpp index 65aa917f2..533b77403 100644 --- a/kplato/kpttaskdialog.cpp +++ b/kplato/kpttaskdialog.cpp @@ -50,9 +50,9 @@ TaskDialog::TaskDialog(Task &task, Accounts &accounts, StandardWorktime *workTim // Set the state of all the child widgets. enableButtonOK(false); - connect(m_generalTab, TQT_SIGNAL( obligatedFieldsFilled(bool) ), this, TQT_SLOT( enableButtonOK(bool) )); - connect(m_resourcesTab, TQT_SIGNAL( changed() ), m_generalTab, TQT_SLOT( checkAllFieldsFilled() )); - connect(m_costTab, TQT_SIGNAL( changed() ), m_generalTab, TQT_SLOT( checkAllFieldsFilled() )); + connect(m_generalTab, TQ_SIGNAL( obligatedFieldsFilled(bool) ), this, TQ_SLOT( enableButtonOK(bool) )); + connect(m_resourcesTab, TQ_SIGNAL( changed() ), m_generalTab, TQ_SLOT( checkAllFieldsFilled() )); + connect(m_costTab, TQ_SIGNAL( changed() ), m_generalTab, TQ_SLOT( checkAllFieldsFilled() )); } diff --git a/kplato/kpttaskgeneralpanel.cpp b/kplato/kpttaskgeneralpanel.cpp index 854197e39..3acd2745e 100644 --- a/kplato/kpttaskgeneralpanel.cpp +++ b/kplato/kpttaskgeneralpanel.cpp @@ -229,21 +229,21 @@ void TaskGeneralPanel::scheduleTypeChanged(int value) TaskGeneralPanelImpl::TaskGeneralPanelImpl(TQWidget *p, const char *n) : TaskGeneralPanelBase(p, n) { - connect(idfield, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(checkAllFieldsFilled())); - connect(namefield, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(checkAllFieldsFilled())); - connect(leaderfield, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(checkAllFieldsFilled())); - connect(chooseLeader, TQT_SIGNAL(clicked()), TQT_SLOT(changeLeader())); - connect(estimateType, TQT_SIGNAL(activated(int)), TQT_SLOT(estimationTypeChanged(int))); - connect(scheduleType, TQT_SIGNAL(activated(int)), TQT_SLOT(scheduleTypeChanged(int))); - connect(scheduleStartDate, TQT_SIGNAL(changed(TQDate)), TQT_SLOT(startDateChanged())); - connect(scheduleStartTime, TQT_SIGNAL(valueChanged(const TQTime&)), TQT_SLOT(startTimeChanged(const TQTime&))); - connect(scheduleEndDate, TQT_SIGNAL(changed(TQDate)), TQT_SLOT(endDateChanged())); - connect(scheduleEndTime, TQT_SIGNAL(valueChanged(const TQTime&)), TQT_SLOT(endTimeChanged(const TQTime&))); - connect(estimate, TQT_SIGNAL(valueChanged()), TQT_SLOT(checkAllFieldsFilled())); - connect(optimisticValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(checkAllFieldsFilled())); - connect(pessimisticValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(checkAllFieldsFilled())); - connect(descriptionfield, TQT_SIGNAL(textChanged()), TQT_SLOT(checkAllFieldsFilled())); - connect(risk, TQT_SIGNAL(activated(int)), TQT_SLOT(checkAllFieldsFilled())); + connect(idfield, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(checkAllFieldsFilled())); + connect(namefield, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(checkAllFieldsFilled())); + connect(leaderfield, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(checkAllFieldsFilled())); + connect(chooseLeader, TQ_SIGNAL(clicked()), TQ_SLOT(changeLeader())); + connect(estimateType, TQ_SIGNAL(activated(int)), TQ_SLOT(estimationTypeChanged(int))); + connect(scheduleType, TQ_SIGNAL(activated(int)), TQ_SLOT(scheduleTypeChanged(int))); + connect(scheduleStartDate, TQ_SIGNAL(changed(TQDate)), TQ_SLOT(startDateChanged())); + connect(scheduleStartTime, TQ_SIGNAL(valueChanged(const TQTime&)), TQ_SLOT(startTimeChanged(const TQTime&))); + connect(scheduleEndDate, TQ_SIGNAL(changed(TQDate)), TQ_SLOT(endDateChanged())); + connect(scheduleEndTime, TQ_SIGNAL(valueChanged(const TQTime&)), TQ_SLOT(endTimeChanged(const TQTime&))); + connect(estimate, TQ_SIGNAL(valueChanged()), TQ_SLOT(checkAllFieldsFilled())); + connect(optimisticValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(checkAllFieldsFilled())); + connect(pessimisticValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(checkAllFieldsFilled())); + connect(descriptionfield, TQ_SIGNAL(textChanged()), TQ_SLOT(checkAllFieldsFilled())); + connect(risk, TQ_SIGNAL(activated(int)), TQ_SLOT(checkAllFieldsFilled())); } void TaskGeneralPanelImpl::setSchedulingType(int type) diff --git a/kplato/kpttaskprogressdialog.cpp b/kplato/kpttaskprogressdialog.cpp index 180d3a53d..3f91c03da 100644 --- a/kplato/kpttaskprogressdialog.cpp +++ b/kplato/kpttaskprogressdialog.cpp @@ -37,7 +37,7 @@ TaskProgressDialog::TaskProgressDialog(Task &task, StandardWorktime *workTime, T enableButtonOK(false); - connect(m_panel, TQT_SIGNAL( changed() ), TQT_SLOT(slotChanged())); + connect(m_panel, TQ_SIGNAL( changed() ), TQ_SLOT(slotChanged())); } void TaskProgressDialog::slotChanged() { diff --git a/kplato/kpttaskprogresspanel.cpp b/kplato/kpttaskprogresspanel.cpp index 00de2b225..be22b5253 100644 --- a/kplato/kpttaskprogresspanel.cpp +++ b/kplato/kpttaskprogresspanel.cpp @@ -127,17 +127,17 @@ void TaskProgressPanel::setEstimateScales( int day ) TaskProgressPanelImpl::TaskProgressPanelImpl(TQWidget *parent, const char *name, WFlags f) : TaskProgressPanelBase(parent, name, f) { - connect(started, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotStartedChanged(bool))); - connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFinishedChanged(bool))); + connect(started, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotStartedChanged(bool))); + connect(finished, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFinishedChanged(bool))); - connect(percentFinished, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPercentFinishedChanged(int))); - connect(percentFinished, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(percentFinished, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotPercentFinishedChanged(int))); + connect(percentFinished, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); - connect(startTime, TQT_SIGNAL(valueChanged(const TQDateTime &)), TQT_SLOT(slotChanged())); - connect(finishTime, TQT_SIGNAL(valueChanged(const TQDateTime &)), TQT_SLOT(slotChanged())); + connect(startTime, TQ_SIGNAL(valueChanged(const TQDateTime &)), TQ_SLOT(slotChanged())); + connect(finishTime, TQ_SIGNAL(valueChanged(const TQDateTime &)), TQ_SLOT(slotChanged())); - connect(remainingEffort, TQT_SIGNAL(valueChanged()), TQT_SLOT(slotChanged())); - connect(actualEffort, TQT_SIGNAL(valueChanged()), TQT_SLOT(slotChanged())); + connect(remainingEffort, TQ_SIGNAL(valueChanged()), TQ_SLOT(slotChanged())); + connect(actualEffort, TQ_SIGNAL(valueChanged()), TQ_SLOT(slotChanged())); } diff --git a/kplato/kptview.cpp b/kplato/kptview.cpp index 7f4d62b2f..feb8c221d 100644 --- a/kplato/kptview.cpp +++ b/kplato/kptview.cpp @@ -144,150 +144,150 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) //m_reportview = new ReportView(this, m_tab); //m_tab->addWidget(m_reportview); - connect(m_tab, TQT_SIGNAL(aboutToShow(TQWidget *)), this, TQT_SLOT(slotAboutToShow(TQWidget *))); + connect(m_tab, TQ_SIGNAL(aboutToShow(TQWidget *)), this, TQ_SLOT(slotAboutToShow(TQWidget *))); - connect(m_pertview, TQT_SIGNAL(addRelation(Node*, Node*)), TQT_SLOT(slotAddRelation(Node*, Node*))); - connect(m_pertview, TQT_SIGNAL(modifyRelation(Relation*)), TQT_SLOT(slotModifyRelation(Relation*))); - - connect(m_ganttview, TQT_SIGNAL(enableActions(bool)), TQT_SLOT(setTaskActionsEnabled(bool))); - connect(m_ganttview, TQT_SIGNAL(addRelation(Node*, Node*, int)), TQT_SLOT(slotAddRelation(Node*, Node*, int))); - connect(m_ganttview, TQT_SIGNAL(modifyRelation(Relation*, int)), TQT_SLOT(slotModifyRelation(Relation*, int))); - connect(m_ganttview, TQT_SIGNAL(modifyRelation(Relation*)), TQT_SLOT(slotModifyRelation(Relation*))); - connect(m_ganttview, TQT_SIGNAL(itemDoubleClicked()), TQT_SLOT(slotOpenNode())); - connect(m_ganttview, TQT_SIGNAL(itemRenamed(Node*, const TQString&)),this, TQT_SLOT(slotRenameNode(Node*, const TQString&))); - connect(m_ganttview, TQT_SIGNAL(requestPopupMenu(const TQString&, const TQPoint &)),this, TQT_SLOT(slotPopupMenu(const TQString&, const TQPoint&))); - connect(m_resourceview, TQT_SIGNAL(itemDoubleClicked()), TQT_SLOT(slotEditResource())); + connect(m_pertview, TQ_SIGNAL(addRelation(Node*, Node*)), TQ_SLOT(slotAddRelation(Node*, Node*))); + connect(m_pertview, TQ_SIGNAL(modifyRelation(Relation*)), TQ_SLOT(slotModifyRelation(Relation*))); + + connect(m_ganttview, TQ_SIGNAL(enableActions(bool)), TQ_SLOT(setTaskActionsEnabled(bool))); + connect(m_ganttview, TQ_SIGNAL(addRelation(Node*, Node*, int)), TQ_SLOT(slotAddRelation(Node*, Node*, int))); + connect(m_ganttview, TQ_SIGNAL(modifyRelation(Relation*, int)), TQ_SLOT(slotModifyRelation(Relation*, int))); + connect(m_ganttview, TQ_SIGNAL(modifyRelation(Relation*)), TQ_SLOT(slotModifyRelation(Relation*))); + connect(m_ganttview, TQ_SIGNAL(itemDoubleClicked()), TQ_SLOT(slotOpenNode())); + connect(m_ganttview, TQ_SIGNAL(itemRenamed(Node*, const TQString&)),this, TQ_SLOT(slotRenameNode(Node*, const TQString&))); + connect(m_ganttview, TQ_SIGNAL(requestPopupMenu(const TQString&, const TQPoint &)),this, TQ_SLOT(slotPopupMenu(const TQString&, const TQPoint&))); + connect(m_resourceview, TQ_SIGNAL(itemDoubleClicked()), TQ_SLOT(slotEditResource())); // The menu items // ------ Edit - actionCut = KStdAction::cut( this, TQT_SLOT( slotEditCut() ), actionCollection(), "edit_cut" ); - actionCopy = KStdAction::copy( this, TQT_SLOT( slotEditCopy() ), actionCollection(), "edit_copy" ); - actionPaste = KStdAction::paste( this, TQT_SLOT( slotEditPaste() ), actionCollection(), "edit_paste" ); + actionCut = KStdAction::cut( this, TQ_SLOT( slotEditCut() ), actionCollection(), "edit_cut" ); + actionCopy = KStdAction::copy( this, TQ_SLOT( slotEditCopy() ), actionCollection(), "edit_copy" ); + actionPaste = KStdAction::paste( this, TQ_SLOT( slotEditPaste() ), actionCollection(), "edit_paste" ); actionIndentTask = new TDEAction(i18n("Indent Task"), "indent_task", 0, this, - TQT_SLOT(slotIndentTask()), actionCollection(), "indent_task"); + TQ_SLOT(slotIndentTask()), actionCollection(), "indent_task"); actionUnindentTask = new TDEAction(i18n("Unindent Task"), "unindent_task", 0, this, - TQT_SLOT(slotUnindentTask()), actionCollection(), "unindent_task"); + TQ_SLOT(slotUnindentTask()), actionCollection(), "unindent_task"); actionMoveTaskUp = new TDEAction(i18n("Move Up"), "move_task_up", 0, this, - TQT_SLOT(slotMoveTaskUp()), actionCollection(), "move_task_up"); + TQ_SLOT(slotMoveTaskUp()), actionCollection(), "move_task_up"); actionMoveTaskDown = new TDEAction(i18n("Move Down"), "move_task_down", 0, this, - TQT_SLOT(slotMoveTaskDown()), actionCollection(), "move_task_down"); + TQ_SLOT(slotMoveTaskDown()), actionCollection(), "move_task_down"); // ------ View - actionViewGantt = new TDEAction(i18n("Gantt"), "gantt_chart", 0, this, TQT_SLOT(slotViewGantt()), actionCollection(), "view_gantt"); + actionViewGantt = new TDEAction(i18n("Gantt"), "gantt_chart", 0, this, TQ_SLOT(slotViewGantt()), actionCollection(), "view_gantt"); TQString group = "EstimationType"; - actionViewExpected = new TDERadioAction(i18n("Expected"), 0, 0, this, TQT_SLOT(slotViewExpected()), actionCollection(), "view_expected"); + actionViewExpected = new TDERadioAction(i18n("Expected"), 0, 0, this, TQ_SLOT(slotViewExpected()), actionCollection(), "view_expected"); actionViewExpected->setExclusiveGroup(group); - actionViewOptimistic = new TDERadioAction(i18n("Optimistic"), 0, 0, this, TQT_SLOT(slotViewOptimistic()), actionCollection(), "view_optimistic"); + actionViewOptimistic = new TDERadioAction(i18n("Optimistic"), 0, 0, this, TQ_SLOT(slotViewOptimistic()), actionCollection(), "view_optimistic"); actionViewOptimistic->setExclusiveGroup(group); - actionViewPessimistic = new TDERadioAction(i18n("Pessimistic"), 0, 0, this, TQT_SLOT(slotViewPessimistic()), actionCollection(), "view_pessimistic"); + actionViewPessimistic = new TDERadioAction(i18n("Pessimistic"), 0, 0, this, TQ_SLOT(slotViewPessimistic()), actionCollection(), "view_pessimistic"); actionViewPessimistic->setExclusiveGroup(group); - actionViewGanttResources = new TDEToggleAction(i18n("Resources"), 0, 0, this, TQT_SLOT(slotViewGanttResources()), actionCollection(), "view_gantt_showResources"); - actionViewGanttTaskName = new TDEToggleAction(i18n("Task Name"), 0, 0, this, TQT_SLOT(slotViewGanttTaskName()), actionCollection(), "view_gantt_showTaskName"); - actionViewGanttTaskLinks = new TDEToggleAction(i18n("Task Links"), 0, 0, this, TQT_SLOT(slotViewGanttTaskLinks()), actionCollection(), "view_gantt_showTaskLinks"); - actionViewGanttProgress = new TDEToggleAction(i18n("Progress"), 0, 0, this, TQT_SLOT(slotViewGanttProgress()), actionCollection(), "view_gantt_showProgress"); - actionViewGanttFloat = new TDEToggleAction(i18n("Float"), 0, 0, this, TQT_SLOT(slotViewGanttFloat()), actionCollection(), "view_gantt_showFloat"); - actionViewGanttCriticalTasks = new TDEToggleAction(i18n("Critical Tasks"), 0, 0, this, TQT_SLOT(slotViewGanttCriticalTasks()), actionCollection(), "view_gantt_showCriticalTasks"); - actionViewGanttCriticalPath = new TDEToggleAction(i18n("Critical Path"), 0, 0, this, TQT_SLOT(slotViewGanttCriticalPath()), actionCollection(), "view_gantt_showCriticalPath"); + actionViewGanttResources = new TDEToggleAction(i18n("Resources"), 0, 0, this, TQ_SLOT(slotViewGanttResources()), actionCollection(), "view_gantt_showResources"); + actionViewGanttTaskName = new TDEToggleAction(i18n("Task Name"), 0, 0, this, TQ_SLOT(slotViewGanttTaskName()), actionCollection(), "view_gantt_showTaskName"); + actionViewGanttTaskLinks = new TDEToggleAction(i18n("Task Links"), 0, 0, this, TQ_SLOT(slotViewGanttTaskLinks()), actionCollection(), "view_gantt_showTaskLinks"); + actionViewGanttProgress = new TDEToggleAction(i18n("Progress"), 0, 0, this, TQ_SLOT(slotViewGanttProgress()), actionCollection(), "view_gantt_showProgress"); + actionViewGanttFloat = new TDEToggleAction(i18n("Float"), 0, 0, this, TQ_SLOT(slotViewGanttFloat()), actionCollection(), "view_gantt_showFloat"); + actionViewGanttCriticalTasks = new TDEToggleAction(i18n("Critical Tasks"), 0, 0, this, TQ_SLOT(slotViewGanttCriticalTasks()), actionCollection(), "view_gantt_showCriticalTasks"); + actionViewGanttCriticalPath = new TDEToggleAction(i18n("Critical Path"), 0, 0, this, TQ_SLOT(slotViewGanttCriticalPath()), actionCollection(), "view_gantt_showCriticalPath"); -// actionViewGanttNotScheduled = new TDEToggleAction(i18n("Not Scheduled"), 0, 0, this, TQT_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled"); +// actionViewGanttNotScheduled = new TDEToggleAction(i18n("Not Scheduled"), 0, 0, this, TQ_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled"); - actionViewTaskAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQT_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments"); + actionViewTaskAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQ_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments"); - actionViewPert = new TDEAction(i18n("Network"), "pert_chart", 0, this, TQT_SLOT(slotViewPert()), actionCollection(), "view_pert"); + actionViewPert = new TDEAction(i18n("Network"), "pert_chart", 0, this, TQ_SLOT(slotViewPert()), actionCollection(), "view_pert"); - actionViewResources = new TDEAction(i18n("Resources"), "resources", 0, this, TQT_SLOT(slotViewResources()), actionCollection(), "view_resources"); + actionViewResources = new TDEAction(i18n("Resources"), "resources", 0, this, TQ_SLOT(slotViewResources()), actionCollection(), "view_resources"); - actionViewResourceAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQT_SLOT(slotViewResourceAppointments()), actionCollection(), "view_resource_appointments"); + actionViewResourceAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQ_SLOT(slotViewResourceAppointments()), actionCollection(), "view_resource_appointments"); - actionViewAccounts = new TDEAction(i18n("Accounts"), "accounts", 0, this, TQT_SLOT(slotViewAccounts()), actionCollection(), "view_accounts"); + actionViewAccounts = new TDEAction(i18n("Accounts"), "accounts", 0, this, TQ_SLOT(slotViewAccounts()), actionCollection(), "view_accounts"); - //actionViewReports = new TDEAction(i18n("Reports"), "reports", 0, this, TQT_SLOT(slotViewReports()), actionCollection(), "view_reports"); + //actionViewReports = new TDEAction(i18n("Reports"), "reports", 0, this, TQ_SLOT(slotViewReports()), actionCollection(), "view_reports"); // ------ Insert actionAddTask = new TDEAction(i18n("Task..."), "add_task", 0, this, - TQT_SLOT(slotAddTask()), actionCollection(), "add_task"); + TQ_SLOT(slotAddTask()), actionCollection(), "add_task"); actionAddSubtask = new TDEAction(i18n("Sub-Task..."), "add_sub_task", 0, this, - TQT_SLOT(slotAddSubTask()), actionCollection(), "add_sub_task"); + TQ_SLOT(slotAddSubTask()), actionCollection(), "add_sub_task"); actionAddMilestone = new TDEAction(i18n("Milestone..."), "add_milestone", 0, this, - TQT_SLOT(slotAddMilestone()), actionCollection(), "add_milestone"); + TQ_SLOT(slotAddMilestone()), actionCollection(), "add_milestone"); // ------ Project - actionEditMainProject = new TDEAction(i18n("Edit Main Project..."), "edit", 0, this, TQT_SLOT(slotProjectEdit()), actionCollection(), "project_edit"); - actionEditStandardWorktime = new TDEAction(i18n("Edit Standard Worktime..."), "edit", 0, this, TQT_SLOT(slotProjectWorktime()), actionCollection(), "project_worktime"); - actionEditCalendar = new TDEAction(i18n("Edit Calendar..."), "edit", 0, this, TQT_SLOT(slotProjectCalendar()), actionCollection(), "project_calendar"); - actionEditAccounts = new TDEAction(i18n("Edit Accounts..."), "edit", 0, this, TQT_SLOT(slotProjectAccounts()), actionCollection(), "project_accounts"); - actionEditResources = new TDEAction(i18n("Edit Resources..."), "edit", 0, this, TQT_SLOT(slotProjectResources()), actionCollection(), "project_resources"); + actionEditMainProject = new TDEAction(i18n("Edit Main Project..."), "edit", 0, this, TQ_SLOT(slotProjectEdit()), actionCollection(), "project_edit"); + actionEditStandardWorktime = new TDEAction(i18n("Edit Standard Worktime..."), "edit", 0, this, TQ_SLOT(slotProjectWorktime()), actionCollection(), "project_worktime"); + actionEditCalendar = new TDEAction(i18n("Edit Calendar..."), "edit", 0, this, TQ_SLOT(slotProjectCalendar()), actionCollection(), "project_calendar"); + actionEditAccounts = new TDEAction(i18n("Edit Accounts..."), "edit", 0, this, TQ_SLOT(slotProjectAccounts()), actionCollection(), "project_accounts"); + actionEditResources = new TDEAction(i18n("Edit Resources..."), "edit", 0, this, TQ_SLOT(slotProjectResources()), actionCollection(), "project_resources"); actionCalculate = new TDEActionMenu(i18n("Calculate"), "project_calculate", actionCollection(), "project_calculate"); - connect(actionCalculate, TQT_SIGNAL(activated()), TQT_SLOT(slotProjectCalculate())); + connect(actionCalculate, TQ_SIGNAL(activated()), TQ_SLOT(slotProjectCalculate())); - actionCalculateExpected = new TDEAction(i18n("Expected"), 0, 0, this, TQT_SLOT(slotProjectCalculateExpected()), actionCollection(), "project_calculate_expected"); + actionCalculateExpected = new TDEAction(i18n("Expected"), 0, 0, this, TQ_SLOT(slotProjectCalculateExpected()), actionCollection(), "project_calculate_expected"); actionCalculate->insert(actionCalculateExpected); - actionCalculateOptimistic = new TDEAction(i18n("Optimistic"), 0, 0, this, TQT_SLOT(slotProjectCalculateOptimistic()), actionCollection(), "project_calculate_optimistic"); + actionCalculateOptimistic = new TDEAction(i18n("Optimistic"), 0, 0, this, TQ_SLOT(slotProjectCalculateOptimistic()), actionCollection(), "project_calculate_optimistic"); actionCalculate->insert(actionCalculateOptimistic); - actionCalculatePessimistic = new TDEAction(i18n("Pessimistic"), 0, 0, this, TQT_SLOT(slotProjectCalculatePessimistic()), actionCollection(), "project_calculate_pessimistic"); + actionCalculatePessimistic = new TDEAction(i18n("Pessimistic"), 0, 0, this, TQ_SLOT(slotProjectCalculatePessimistic()), actionCollection(), "project_calculate_pessimistic"); actionCalculate->insert(actionCalculatePessimistic); /* // ------ Reports - actionFirstpage = KStdAction::firstPage(m_reportview,TQT_SLOT(slotPrevPage()),actionCollection(),"go_firstpage"); - connect(m_reportview, TQT_SIGNAL(setFirstPageActionEnabled(bool)), actionFirstpage, TQT_SLOT(setEnabled(bool))); - actionPriorpage = KStdAction::prior(m_reportview,TQT_SLOT(slotPrevPage()),actionCollection(),"go_prevpage"); - connect(m_reportview, TQT_SIGNAL(setPriorPageActionEnabled(bool)), actionPriorpage, TQT_SLOT(setEnabled(bool))); - actionNextpage = KStdAction::next(m_reportview,TQT_SLOT(slotNextPage()),actionCollection(), "go_nextpage"); - connect(m_reportview, TQT_SIGNAL(setNextPageActionEnabled(bool)), actionNextpage, TQT_SLOT(setEnabled(bool))); - actionLastpage = KStdAction::lastPage(m_reportview,TQT_SLOT(slotLastPage()),actionCollection(), "go_lastpage"); - connect(m_reportview, TQT_SIGNAL(setLastPageActionEnabled(bool)), actionLastpage, TQT_SLOT(setEnabled(bool))); + actionFirstpage = KStdAction::firstPage(m_reportview,TQ_SLOT(slotPrevPage()),actionCollection(),"go_firstpage"); + connect(m_reportview, TQ_SIGNAL(setFirstPageActionEnabled(bool)), actionFirstpage, TQ_SLOT(setEnabled(bool))); + actionPriorpage = KStdAction::prior(m_reportview,TQ_SLOT(slotPrevPage()),actionCollection(),"go_prevpage"); + connect(m_reportview, TQ_SIGNAL(setPriorPageActionEnabled(bool)), actionPriorpage, TQ_SLOT(setEnabled(bool))); + actionNextpage = KStdAction::next(m_reportview,TQ_SLOT(slotNextPage()),actionCollection(), "go_nextpage"); + connect(m_reportview, TQ_SIGNAL(setNextPageActionEnabled(bool)), actionNextpage, TQ_SLOT(setEnabled(bool))); + actionLastpage = KStdAction::lastPage(m_reportview,TQ_SLOT(slotLastPage()),actionCollection(), "go_lastpage"); + connect(m_reportview, TQ_SIGNAL(setLastPageActionEnabled(bool)), actionLastpage, TQ_SLOT(setEnabled(bool))); m_reportview->enableNavigationBtn();*/ mainWindow()->toolBar("report")->hide(); // new TDEAction(i18n("Design..."), "report_design", 0, this, -// TQT_SLOT(slotReportDesign()), actionCollection(), "report_design"); +// TQ_SLOT(slotReportDesign()), actionCollection(), "report_design"); // ------ Tools actionDefineWBS = new TDEAction(i18n("Define WBS Pattern..."), "tools_define_wbs", 0, this, - TQT_SLOT(slotDefineWBS()), actionCollection(), "tools_generate_wbs"); + TQ_SLOT(slotDefineWBS()), actionCollection(), "tools_generate_wbs"); actionGenerateWBS = new TDEAction(i18n("Generate WBS Code"), "tools_generate_wbs", 0, this, - TQT_SLOT(slotGenerateWBS()), actionCollection(), "tools_define_wbs"); + TQ_SLOT(slotGenerateWBS()), actionCollection(), "tools_define_wbs"); // ------ Export (testing) //actionExportGantt = new TDEAction(i18n("Export Ganttview"), "export_gantt", 0, this, - // TQT_SLOT(slotExportGantt()), actionCollection(), "export_gantt"); + // TQ_SLOT(slotExportGantt()), actionCollection(), "export_gantt"); // ------ Settings actionConfigure = new TDEAction(i18n("Configure KPlato..."), "configure", 0, this, - TQT_SLOT(slotConfigure()), actionCollection(), "configure"); + TQ_SLOT(slotConfigure()), actionCollection(), "configure"); // ------ Popup actionOpenNode = new TDEAction(i18n("Edit..."), "edit", 0, this, - TQT_SLOT(slotOpenNode()), actionCollection(), "node_properties"); + TQ_SLOT(slotOpenNode()), actionCollection(), "node_properties"); actionTaskProgress = new TDEAction(i18n("Progress..."), "edit", 0, this, - TQT_SLOT(slotTaskProgress()), actionCollection(), "task_progress"); + TQ_SLOT(slotTaskProgress()), actionCollection(), "task_progress"); actionDeleteTask = new TDEAction(i18n("Delete Task"), "edit-delete", 0, this, - TQT_SLOT(slotDeleteTask()), actionCollection(), "delete_task"); + TQ_SLOT(slotDeleteTask()), actionCollection(), "delete_task"); actionEditResource = new TDEAction(i18n("Edit Resource..."), "edit", 0, this, - TQT_SLOT(slotEditResource()), actionCollection(), "edit_resource"); + TQ_SLOT(slotEditResource()), actionCollection(), "edit_resource"); // ------------------- Actions with a key binding and no GUI item // Temporary, till we get a menu entry - actNoInformation = new TDEAction("Toggle no information", CTRL+SHIFT+Key_T, this, TQT_SLOT(slotViewGanttNoInformation()), actionCollection(), "show_noinformation"); + actNoInformation = new TDEAction("Toggle no information", CTRL+SHIFT+Key_T, this, TQ_SLOT(slotViewGanttNoInformation()), actionCollection(), "show_noinformation"); #ifndef NDEBUG - //new TDEAction("Print Debug", CTRL+SHIFT+Key_P, this, TQT_SLOT( slotPrintDebug()), actionCollection(), "print_debug"); - new TDEAction("Print Debug", CTRL+SHIFT+Key_P, this, TQT_SLOT(slotPrintSelectedDebug()), actionCollection(), "print_debug"); - new TDEAction("Print Calendar Debug", CTRL+SHIFT+Key_C, this, TQT_SLOT(slotPrintCalendarDebug()), actionCollection(), "print_calendar_debug"); -// new TDEAction("Print Test Debug", CTRL+SHIFT+Key_T, this, TQT_SLOT(slotPrintTestDebug()), actionCollection(), "print_test_debug"); + //new TDEAction("Print Debug", CTRL+SHIFT+Key_P, this, TQ_SLOT( slotPrintDebug()), actionCollection(), "print_debug"); + new TDEAction("Print Debug", CTRL+SHIFT+Key_P, this, TQ_SLOT(slotPrintSelectedDebug()), actionCollection(), "print_debug"); + new TDEAction("Print Calendar Debug", CTRL+SHIFT+Key_C, this, TQ_SLOT(slotPrintCalendarDebug()), actionCollection(), "print_calendar_debug"); +// new TDEAction("Print Test Debug", CTRL+SHIFT+Key_T, this, TQ_SLOT(slotPrintTestDebug()), actionCollection(), "print_test_debug"); TDEAction* actExportGantt = new TDEAction( i18n( "Export Gantt" ), CTRL+SHIFT+Key_G, - this, TQT_SLOT( slotExportGantt() ), actionCollection(), "export_gantt" ); + this, TQ_SLOT( slotExportGantt() ), actionCollection(), "export_gantt" ); #endif // Stupid compilers ;) diff --git a/kplato/kptwbsdefinitiondialog.cpp b/kplato/kptwbsdefinitiondialog.cpp index 181cbd43a..58e42b947 100644 --- a/kplato/kptwbsdefinitiondialog.cpp +++ b/kplato/kptwbsdefinitiondialog.cpp @@ -37,7 +37,7 @@ WBSDefinitionDialog::WBSDefinitionDialog(WBSDefinition &def, TQWidget *p, const setMainWidget(m_panel); enableButtonOK(false); - connect(m_panel, TQT_SIGNAL(changed(bool)), TQT_SLOT(enableButtonOK(bool))); + connect(m_panel, TQ_SIGNAL(changed(bool)), TQ_SLOT(enableButtonOK(bool))); } diff --git a/kplato/kptwbsdefinitionpanel.cpp b/kplato/kptwbsdefinitionpanel.cpp index 3843a98c8..7bd859a0f 100644 --- a/kplato/kptwbsdefinitionpanel.cpp +++ b/kplato/kptwbsdefinitionpanel.cpp @@ -67,14 +67,14 @@ WBSDefinitionPanel::WBSDefinitionPanel(WBSDefinition &def, TQWidget *p, const ch levelsTable->setColumnStretchable(0, true); slotLevelChanged(level->value()); - connect(defaultCode, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(defaultSeparator, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(levelsGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotLevelsGroupToggled(bool))); - connect(levelsTable, TQT_SIGNAL(valueChanged(int, int)), TQT_SLOT(slotChanged())); - connect(levelsTable, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(level, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotLevelChanged(int))); - connect(removeBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveBtnClicked())); - connect(addBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddBtnClicked())); + connect(defaultCode, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(defaultSeparator, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(levelsGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotLevelsGroupToggled(bool))); + connect(levelsTable, TQ_SIGNAL(valueChanged(int, int)), TQ_SLOT(slotChanged())); + connect(levelsTable, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(level, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotLevelChanged(int))); + connect(removeBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveBtnClicked())); + connect(addBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddBtnClicked())); } void WBSDefinitionPanel::setStartValues(Part */*part*/) { diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index a92d59908..012f7eaa9 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -99,8 +99,8 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, if ( !m_page->isMasterPage() ) { m_useMasterBackground = new TQCheckBox( i18n( "Use slide master background" ), page ); - connect( m_useMasterBackground, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( m_useMasterBackground, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( updateConfiguration() ) ); m_useMasterBackground->setChecked( m_page->useMasterBackground() ); vbox->addWidget( m_useMasterBackground ); } @@ -110,8 +110,8 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, backCombo->insertItem( i18n( "Color/Gradient" ) ); backCombo->insertItem( i18n( "Picture" ) ); backCombo->setCurrentItem( (int)backType ); - connect( backCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( changeComboText(int) ) ); + connect( backCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( changeComboText(int) ) ); vbox->addWidget( backCombo ); @@ -135,34 +135,34 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, cType->insertItem( i18n( "PipeCross Gradient" ) ); cType->insertItem( i18n( "Pyramid Gradient" ) ); cType->setCurrentItem( _bcType ); - connect( cType, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( cType, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); color1Choose = new KColorButton( backColor1, colorTab ); - connect( color1Choose, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( color1Choose, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( updateConfiguration() ) ); color2Choose = new KColorButton( backColor2, colorTab ); - connect( color2Choose, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( color2Choose, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( updateConfiguration() ) ); unbalanced = new TQCheckBox( i18n( "Unbalanced" ), colorTab ); - connect( unbalanced, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( unbalanced, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( updateConfiguration() ) ); unbalanced->setChecked( _unbalanced ); labXFactor =new TQLabel( i18n( "X-factor:" ), colorTab ); xfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); - connect( xfactor, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( xfactor, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); xfactor->setValue( _xfactor ); labYFactor=new TQLabel( i18n( "Y-factor:" ), colorTab ); yfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); - connect( yfactor, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( yfactor, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); yfactor->setValue( _yfactor ); tabWidget->addTab( colorTab, i18n( "Color/Gradient" ) ); @@ -181,8 +181,8 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, picView->insertItem( i18n( "Centered" ) ); picView->insertItem( i18n( "Tiled" ) ); picView->setCurrentItem( (int)backPicView ); - connect( picView, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( picView, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); picChooseLabel = new TQLabel( i18n("&Location:"), picTab ); picChooseLabel->setFixedHeight( picChooseLabel->sizeHint().height() ); @@ -190,10 +190,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, picChoose = new KURLRequester( picTab, "picChoose" ); picChoose->setFixedHeight( picChoose->sizeHint().height() ); picChoose->setMode( KFile::ExistingOnly ); - connect( picChoose, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - TQT_SLOT( aboutToSelectPic() ) ); - connect( picChoose, TQT_SIGNAL( urlSelected( const TQString & ) ), - TQT_SLOT( afterSelectPic( const TQString & ) ) ); + connect( picChoose, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + TQ_SLOT( aboutToSelectPic() ) ); + connect( picChoose, TQ_SIGNAL( urlSelected( const TQString & ) ), + TQ_SLOT( afterSelectPic( const TQString & ) ) ); picChooseLabel->setBuddy( picChoose ); @@ -208,18 +208,18 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, // ------------------------ buttons - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( Ok() ) ); - connect( this, TQT_SIGNAL( applyClicked() ), - this, TQT_SLOT( Apply() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( ApplyGlobal() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( Ok() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), + this, TQ_SLOT( Apply() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( ApplyGlobal() ) ); - connect( this, TQT_SIGNAL( user2Clicked() ), - this, TQT_SLOT( slotReset() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), + this, TQ_SLOT( slotReset() ) ); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( accept() ) ); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); setButtonText(KDialogBase::User2,i18n( "&Reset" )); picChanged = true; diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index d69479e03..1d7a2d6a6 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -52,8 +52,8 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP m_stack = new TQWidgetStack( this ); layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); - connect( m_typeCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_typeCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotTypeChanged( int ) ) ); m_brushUI = new BrushPropertyUI( m_stack ); @@ -77,10 +77,10 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP TQWhatsThis::add(m_preview_color, i18n( "This displays a preview of your choices." ) ); hbox->addWidget(m_preview_color); - connect( m_brushUI->styleCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotBrushChanged() ) ); - connect( m_brushUI->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotBrushChanged() ) ); + connect( m_brushUI->styleCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotBrushChanged() ) ); + connect( m_brushUI->colorChooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotBrushChanged() ) ); m_stack->addWidget( m_brushUI, 0 ); @@ -98,18 +98,18 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP hbox = new TQHBoxLayout( m_gradientUI->previewPanel ); hbox->addWidget(m_preview_gradient); - connect( m_gradientUI->styleCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotBackColorTypeChanged() ) ); - connect( m_gradientUI->color1Chooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotColor1Changed() ) ); - connect( m_gradientUI->color2Chooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotColor2Changed() ) ); - connect( m_gradientUI->unbalancedCheckBox, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotUnbalancedChanged() ) ); - connect( m_gradientUI->xSlider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotXFactorChanged() ) ); - connect( m_gradientUI->ySlider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotYFactorChanged() ) ); + connect( m_gradientUI->styleCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotBackColorTypeChanged() ) ); + connect( m_gradientUI->color1Chooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotColor1Changed() ) ); + connect( m_gradientUI->color2Chooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotColor2Changed() ) ); + connect( m_gradientUI->unbalancedCheckBox, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotUnbalancedChanged() ) ); + connect( m_gradientUI->xSlider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotXFactorChanged() ) ); + connect( m_gradientUI->ySlider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotYFactorChanged() ) ); m_stack->addWidget( m_gradientUI, 1 ); m_stack->addWidget( new TQFrame(), 2 ); // the transparent case diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 05c9923bb..ab8e15434 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -163,14 +163,14 @@ KPrCanvas::KPrCanvas( TQWidget *parent, const char *name, KPrView *_view ) if( m_view) { m_activePage=m_view->kPresenterDoc()->pageList().getFirst(); - connect( m_view->kPresenterDoc(), TQT_SIGNAL( sig_terminateEditing( KPrTextObject * ) ), - this, TQT_SLOT( terminateEditing( KPrTextObject * ) ) ); - connect( m_view, TQT_SIGNAL( autoScroll( const TQPoint & )), this, TQT_SLOT( slotAutoScroll( const TQPoint &))); + connect( m_view->kPresenterDoc(), TQ_SIGNAL( sig_terminateEditing( KPrTextObject * ) ), + this, TQ_SLOT( terminateEditing( KPrTextObject * ) ) ); + connect( m_view, TQ_SIGNAL( autoScroll( const TQPoint & )), this, TQ_SLOT( slotAutoScroll( const TQPoint &))); } if ( kospeaker ) - connect( kospeaker, TQT_SIGNAL( customSpeakWidget(TQWidget*, const TQPoint&, uint) ), - this, TQT_SLOT( speakTextUnderMouse(TQWidget*, const TQPoint&, uint) ) ); + connect( kospeaker, TQ_SIGNAL( customSpeakWidget(TQWidget*, const TQPoint&, uint) ), + this, TQ_SLOT( speakTextUnderMouse(TQWidget*, const TQPoint&, uint) ) ); } KPrCanvas::~KPrCanvas() @@ -2310,12 +2310,12 @@ void KPrCanvas::setupMenus() TQ_CHECK_PTR( m_presMenu ); m_presMenu->setCheckable( true ); m_presMenu->insertTitle( i18n( "Slide Show" ) ); - m_presMenu->insertItem( i18n( "&Continue" ), this, TQT_SLOT( setSwitchingMode() ) ); - PM_DM = m_presMenu->insertItem( i18n( "&Drawing Mode" ), this, TQT_SLOT( setDrawingMode() ) ); + m_presMenu->insertItem( i18n( "&Continue" ), this, TQ_SLOT( setSwitchingMode() ) ); + PM_DM = m_presMenu->insertItem( i18n( "&Drawing Mode" ), this, TQ_SLOT( setDrawingMode() ) ); m_presMenu->insertSeparator(); - m_presMenu->insertItem( SmallIcon("goto"), i18n( "&Goto Slide..." ), this, TQT_SLOT( slotGotoPage() ) ); + m_presMenu->insertItem( SmallIcon("goto"), i18n( "&Goto Slide..." ), this, TQ_SLOT( slotGotoPage() ) ); m_presMenu->insertSeparator(); - m_presMenu->insertItem( i18n( "&End" ), this, TQT_SLOT( slotExitPres() ) ); + m_presMenu->insertItem( i18n( "&End" ), this, TQ_SLOT( slotExitPres() ) ); m_presMenu->setItemChecked( PM_DM, false ); m_presMenu->setMouseTracking( true ); } @@ -3117,7 +3117,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) } else { - connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } @@ -3390,7 +3390,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) if ( m_effectHandler ) { m_effectTimer.stop(); - TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoEffect() ) ); m_effectHandler->finish(); delete m_effectHandler; @@ -3446,7 +3446,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) } else { - connect( &m_effectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoEffect() ) ); + connect( &m_effectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoEffect() ) ); m_effectTimer.start( 50, true ); } @@ -3457,7 +3457,7 @@ void KPrCanvas::slotDoEffect() if ( m_effectHandler->doEffect() ) { m_effectTimer.stop(); - TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoEffect() ) ); delete m_effectHandler; m_effectHandler = 0; } @@ -3473,7 +3473,7 @@ void KPrCanvas::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; @@ -3500,7 +3500,7 @@ bool KPrCanvas::finishObjectEffects() if ( m_effectHandler ) { m_effectTimer.stop(); - TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoEffect() ) ); m_effectHandler->finish(); delete m_effectHandler; m_effectHandler = 0; @@ -3516,7 +3516,7 @@ bool KPrCanvas::finishPageEffect( bool cancel ) if ( m_pageEffect ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); if ( !cancel ) m_pageEffect->finish(); delete m_pageEffect; diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index b3dbf4952..050b08b60 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -122,7 +122,7 @@ KPrConfig::KPrConfig( KPrView* parent ) m_ttsPage=new KPrConfigureTTSPage(parent, page); } else m_ttsPage = 0; - connect( this, TQT_SIGNAL( okClicked() ),this, TQT_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( okClicked() ),this, TQ_SLOT( slotApply() ) ); } void KPrConfig::openPage(int flags) @@ -630,7 +630,7 @@ KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, TQWidget TQPushButton *chooseButton = new TQPushButton(i18n("Choose..."), fontContainer); TQWhatsThis::add(chooseButton, i18n( "Click here if you want to set a new font. The TDE default Select Font dialog will then be displayed." ) ); - connect(chooseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNewDefaultFont())); + connect(chooseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectNewDefaultFont())); fontLayout->addWidget(fontTitle, 0, 0); fontLayout->addWidget(fontName, 0, 1); @@ -949,11 +949,11 @@ KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *parent, ch box->addWidget(m_pPathView); m_modifyPath = new TQPushButton( i18n("Modify Path..."), this); - connect( m_modifyPath, TQT_SIGNAL( clicked ()), this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT( slotSelectionChanged(TQListViewItem * ))); + connect( m_modifyPath, TQ_SIGNAL( clicked ()), this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT( slotSelectionChanged(TQListViewItem * ))); slotSelectionChanged(m_pPathView->currentItem()); TQWhatsThis::add(m_modifyPath, i18n( "When you click this button, a small dialog will appear and, if Default path is unchecked, you can either enter a path yourself or choose one using the standard TDE file dialog." ) ); box->addWidget(m_modifyPath); @@ -1086,9 +1086,9 @@ KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, TQWidget *parent, char m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); } void KPrConfigureTTSPage::slotDefault() diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 8caa45d64..d8ab6bae8 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -64,16 +64,16 @@ KPrCustomSlideShowDia::KPrCustomSlideShowDia( KPrView* _view, KPrDocument *_doc, grid1->addWidget(m_pTest,5,2); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); - connect( m_pCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); - connect( m_pTest, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTest() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModify() ) ); + connect( m_pCopy, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) ); + connect( m_pTest, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTest() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); - connect( list, TQT_SIGNAL(clicked ( TQListBoxItem * )),this,TQT_SLOT(slotTextClicked(TQListBoxItem * ))); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( list, TQ_SIGNAL(clicked ( TQListBoxItem * )),this,TQ_SLOT(slotTextClicked(TQListBoxItem * ))); - connect( m_view, TQT_SIGNAL( presentationFinished() ), this, TQT_SLOT( slotPresentationFinished() ) ); + connect( m_view, TQ_SIGNAL( presentationFinished() ), this, TQ_SLOT( slotPresentationFinished() ) ); init(); updateButton(); @@ -334,15 +334,15 @@ void KPrDefineCustomSlideShow::init() m_name->setFocus(); - connect( m_insertSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveInsertSlide() ) ); - connect( m_removeSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveRemoveSlide()) ); - connect( m_moveUpSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotMoveUpSlide() ) ); - connect( m_moveDownSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownSlide()) ); - connect( m_name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slideNameChanged( const TQString & ) ) ); - connect( listSlideShow, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( updateButton() ) ); - connect( listSlide, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( updateButton() ) ); - connect( listSlide, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQT_SLOT( slotMoveInsertSlide() ) ); - connect( listSlideShow, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotMoveRemoveSlide() ) ); + connect( m_insertSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveInsertSlide() ) ); + connect( m_removeSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveRemoveSlide()) ); + connect( m_moveUpSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotMoveUpSlide() ) ); + connect( m_moveDownSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDownSlide()) ); + connect( m_name, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slideNameChanged( const TQString & ) ) ); + connect( listSlideShow, TQ_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQ_SLOT( updateButton() ) ); + connect( listSlide, TQ_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQ_SLOT( updateButton() ) ); + connect( listSlide, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQ_SLOT( slotMoveInsertSlide() ) ); + connect( listSlideShow, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotMoveRemoveSlide() ) ); m_insertSlide->setIconSet( SmallIconSet( ( TQApplication::reverseLayout() ? "back" : "forward" ) ) ); m_removeSlide->setIconSet( SmallIconSet( ( TQApplication::reverseLayout() ? "forward" : "back") ) ); m_moveUpSlide->setIconSet( SmallIconSet( "go-up" ) ); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index ed6a32f66..9540771cc 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -272,14 +272,14 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje saveOnlyPage = -1; m_maxRecentFiles = 10; - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardDataChanged() ) ); m_commandHistory = new KoCommandHistory( actionCollection(), true ) ; initConfig(); - 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() ) ); dcopObject(); } @@ -3203,7 +3203,7 @@ bool KPrDocument::completeLoading( KoStore* _store ) recalcVariables( VT_FIELD ); emit sigProgress( -1 ); - connect( documentInfo(), TQT_SIGNAL( sigDocumentInfoModifed()),this,TQT_SLOT(slotDocumentInfoModifed() ) ); + connect( documentInfo(), TQ_SIGNAL( sigDocumentInfoModifed()),this,TQ_SLOT(slotDocumentInfoModifed() ) ); //desactivate bgspellchecking //attributes isReadWrite is not placed at the beginning ! if ( !isReadWrite()) @@ -3902,7 +3902,7 @@ TQPixmap KPrDocument::generatePreview( const TQSize& size ) void KPrDocument::addShell( KoMainWindow *shell ) { - connect( shell, TQT_SIGNAL( documentSaved() ), m_commandHistory, TQT_SLOT( documentSaved() ) ); + connect( shell, TQ_SIGNAL( documentSaved() ), m_commandHistory, TQ_SLOT( documentSaved() ) ); KoDocument::addShell( shell ); } diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index ec1579ddc..9ef5020c5 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -98,7 +98,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< cEffect->setCurrentItem( static_cast<int>( obj->getEffect() ) ); upperRow->addWidget(cEffect, 1, 1); - connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) ); + connect( cEffect, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( appearEffectChanged( int ) ) ); lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 ); lAppearSpeed->setAlignment( AlignVCenter ); @@ -160,7 +160,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< appearSoundEffect->setChecked( obj->getAppearSoundEffect() ); upperRow->addWidget( appearSoundEffect, 5, 0 ); - connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) ); + connect( appearSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( appearSoundEffectChanged() ) ); lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 ); lSoundEffect1->setAlignment( AlignVCenter ); @@ -170,25 +170,25 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< requester1->setURL( obj->getAppearSoundEffectFileName() ); upperRow->addWidget( requester1, 6, 1 ); - connect( requester1, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester1, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester1, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotAppearFileChanged( const TQString& ) ) ); + connect( requester1, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotAppearFileChanged( const TQString& ) ) ); buttonTestPlaySoundEffect1 = new TQPushButton( grp1 ); buttonTestPlaySoundEffect1->setIconSet( SmallIconSet("1rightarrow") ); TQToolTip::add( buttonTestPlaySoundEffect1, i18n("Play") ); upperRow->addWidget( buttonTestPlaySoundEffect1, 6, 2 ); - connect( buttonTestPlaySoundEffect1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound1() ) ); + connect( buttonTestPlaySoundEffect1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound1() ) ); buttonTestStopSoundEffect1 = new TQPushButton( grp1 ); buttonTestStopSoundEffect1->setIconSet( SmallIconSet("media-playback-stop") ); TQToolTip::add( buttonTestStopSoundEffect1, i18n("Stop") ); upperRow->addWidget( buttonTestStopSoundEffect1, 6, 3 ); - connect( buttonTestStopSoundEffect1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound1() ) ); + connect( buttonTestStopSoundEffect1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound1() ) ); disappear = new TQCheckBox( i18n( "Disappear" ), page ); @@ -230,7 +230,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< cDisappear->setCurrentItem( static_cast<int>( obj->getEffect3() ) ); lowerRow->addWidget(cDisappear, 1, 1); - connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) ); + connect( cDisappear, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( disappearEffectChanged( int ) ) ); lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 ); lDisappearSpeed->setAlignment( AlignVCenter ); @@ -264,7 +264,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< lowerRow->addWidget( disappearSoundEffect, 4, 0 ); disappearSoundEffect->setEnabled( disappear->isChecked() ); - connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) ); + connect( disappearSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( disappearSoundEffectChanged() ) ); lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 ); lSoundEffect2->setAlignment( AlignVCenter ); @@ -274,32 +274,32 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< requester2->setURL( obj->getDisappearSoundEffectFileName() ); lowerRow->addWidget( requester2, 5, 1 ); - connect( requester2, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester2, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester2, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotDisappearFileChanged( const TQString& ) ) ); + connect( requester2, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotDisappearFileChanged( const TQString& ) ) ); buttonTestPlaySoundEffect2 = new TQPushButton( grp2 ); buttonTestPlaySoundEffect2->setIconSet( SmallIconSet("1rightarrow") ); TQToolTip::add( buttonTestPlaySoundEffect2, i18n("Play") ); lowerRow->addWidget( buttonTestPlaySoundEffect2, 5, 2 ); - connect( buttonTestPlaySoundEffect2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound2() ) ); + connect( buttonTestPlaySoundEffect2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound2() ) ); buttonTestStopSoundEffect2 = new TQPushButton( grp2 ); buttonTestStopSoundEffect2->setIconSet( SmallIconSet("media-playback-stop") ); TQToolTip::add( buttonTestStopSoundEffect2, i18n("Stop") ); lowerRow->addWidget( buttonTestStopSoundEffect2, 5, 3 ); - connect( buttonTestStopSoundEffect2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound2() ) ); + connect( buttonTestStopSoundEffect2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound2() ) ); topLayout->activate(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotEffectDiaOk() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( disappear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearChanged() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotEffectDiaOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( disappear, TQ_SIGNAL( clicked() ), this, TQ_SLOT( disappearChanged() ) ); disappearChanged(); appearSoundEffectChanged(); } diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index 04c7140f3..02e673558 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -54,8 +54,8 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene m_ui->positionGroup->setTitle( i18n( "Position" ) ); - connect( m_ui->protect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotProtectToggled( bool ) ) ); - connect( m_ui->keepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotKeepRatioToggled( bool ) ) ); + connect( m_ui->protect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotProtectToggled( bool ) ) ); + connect( m_ui->keepRatio, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotKeepRatioToggled( bool ) ) ); double dStep = KoUnit::fromUserValue( 0.5, m_unit ); double dMax = KoUnit::fromUserValue( 9999, m_unit ); @@ -67,11 +67,11 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene m_ui->widthInput->setUnit( m_unit ); m_ui->widthInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotWidthChanged( double ) ) ); + connect( m_ui->widthInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotWidthChanged( double ) ) ); m_ui->heightInput->setUnit( m_unit ); m_ui->heightInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->heightInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotHeightChanged( double ) ) ); + connect( m_ui->heightInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotHeightChanged( double ) ) ); slotReset(); } diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index ce598acc1..bcf467755 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -44,10 +44,10 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc, TQLabel *label = new TQLabel( i18n( "Go to slide:" ), page ); ml->addWidget( label ); spinbox = new TQListBox( page ); - connect( spinbox, TQT_SIGNAL(doubleClicked( TQListBoxItem* )), - this, TQT_SLOT(accept()) ); - connect( spinbox, TQT_SIGNAL(returnPressed( TQListBoxItem* )), - this, TQT_SLOT(accept()) ); + connect( spinbox, TQ_SIGNAL(doubleClicked( TQListBoxItem* )), + this, TQ_SLOT(accept()) ); + connect( spinbox, TQ_SIGNAL(returnPressed( TQListBoxItem* )), + this, TQ_SLOT(accept()) ); ml->addWidget( spinbox ); TQPtrList<KPrPage> pageList = doc->getPageList(); // because of const doc, we can't do doc->pageList()->at() diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp index 995121317..d565cbf8f 100644 --- a/kpresenter/KPrImageEffectDia.cpp +++ b/kpresenter/KPrImageEffectDia.cpp @@ -47,11 +47,11 @@ KPrImageEffectDia::KPrImageEffectDia(TQWidget * parent, const char * name): setupSignals(); - connect((TQWidget *)base->m_effectCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(effectChanged(int))); + connect((TQWidget *)base->m_effectCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(effectChanged(int))); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } KPrImageEffectDia::~KPrImageEffectDia() @@ -333,74 +333,74 @@ void KPrImageEffectDia::showEvent(TQShowEvent * e) void KPrImageEffectDia::setupSignals() { - connect((TQWidget *)base->chanInt_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->chanInt_component, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->chanInt_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->chanInt_component, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->fade_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->fade_color, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->fade_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->fade_color, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->flatten_color1, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->flatten_color2, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->flatten_color1, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->flatten_color2, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->intensity_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->intensity_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->desaturate_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->desaturate_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->contrast_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->contrast_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->threshold_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->threshold_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->solarize_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->solarize_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->charcoal_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->charcoal_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->noise_type, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->noise_type, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->blur_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->blur_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->edge_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->edge_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->implode_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->implode_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->oilPaint_radius, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->oilPaint_radius, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->sharpen_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->sharpen_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->spread_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->spread_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->shade_color, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->shade_elevation, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->shade_azimuth, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_color, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_elevation, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_azimuth, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->swirl_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->swirl_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->wave_amplitude, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->wave_length, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->wave_amplitude, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->wave_length, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); } void KPrImageEffectDia::effectParamChanged() diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index 40343fb18..0436a7f3e 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -312,10 +312,10 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie pathLayout->addWidget(lable2); pathLayout->addWidget(path); - connect( path, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotChoosePath(const TQString&) ) ); - connect( path, TQT_SIGNAL( urlSelected( const TQString&) ), - this, TQT_SLOT( slotChoosePath(const TQString&) ) ); + connect( path, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotChoosePath(const TQString&) ) ); + connect( path, TQ_SIGNAL( urlSelected( const TQString&) ), + this, TQ_SLOT( slotChoosePath(const TQString&) ) ); TQLabel *lable1 = new TQLabel( i18n("Title:"), this, "lable1" ); @@ -331,7 +331,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie TQHBox *moreBox = new TQHBox( this ); TQPushButton *showColourButton = new TQPushButton( i18n("&Set Colors"), moreBox ); showColourButton->setToggleButton( true ); - connect( showColourButton, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( showColourGroup(bool) ) ); + connect( showColourButton, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( showColourGroup(bool) ) ); TQVBoxLayout *topLayout = new TQVBoxLayout; topLayout->addWidget( helptext ); @@ -388,9 +388,9 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie mainLayout->setResizeMode( TQLayout::Fixed ); mainLayout->setGeometry( TQRect( 0, 0, 300, 220 ) ); - connect( helpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( helpMe() ) ); - connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); - connect( createButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( finish() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT ( helpMe() ) ); + connect( cancelButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); + connect( createButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( finish() ) ); } KPrMSPresentationSetup::~KPrMSPresentationSetup() @@ -605,7 +605,7 @@ void KPrMSPresentationCreateDialog::setupGUI() bDone->setEnabled( false ); - connect( bDone, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( bDone, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); } void KPrMSPresentationCreateDialog::resizeEvent( TQResizeEvent *e ) diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index a8aa403e3..6be911e9b 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -61,14 +61,14 @@ KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUn m_ui->bottomInput->setUnit( unit ); m_ui->bottomInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->leftInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); - connect( m_ui->rightInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); - connect( m_ui->topInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); - connect( m_ui->bottomInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->leftInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->rightInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->topInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->bottomInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); } diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index 0a0dd2c6e..0fd25e521 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -47,7 +47,7 @@ KPrMoveHelpLineDia::KPrMoveHelpLineDia( TQWidget *parent, double value, double l position= new KoUnitDoubleSpinBox( page, TQMAX(0.00, limitTop), TQMAX(0.00, limitBottom), 1, TQMAX(0.00, value)); position->setUnit(m_doc->unit() ); - connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotRemoveHelpLine() )); + connect( this, TQ_SIGNAL( user1Clicked() ), this ,TQ_SLOT( slotRemoveHelpLine() )); resize( 300,100 ); } @@ -77,7 +77,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); m_rbVert = new TQRadioButton( i18n("Vertical"), group ); - connect( group , TQT_SIGNAL( clicked( int) ), this, TQT_SLOT( slotRadioButtonClicked() )); + connect( group , TQ_SIGNAL( clicked( int) ), this, TQ_SLOT( slotRadioButtonClicked() )); new TQLabel(i18n("Position:"), page); @@ -133,7 +133,7 @@ KPrInsertHelpPointDia::KPrInsertHelpPointDia( TQWidget *parent, const KoRect & _ showButton( KDialogBase::User1, (posX!=0.0 || posY!=0.0) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotRemoveHelpPoint() )); + connect( this, TQ_SIGNAL( user1Clicked() ), this ,TQ_SLOT( slotRemoveHelpPoint() )); resize( 300,100 ); } diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index bb248a0d2..db690957e 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -56,20 +56,20 @@ KPrNoteBar::KPrNoteBar( TQWidget *_parent, KPrView *_view ) text = view->kPresenterDoc()->pageList().at(currentPageNum - 1)->noteText( ); textEdit->setText( text ); - connect( textEdit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged() ) ); + connect( textEdit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged() ) ); - connect( textEdit, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( textEdit, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( textEdit, TQT_SIGNAL( copyAvailable( bool ) ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( textEdit, TQ_SIGNAL( copyAvailable( bool ) ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( textEdit, TQT_SIGNAL( undoAvailable( bool ) ), - this, TQT_SLOT( slotUndoAvailable( bool ) ) ); + connect( textEdit, TQ_SIGNAL( undoAvailable( bool ) ), + this, TQ_SLOT( slotUndoAvailable( bool ) ) ); - connect( textEdit, TQT_SIGNAL( redoAvailable( bool ) ), - this, TQT_SLOT( slotRedoAvailable( bool ) ) ); + connect( textEdit, TQ_SIGNAL( redoAvailable( bool ) ), + this, TQ_SLOT( slotRedoAvailable( bool ) ) ); topLayout->addWidget( label ); topLayout->addWidget( textEdit ); diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index 032c6734d..4e3709953 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -42,8 +42,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); layout->addItem( spacer ); - connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotPenChanged() ) ); + connect( m_ui->colorChooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotPenChanged() ) ); m_ui->styleCombo->insertItem( i18n( "No Outline" ) ); m_ui->styleCombo->insertItem( "__________" ); @@ -54,11 +54,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const m_ui->widthInput->setRange( 1, 10, 1, false); - connect( m_ui->styleCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotPenChanged() ) ); + connect( m_ui->styleCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotPenChanged() ) ); - connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotPenChanged() ) ); + connect( m_ui->widthInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotPenChanged() ) ); m_ui->lineBeginCombo->insertItem( i18n("Normal") ); m_ui->lineBeginCombo->insertItem( i18n("Arrow") ); @@ -69,8 +69,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const m_ui->lineBeginCombo->insertItem( i18n("Double Arrow") ); m_ui->lineBeginCombo->insertItem( i18n("Double Line Arrow") ); - connect( m_ui->lineBeginCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotLineBeginChanged() ) ); + connect( m_ui->lineBeginCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotLineBeginChanged() ) ); m_ui->lineEndCombo->insertItem( i18n("Normal") ); m_ui->lineEndCombo->insertItem( i18n("Arrow") ); @@ -81,8 +81,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const m_ui->lineEndCombo->insertItem( i18n("Double Arrow") ); m_ui->lineEndCombo->insertItem( i18n("Double Line Arrow") ); - connect( m_ui->lineEndCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotLineEndChanged() ) ); + connect( m_ui->lineEndCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotLineEndChanged() ) ); if ( !configureLineEnds ) m_ui->arrowGroup->hide(); diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index 314ab03ff..118a53656 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -55,8 +55,8 @@ KPrPgConfDia::KPrPgConfDia( TQWidget* parent, KPrDocument* doc ) setupPageGeneral(); setupPageSlides(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( confDiaOk() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( confDiaOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); } void KPrPgConfDia::setupPageGeneral() @@ -98,8 +98,8 @@ void KPrPgConfDia::setupPageGeneral() "useful if you are running a promotional display.</p>") ); infiniteLoop->setEnabled( !m_doc->spManualSwitch() ); - connect( m_autoButton, TQT_SIGNAL( toggled(bool) ), infiniteLoop, TQT_SLOT( setEnabled(bool) ) ); - connect( m_autoButton, TQT_SIGNAL( toggled(bool) ), infiniteLoop, TQT_SLOT( setChecked(bool) ) ); + connect( m_autoButton, TQ_SIGNAL( toggled(bool) ), infiniteLoop, TQ_SLOT( setEnabled(bool) ) ); + connect( m_autoButton, TQ_SIGNAL( toggled(bool) ), infiniteLoop, TQ_SLOT( setChecked(bool) ) ); endOfPresentationSlide = new TQCheckBox( i18n( "&Show 'End of presentation' slide" ), generalPage ); generalLayout->addWidget( endOfPresentationSlide ); @@ -109,7 +109,7 @@ void KPrPgConfDia::setupPageGeneral() "be shown.") ); endOfPresentationSlide->setChecked( m_doc->spShowEndOfPresentationSlide() ); endOfPresentationSlide->setDisabled( infiniteLoop->isEnabled() && getInfiniteLoop() ); - connect( infiniteLoop, TQT_SIGNAL( toggled(bool) ), endOfPresentationSlide, TQT_SLOT( setDisabled(bool) ) ); + connect( infiniteLoop, TQ_SIGNAL( toggled(bool) ), endOfPresentationSlide, TQ_SLOT( setDisabled(bool) ) ); presentationDuration = new TQCheckBox( i18n( "Measure presentation &duration" ), generalPage ); generalLayout->addWidget( presentationDuration ); @@ -169,7 +169,7 @@ void KPrPgConfDia::setupPageSlides() m_customSlide = new TQRadioButton( i18n( "Custom slide show" ), group, "customslide" ); - connect( m_customSlide, TQT_SIGNAL( clicked () ), this, TQT_SLOT( radioButtonClicked() ) ); + connect( m_customSlide, TQ_SIGNAL( clicked () ), this, TQ_SLOT( radioButtonClicked() ) ); TQHBox *box = new TQHBox( group ); @@ -180,7 +180,7 @@ void KPrPgConfDia::setupPageSlides() m_selectedSlide = new TQRadioButton( i18n( "Selected pages:" ), group, "selectedslide" ); slidesLayout->addMultiCellWidget( group, 0,2,0,1 ); - connect( m_selectedSlide, TQT_SIGNAL( clicked () ), this, TQT_SLOT( radioButtonClicked() ) ); + connect( m_selectedSlide, TQ_SIGNAL( clicked () ), this, TQ_SLOT( radioButtonClicked() ) ); slides = new TQListView( slidesPage ); slidesLayout->addMultiCellWidget( slides, 3, 3, 0, 1 ); @@ -202,10 +202,10 @@ void KPrPgConfDia::setupPageSlides() buttonGroup->setSpacing( KDialog::spacingHint() ); TQPushButton* selectAllButton = new TQPushButton( i18n( "Select &All" ), buttonGroup ); - connect( selectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAllSlides() ) ); + connect( selectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectAllSlides() ) ); TQPushButton* deselectAllButton = new TQPushButton( i18n( "&Deselect All" ), buttonGroup ); - connect( deselectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deselectAllSlides() ) ); + connect( deselectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deselectAllSlides() ) ); TQWidget* spacer = new TQWidget( buttonGroup ); diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp index 7d77e4ce3..ed65a639f 100644 --- a/kpresenter/KPrPictureProperty.cpp +++ b/kpresenter/KPrPictureProperty.cpp @@ -35,17 +35,17 @@ KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, cons TQVBoxLayout *layout = new TQVBoxLayout( this ); layout->addWidget( m_ui = new PicturePropertyUI( this ) ); - connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) ); - connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) ); - connect( m_ui->depth8, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth8() ) ); - connect( m_ui->depth16, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth16() ) ); - connect( m_ui->depth32, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth32() ) ); + connect( m_ui->depth0, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth0() ) ); + connect( m_ui->depth1, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth1() ) ); + connect( m_ui->depth8, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth8() ) ); + connect( m_ui->depth16, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth16() ) ); + connect( m_ui->depth32, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth32() ) ); - connect( m_ui->swapRGB, TQT_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQT_SLOT( slotSwapRGBPicture( bool ) ) ); + connect( m_ui->swapRGB, TQ_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQ_SLOT( slotSwapRGBPicture( bool ) ) ); - connect( m_ui->grayscale, TQT_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQT_SLOT( slotGrayscalPicture( bool ) ) ); + connect( m_ui->grayscale, TQ_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQ_SLOT( slotGrayscalPicture( bool ) ) ); - connect( m_ui->brightnessInput, TQT_SIGNAL( valueChanged( int ) ), m_ui->picturePreview, TQT_SLOT( slotBrightValue( int ) ) ); + connect( m_ui->brightnessInput, TQ_SIGNAL( valueChanged( int ) ), m_ui->picturePreview, TQ_SLOT( slotBrightValue( int ) ) ); m_ui->picturePreview->setPicturePixmap( pixmap ); diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index c98a6cbf4..2b38effac 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -41,10 +41,10 @@ KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueC m_ui->typeCombo->insertItem( i18n( "Arc" ) ); m_ui->typeCombo->insertItem( i18n( "Chord" ) ); - connect( m_ui->typeCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_ui->typeCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTypeChanged( int ) ) ); - connect( m_ui->angleInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotAngleChanged( int ) ) ); - connect( m_ui->lengthInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotLengthChanged( int ) ) ); + connect( m_ui->angleInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotAngleChanged( int ) ) ); + connect( m_ui->lengthInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotLengthChanged( int ) ) ); slotReset(); } diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index 94b13fd60..cfd134e7f 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -38,13 +38,13 @@ KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrP m_ui->typeCombo->insertItem( i18n( "Polygon" ) ); m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) ); - connect( m_ui->typeCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT(slotTypeChanged( int ) ) ); + connect( m_ui->typeCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT(slotTypeChanged( int ) ) ); - connect( m_ui->cornersInput, TQT_SIGNAL( valueChanged( int ) ), - m_ui->polygonPreview, TQT_SLOT( slotCornersValue( int ) ) ); - connect( m_ui->sharpnessInput, TQT_SIGNAL( valueChanged( int ) ), - m_ui->polygonPreview, TQT_SLOT( slotSharpnessValue( int ) ) ); + connect( m_ui->cornersInput, TQ_SIGNAL( valueChanged( int ) ), + m_ui->polygonPreview, TQ_SLOT( slotCornersValue( int ) ) ); + connect( m_ui->sharpnessInput, TQ_SIGNAL( valueChanged( int ) ), + m_ui->polygonPreview, TQ_SLOT( slotSharpnessValue( int ) ) ); slotReset(); } diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 6fcdddad2..a2e7b22ce 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -51,7 +51,7 @@ KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name, topLayout->addWidget( label ); setMinimumSize( 600, 400 ); - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCloseDialog() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCloseDialog() ) ); } diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index 284b2eede..8735a77bf 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -45,8 +45,8 @@ txtColumns->setMinValue(1); txtColumns->setMaxValue(5); txtColumns->setValue(1); - connect( txtRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtRows_valueChanged( int ) ) ); - connect( txtColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtColumns_valueChanged( int ) ) ); + connect( txtRows, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( txtRows_valueChanged( int ) ) ); + connect( txtColumns, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( txtColumns_valueChanged( int ) ) ); TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this ); TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") ); diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp index 4d82b0b33..3445bc170 100644 --- a/kpresenter/KPrPropertyEditor.cpp +++ b/kpresenter/KPrPropertyEditor.cpp @@ -54,7 +54,7 @@ KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPag setOkButton( KStdGuiItem::ok().text() ); setApplyButton( KStdGuiItem::apply().text() ); - connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotDone() ) ); + connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotDone() ) ); m_objectProperties = new KPrObjectProperties( m_objects ); diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp index 5608a323e..5e6dc5c24 100644 --- a/kpresenter/KPrRectProperty.cpp +++ b/kpresenter/KPrRectProperty.cpp @@ -38,9 +38,9 @@ KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectVal KoImageResource kir; m_ui->combineButton->setPixmap(kir.chain()); - connect( m_ui->xRndInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRndChanged() ) ); - connect( m_ui->yRndInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRndChanged() ) ); - connect( m_ui->combineButton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( combineToggled( bool ) ) ); + connect( m_ui->xRndInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotRndChanged() ) ); + connect( m_ui->yRndInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotRndChanged() ) ); + connect( m_ui->combineButton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( combineToggled( bool ) ) ); slotReset(); } @@ -126,17 +126,17 @@ void KPrRectProperty::combineToggled( bool on) if( on ) { formerVerticalValue = getYRnd(); m_ui->yRndInput->setValue( getXRnd() ); - connect(m_ui->yRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->xRndInput, TQT_SLOT( setValue ( int ) )); - connect(m_ui->xRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->yRndInput, TQT_SLOT( setValue ( int ) )); + connect(m_ui->yRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->xRndInput, TQ_SLOT( setValue ( int ) )); + connect(m_ui->xRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->yRndInput, TQ_SLOT( setValue ( int ) )); m_ui->combineButton->setPixmap(kir.chain()); } else { - disconnect(m_ui->yRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->xRndInput, TQT_SLOT( setValue ( int ) )); - disconnect(m_ui->xRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->yRndInput, TQT_SLOT( setValue ( int ) )); + disconnect(m_ui->yRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->xRndInput, TQ_SLOT( setValue ( int ) )); + disconnect(m_ui->xRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->yRndInput, TQ_SLOT( setValue ( int ) )); if(formerVerticalValue != 0) m_ui->yRndInput->setValue( formerVerticalValue ); m_ui->combineButton->setPixmap(kir.chainBroken()); diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 8e845dc7d..42ba825c4 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -66,13 +66,13 @@ KPrRotationDialogImpl::KPrRotationDialogImpl( TQWidget *parent, const char* name circleLayout->addWidget(r90, 1, 3); circleLayout->addWidget(r270, 1, 1); - connect( m_angleGroup, TQT_SIGNAL (clicked (int)), - this, TQT_SLOT( angleMode( int ) ) ); - connect (m_dialog->angleSlider, TQT_SIGNAL( valueChanged (int ) ), - this, TQT_SLOT( angleMode( int ) ) ); - connect (m_dialog->angleSpinbox, TQT_SIGNAL (valueChanged (double) ), - this, TQT_SLOT( angleChanged( double ) ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( m_angleGroup, TQ_SIGNAL (clicked (int)), + this, TQ_SLOT( angleMode( int ) ) ); + connect (m_dialog->angleSlider, TQ_SIGNAL( valueChanged (int ) ), + this, TQ_SLOT( angleMode( int ) ) ); + connect (m_dialog->angleSpinbox, TQ_SIGNAL (valueChanged (double) ), + this, TQ_SLOT( angleChanged( double ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); setMainWidget( m_dialog ); } @@ -157,7 +157,7 @@ void KPrCircleGroup::setAngle(int angle) { } void KPrCircleGroup::add(KPrCircleToggle *button) { - connect (button, TQT_SIGNAL(clicked (int)), this, TQT_SLOT (selectionChanged (int)) ); + connect (button, TQ_SIGNAL(clicked (int)), this, TQ_SLOT (selectionChanged (int)) ); m_buttons.append(button); } diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp index 20ebe1052..d229da34a 100644 --- a/kpresenter/KPrShadowDialogImpl.cpp +++ b/kpresenter/KPrShadowDialogImpl.cpp @@ -25,8 +25,8 @@ KPrShadowDialogImpl::KPrShadowDialogImpl( TQWidget *parent, const char* name ) lbButton->setPixmap( BarIcon( "shadowLB" ) ); lButton->setPixmap( BarIcon( "shadowL" ) ); - connect( colorButton, TQT_SIGNAL( changed( const TQColor& ) ), - TQT_SLOT( colorChanged( const TQColor& ) ) ); + connect( colorButton, TQ_SIGNAL( changed( const TQColor& ) ), + TQ_SLOT( colorChanged( const TQColor& ) ) ); } void KPrShadowDialogImpl::setShadowDirection( ShadowDirection d ) diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 5d2a6e75c..9917f97d5 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -151,20 +151,20 @@ KPrSideBar::KPrSideBar(TQWidget *parent, KPrDocument *d, KPrView *v) //TODO find a better way - connect(m_outline, TQT_SIGNAL(showPage(int)), - this, TQT_SIGNAL(showPage(int))); + connect(m_outline, TQ_SIGNAL(showPage(int)), + this, TQ_SIGNAL(showPage(int))); - connect(m_thb, TQT_SIGNAL(showPage(int)), - this, TQT_SIGNAL(showPage(int))); + connect(m_thb, TQ_SIGNAL(showPage(int)), + this, TQ_SIGNAL(showPage(int))); - connect(m_outline, TQT_SIGNAL(movePage(int,int)), - this, TQT_SIGNAL(movePage(int,int))); + connect(m_outline, TQ_SIGNAL(movePage(int,int)), + this, TQ_SIGNAL(movePage(int,int))); - connect(m_outline, TQT_SIGNAL(selectPage(int,bool)), - this, TQT_SIGNAL(selectPage(int,bool))); + connect(m_outline, TQ_SIGNAL(selectPage(int,bool)), + this, TQ_SIGNAL(selectPage(int,bool))); - connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), - this, TQT_SLOT(currentChanged(TQWidget *))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), + this, TQ_SLOT(currentChanged(TQWidget *))); } @@ -247,10 +247,10 @@ KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v) m_thumbTip = new ThumbToolTip(this); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), - this, TQT_SLOT(itemClicked(TQIconViewItem *))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotContentsMoving(int, int))); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)), + this, TQ_SLOT(itemClicked(TQIconViewItem *))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotContentsMoving(int, int))); } KPrThumbBar::~KPrThumbBar() @@ -347,7 +347,7 @@ void KPrThumbBar::rebuildItems() item->setDragEnabled(false); //no dragging for now } - TQTimer::singleShot( 10, this, TQT_SLOT( slotRefreshItems() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotRefreshItems() ) ); } uptodate = true; @@ -763,16 +763,16 @@ KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ) addColumn( i18n( "Slide" ) ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint&) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint&) ) ); - connect( this, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), - this, TQT_SLOT(renamePageTitle())); - connect( this, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) ), - this, TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) )); + connect( this, TQ_SIGNAL( doubleClicked ( TQListViewItem * )), + this, TQ_SLOT(renamePageTitle())); + connect( this, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) ), + this, TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) )); setItemsMovable( false ); setDragEnabled( true ); @@ -998,9 +998,9 @@ void KPrOutline::setCurrentPage( int pg ) void KPrOutline::contentsDropEvent( TQDropEvent *e ) { - disconnect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + disconnect( this, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); TDEListView::contentsDropEvent( e ); - connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); } void KPrOutline::moveItem( TQListViewItem *i, TQListViewItem *, TQListViewItem *newAfter ) diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index fe8a132ab..cf9172b4e 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -128,7 +128,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name if( m_effect == PEF_RANDOM ) m_dialog->effectCombo->setCurrentItem( m_dialog->effectCombo->count()-1 ); - connect( m_dialog->effectCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) ); + connect( m_dialog->effectCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( effectChanged( int ) ) ); // setup speed combo m_dialog->speedCombo->insertItem( i18n("Slow") ); @@ -137,7 +137,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name m_dialog->speedCombo->setCurrentItem( m_effectSpeed ); - connect( m_dialog->speedCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) ); + connect( m_dialog->speedCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( effectChanged( int ) ) ); // set up sound m_dialog->soundCheckBox->setChecked( m_soundEffect ); @@ -145,24 +145,24 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name soundEffectChanged(); m_dialog->playButton->setIconSet( SmallIconSet( "media-playback-start" ) ); m_dialog->stopButton->setIconSet( SmallIconSet( "media-playback-stop" ) ); - connect( m_dialog->playButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); - connect( m_dialog->stopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); + connect( m_dialog->playButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound() ) ); + connect( m_dialog->stopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound() ) ); - connect( m_dialog->soundCheckBox, TQT_SIGNAL( clicked()), this, TQT_SLOT( soundEffectChanged() ) ); - connect( m_dialog->soundRequester, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( m_dialog->soundRequester, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); + connect( m_dialog->soundCheckBox, TQ_SIGNAL( clicked()), this, TQ_SLOT( soundEffectChanged() ) ); + connect( m_dialog->soundRequester, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( m_dialog->soundRequester, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotSoundFileChanged( const TQString& ) ) ); // set up automatic tansition m_dialog->automaticTransitionInput->setRange( 1, 600, 1 ); m_dialog->automaticTransitionInput->setValue( m_slideTime ); // set up preview button - connect( m_dialog->previewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( preview() ) ); + connect( m_dialog->previewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( preview() ) ); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotUser1() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotUser1() ) ); setMainWidget( m_dialog ); } @@ -191,7 +191,7 @@ void KPrSlideTransitionDia::preview() if ( m_pageEffect ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); m_pageEffect->finish(); @@ -209,7 +209,7 @@ void KPrSlideTransitionDia::preview() } else { - connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } } @@ -220,7 +220,7 @@ void KPrSlideTransitionDia::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; m_dialog->previewPixmap->update(); diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 6a7f44404..18844e432 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -131,22 +131,22 @@ KPrTextObject::KPrTextObject( KPrDocument *doc ) bbottom = 0.0; alignVertical = 0.0; - connect( m_textobj, TQT_SIGNAL( newCommand( KCommand * ) ), - TQT_SLOT( slotNewCommand( KCommand * ) ) ); - connect( m_textobj, TQT_SIGNAL( availableHeightNeeded() ), - TQT_SLOT( slotAvailableHeightNeeded() ) ); - connect( m_textobj, TQT_SIGNAL( repaintChanged( KoTextObject* ) ), - TQT_SLOT( slotRepaintChanged() ) ); + connect( m_textobj, TQ_SIGNAL( newCommand( KCommand * ) ), + TQ_SLOT( slotNewCommand( KCommand * ) ) ); + connect( m_textobj, TQ_SIGNAL( availableHeightNeeded() ), + TQ_SLOT( slotAvailableHeightNeeded() ) ); + connect( m_textobj, TQ_SIGNAL( repaintChanged( KoTextObject* ) ), + TQ_SLOT( slotRepaintChanged() ) ); // Send our "repaintChanged" signals to the document. - connect( this, TQT_SIGNAL( repaintChanged( KPrTextObject * ) ), - m_doc, TQT_SLOT( slotRepaintChanged( KPrTextObject * ) ) ); - connect(m_textobj, TQT_SIGNAL( showFormatObject(const KoTextFormat &) ), - TQT_SLOT( slotFormatChanged(const KoTextFormat &)) ); - connect( m_textobj, TQT_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), - TQT_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); - connect( m_textobj, TQT_SIGNAL( paragraphDeleted( KoTextParag*) ), - TQT_SLOT( slotParagraphDeleted(KoTextParag*) )); + connect( this, TQ_SIGNAL( repaintChanged( KPrTextObject * ) ), + m_doc, TQ_SLOT( slotRepaintChanged( KPrTextObject * ) ) ); + connect(m_textobj, TQ_SIGNAL( showFormatObject(const KoTextFormat &) ), + TQ_SLOT( slotFormatChanged(const KoTextFormat &)) ); + connect( m_textobj, TQ_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), + TQ_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); + connect( m_textobj, TQ_SIGNAL( paragraphDeleted( KoTextParag*) ), + TQ_SLOT( slotParagraphDeleted(KoTextParag*) )); } @@ -1778,12 +1778,12 @@ KPrTextView::KPrTextView( KPrTextObject * txtObj, KPrCanvas *_canvas, bool temp m_kptextobj=txtObj; if (temp) return; - connect( txtObj->textObject(), TQT_SIGNAL( selectionChanged(bool) ), - m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); + connect( txtObj->textObject(), TQ_SIGNAL( selectionChanged(bool) ), + m_canvas, TQ_SIGNAL( selectionChanged(bool) ) ); KoTextView::setReadWrite( txtObj->kPresenterDocument()->isReadWrite() ); - connect( textView(), TQT_SIGNAL( cut() ), TQT_SLOT( cut() ) ); - connect( textView(), TQT_SIGNAL( copy() ), TQT_SLOT( copy() ) ); - connect( textView(), TQT_SIGNAL( paste() ), TQT_SLOT( paste() ) ); + connect( textView(), TQ_SIGNAL( cut() ), TQ_SLOT( cut() ) ); + connect( textView(), TQ_SIGNAL( copy() ), TQ_SLOT( copy() ) ); + connect( textView(), TQ_SIGNAL( paste() ), TQ_SLOT( paste() ) ); updateUI( true, true ); txtObj->setEditingTextObj( true ); @@ -1803,8 +1803,8 @@ KoTextViewIface* KPrTextView::dcopObject() void KPrTextView::terminate(bool removeSelection) { - disconnect( textView()->textObject(), TQT_SIGNAL( selectionChanged(bool) ), - m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); + disconnect( textView()->textObject(), TQ_SIGNAL( selectionChanged(bool) ), + m_canvas, TQ_SIGNAL( selectionChanged(bool) ) ); textView()->terminate(removeSelection); } diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index e10fd701a..3ce945314 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -41,8 +41,8 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg layout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); - connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ), - this, TQT_SLOT( slotProtectContentChanged( bool ) ) ); + connect( m_protectContentCheck, TQ_SIGNAL( toggled ( bool ) ), + this, TQ_SLOT( slotProtectContentChanged( bool ) ) ); resize( TQSize( 301, 217 ).expandedTo( minimumSizeHint() ) ); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index d409f6206..52bab2593 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -99,7 +99,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed ) if ( m_pageEffect ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); m_pageEffect->finish(); @@ -117,7 +117,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed ) } else { - connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } @@ -130,7 +130,7 @@ void KPrEffectPreview::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; TQLabel::update(); @@ -232,8 +232,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, if( pageEffect == PEF_RANDOM ) effectList->setCurrentItem( effectList->count()-1 ); - connect( effectList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(effectChanged(int)) ); - connect( effectList, TQT_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQT_SLOT( effectChanged()) ); + connect( effectList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(effectChanged(int)) ); + connect( effectList, TQ_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQ_SLOT( effectChanged()) ); new TQLabel( i18n("Speed:"), leftpart ); @@ -249,7 +249,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, speedCombo->setCurrentItem( speed ); - connect( speedCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(speedChanged(int)) ); + connect( speedCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(speedChanged(int)) ); TQWidget* previewgrp = new TQWidget( leftpart ); @@ -265,7 +265,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, previewButton = new TQPushButton( previewgrp ); previewButton->setText( i18n("Preview") ); - connect( previewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(preview()) ); + connect( previewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(preview()) ); TQFrame* line = new TQFrame( leftpart ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); @@ -275,7 +275,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, checkSoundEffect = new TQCheckBox( i18n( "Sound effect" ), leftpart ); checkSoundEffect->setChecked( soundEffect ); - connect( checkSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( soundEffectChanged() ) ); + connect( checkSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( soundEffectChanged() ) ); TQWidget* soundgrp = new TQWidget( leftpart ); TQBoxLayout* soundLayout = new TQHBoxLayout( soundgrp, KDialog::marginHint(), KDialog::spacingHint() ); @@ -284,22 +284,22 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, lSoundEffect = new TQLabel( i18n( "File name:" ), soundgrp ); requester = new KURLRequester( soundgrp ); requester->setURL( soundFileName ); - connect( requester, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); + connect( requester, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotSoundFileChanged( const TQString& ) ) ); buttonTestPlaySoundEffect = new TQPushButton( soundgrp ); buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", TDEIcon::SizeSmall) ); TQToolTip::add( buttonTestPlaySoundEffect, i18n("Play") ); - connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); + connect( buttonTestPlaySoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound() ) ); buttonTestStopSoundEffect = new TQPushButton( soundgrp ); buttonTestStopSoundEffect->setPixmap( BarIcon("media-playback-stop", TDEIcon::SizeSmall) ); TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") ); - connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); + connect( buttonTestStopSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound() ) ); soundEffect = pg->getPageSoundEffect(); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); @@ -311,7 +311,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, timeSlider = new KIntNumInput( slideTime, rightpart ); timeSlider->setRange( 1, 600, 1 ); timeSlider->setSuffix( i18n( " seconds" ) ); - connect( timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(timeChanged(int)) ); + connect( timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(timeChanged(int)) ); TQWidget* rspacer = new TQWidget( rightpart ); rspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index e43e3ce0e..bc89df188 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -364,41 +364,41 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) if ( shell() ) changeNbOfRecentFiles( m_pKPresenterDoc->maxRecentFiles() ); - connect(this, TQT_SIGNAL(embeddImage(const TQString &)), TQT_SLOT(insertPicture(const TQString &))); - connect( m_pKPresenterDoc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), - this, TQT_SLOT( refreshCustomMenu())); + connect(this, TQ_SIGNAL(embeddImage(const TQString &)), TQ_SLOT(insertPicture(const TQString &))); + connect( m_pKPresenterDoc, TQ_SIGNAL( sig_refreshMenuCustomVariable()), + this, TQ_SLOT( refreshCustomMenu())); // Cut and copy are directly connected to the selectionChanged signal if ( m_pKPresenterDoc->isReadWrite() ) - connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), - this, TQT_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); + connect( m_canvas, TQ_SIGNAL(selectionChanged(bool)), + this, TQ_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); else actionEditCut->setEnabled( false ); - connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), - actionEditCopy, TQT_SLOT(setEnabled(bool)) ); + connect( m_canvas, TQ_SIGNAL(selectionChanged(bool)), + actionEditCopy, TQ_SLOT(setEnabled(bool)) ); - connect (m_canvas, TQT_SIGNAL(selectionChanged(bool)), - actionChangeCase, TQT_SLOT(setEnabled(bool))); - //connect (m_canvas, TQT_SIGNAL(selectionChanged(bool)), - // actionCreateStyleFromSelection, TQT_SLOT(setEnabled(bool))); + connect (m_canvas, TQ_SIGNAL(selectionChanged(bool)), + actionChangeCase, TQ_SLOT(setEnabled(bool))); + //connect (m_canvas, TQ_SIGNAL(selectionChanged(bool)), + // actionCreateStyleFromSelection, TQ_SLOT(setEnabled(bool))); - connect( m_canvas, TQT_SIGNAL( currentObjectEditChanged() ), this, TQT_SLOT( slotObjectEditChanged())); + connect( m_canvas, TQ_SIGNAL( currentObjectEditChanged() ), this, TQ_SLOT( slotObjectEditChanged())); - connect( h_ruler, TQT_SIGNAL( tabListChanged( const KoTabulatorList & ) ), this, - TQT_SLOT( tabListChanged( const KoTabulatorList & ) ) ); + connect( h_ruler, TQ_SIGNAL( tabListChanged( const KoTabulatorList & ) ), this, + TQ_SLOT( tabListChanged( const KoTabulatorList & ) ) ); //statusbar stuff - connect( m_pKPresenterDoc, TQT_SIGNAL( pageNumChanged() ), this, TQT_SLOT( pageNumChanged()) ); - connect( this, TQT_SIGNAL( currentPageChanged(int) ), this, TQT_SLOT( pageNumChanged()) ); - connect( m_canvas, TQT_SIGNAL( objectSizeChanged() ), this, TQT_SLOT( updateObjectStatusBarItem() )); - connect( m_canvas, TQT_SIGNAL( objectSelectedChanged() ), this, TQT_SLOT( updateObjectStatusBarItem() )); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),this, TQT_SLOT( slotUpdateRuler())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),this, TQT_SLOT( slotUpdateScrollBarRanges())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateMenuBar()),this, TQT_SLOT(updateSideBarMenu())); - connect (m_pKPresenterDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)),this, TQT_SLOT(slotUnitChanged(KoUnit::Unit))); - connect( m_pKPresenterDoc, TQT_SIGNAL( modified( bool ) ), this, TQT_SLOT( documentModified( bool )) ); - connect( m_pKPresenterDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(loadingFinished())); + connect( m_pKPresenterDoc, TQ_SIGNAL( pageNumChanged() ), this, TQ_SLOT( pageNumChanged()) ); + connect( this, TQ_SIGNAL( currentPageChanged(int) ), this, TQ_SLOT( pageNumChanged()) ); + connect( m_canvas, TQ_SIGNAL( objectSizeChanged() ), this, TQ_SLOT( updateObjectStatusBarItem() )); + connect( m_canvas, TQ_SIGNAL( objectSelectedChanged() ), this, TQ_SLOT( updateObjectStatusBarItem() )); + connect (m_pKPresenterDoc, TQ_SIGNAL(sig_updateRuler()),this, TQ_SLOT( slotUpdateRuler())); + connect (m_pKPresenterDoc, TQ_SIGNAL(sig_updateRuler()),this, TQ_SLOT( slotUpdateScrollBarRanges())); + connect (m_pKPresenterDoc, TQ_SIGNAL(sig_updateMenuBar()),this, TQ_SLOT(updateSideBarMenu())); + connect (m_pKPresenterDoc, TQ_SIGNAL(unitChanged(KoUnit::Unit)),this, TQ_SLOT(slotUnitChanged(KoUnit::Unit))); + connect( m_pKPresenterDoc, TQ_SIGNAL( modified( bool ) ), this, TQ_SLOT( documentModified( bool )) ); + connect( m_pKPresenterDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(loadingFinished())); KStatusBar * sb = statusBar(); m_sbPageLabel = 0L; @@ -1074,14 +1074,14 @@ void KPrView::toolsAutoform() afChoose->resize( 400, 300 ); afChoose->setCaption( i18n( "Insert Autoform" ) ); - TQObject::connect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - this, TQT_SLOT( afChooseOk( const TQString & ) ) ); - TQObject::connect( afChoose, TQT_SIGNAL( afchooseCanceled()), - this, TQT_SLOT(slotAfchooseCanceled())); + TQObject::connect( afChoose, TQ_SIGNAL( formChosen( const TQString & ) ), + this, TQ_SLOT( afChooseOk( const TQString & ) ) ); + TQObject::connect( afChoose, TQ_SIGNAL( afchooseCanceled()), + this, TQ_SLOT(slotAfchooseCanceled())); afChoose->exec(); - TQObject::disconnect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - this, TQT_SLOT( afChooseOk( const TQString & ) ) ); + TQObject::disconnect( afChoose, TQ_SIGNAL( formChosen( const TQString & ) ), + this, TQ_SLOT( afChooseOk( const TQString & ) ) ); delete afChoose; afChoose = 0; } @@ -1235,9 +1235,9 @@ void KPrView::extraProperties() m_propertyEditor = new KPrPropertyEditor( this, "KPrPropertyEditor", m_canvas->activePage(), m_pKPresenterDoc ); m_propertyEditor->setCaption( i18n( "Properties" ) ); - connect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + connect( m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); m_propertyEditor->exec(); - disconnect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + disconnect( m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); delete m_propertyEditor; m_propertyEditor = 0; @@ -1260,7 +1260,7 @@ void KPrView::extraRotate() if ( m_canvas->numberOfObjectSelected() > 0 ) { if ( !rotateDia ) { rotateDia = new KPrRotationDialogImpl( this ); - connect( rotateDia, TQT_SIGNAL( apply() ), this, TQT_SLOT( rotateOk() ) ); + connect( rotateDia, TQ_SIGNAL( apply() ), this, TQ_SLOT( rotateOk() ) ); } rotateDia->setAngle( m_canvas->getSelectedObj()->getAngle() ); m_canvas->setToolEditMode( TEM_MOUSE ); @@ -1275,7 +1275,7 @@ void KPrView::extraShadow() if ( !shadowDia ) { shadowDia = new KPrShadowDialogImpl( this ); shadowDia->resize( shadowDia->minimumSize() ); - connect( shadowDia, TQT_SIGNAL( apply() ), this, TQT_SLOT( shadowOk() ) ); + connect( shadowDia, TQ_SIGNAL( apply() ), this, TQ_SLOT( shadowOk() ) ); } KPrObject *object=m_canvas->getSelectedObj(); @@ -1305,10 +1305,10 @@ void KPrView::extraBackground() page->getBackYFactor( ), page ); backDia->setCaption( i18n( "Slide Background" ) ); - TQObject::connect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; + TQObject::connect( backDia, TQ_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQ_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; backDia->exec(); - TQObject::disconnect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ); + TQObject::disconnect( backDia, TQ_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQ_SLOT( backOk( KPrBackDialog*, bool ) ) ); delete backDia; } @@ -1453,10 +1453,10 @@ void KPrView::screenConfigPages() delete pgConfDia; pgConfDia = new KPrPgConfDia( this, kPresenterDoc() ); pgConfDia->setCaption( i18n( "Configure Slide Show" ) ); - TQObject::connect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); + TQObject::connect( pgConfDia, TQ_SIGNAL( pgConfDiaOk() ), this, TQ_SLOT( pgConfOk() ) ); pgConfDia->exec(); - TQObject::disconnect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); + TQObject::disconnect( pgConfDia, TQ_SIGNAL( pgConfDiaOk() ), this, TQ_SLOT( pgConfOk() ) ); delete pgConfDia; pgConfDia = 0; } @@ -1583,7 +1583,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) m_pKPresenterDoc->repaint( false ); if ( ! m_autoPresTimerConnected ) { - connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) ); + connect( &m_autoPresTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( doAutomaticScreenPres() ) ); m_autoPresTimerConnected = true; } } @@ -1837,8 +1837,8 @@ void KPrView::mtextFont() , m_broker , this, 0 ); - connect( m_fontDlg, TQT_SIGNAL( applyFont() ), - this, TQT_SLOT( slotApplyFont() ) ); + connect( m_fontDlg, TQ_SIGNAL( applyFont() ), + this, TQ_SLOT( slotApplyFont() ) ); m_fontDlg->exec(); delete m_fontDlg; @@ -2159,12 +2159,12 @@ void KPrView::createGUI() && !m_pKPresenterDoc->isSingleViewMode() ) // No sidebar if the document is embedded { sidebar = new KPrSideBar( splitter, m_pKPresenterDoc, this ); - connect( sidebar, TQT_SIGNAL( movePage( int, int ) ), - m_pKPresenterDoc, TQT_SLOT( movePage( int, int ) ) ); - connect( sidebar, TQT_SIGNAL( selectPage( int, bool ) ), - m_pKPresenterDoc, TQT_SLOT( selectPage( int, bool ) ) ); - connect( sidebar, TQT_SIGNAL( showPage( int ) ), - this, TQT_SLOT( skipToPage( int ) ) ); + connect( sidebar, TQ_SIGNAL( movePage( int, int ) ), + m_pKPresenterDoc, TQ_SLOT( movePage( int, int ) ) ); + connect( sidebar, TQ_SIGNAL( selectPage( int, bool ) ), + m_pKPresenterDoc, TQ_SLOT( selectPage( int, bool ) ) ); + connect( sidebar, TQ_SIGNAL( showPage( int ) ), + this, TQ_SLOT( skipToPage( int ) ) ); // This sucks when resizing the window //splitter->setResizeMode( sidebar, TQSplitter::FollowSizeHint ); //splitter->setResizeMode( pageBase, TQSplitter::Stretch ); @@ -2179,16 +2179,16 @@ void KPrView::createGUI() m_canvas=new KPrCanvas( pageBase, "Canvas", this ); - TQObject::connect( m_canvas, TQT_SIGNAL( fontChanged( const TQFont & ) ), - this, TQT_SLOT( fontChanged( const TQFont & ) ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( colorChanged( const TQColor & ) ), - this, TQT_SLOT( colorChanged( const TQColor & ) ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( alignChanged( int ) ), - this, TQT_SLOT( alignChanged( int ) ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( objectSelectedChanged()), - this, TQT_SLOT( objectSelectedChanged())); - TQObject::connect( m_canvas, TQT_SIGNAL( sigMouseWheelEvent( TQWheelEvent* ) ), - this, TQT_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( fontChanged( const TQFont & ) ), + this, TQ_SLOT( fontChanged( const TQFont & ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( colorChanged( const TQColor & ) ), + this, TQ_SLOT( colorChanged( const TQColor & ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( alignChanged( int ) ), + this, TQ_SLOT( alignChanged( int ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( objectSelectedChanged()), + this, TQ_SLOT( objectSelectedChanged())); + TQObject::connect( m_canvas, TQ_SIGNAL( sigMouseWheelEvent( TQWheelEvent* ) ), + this, TQ_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); // setup notebar. @@ -2207,23 +2207,23 @@ void KPrView::createGUI() if ( m_pKPresenterDoc && m_canvas ) { - TQObject::connect( m_canvas, TQT_SIGNAL( stopAutomaticPresentation() ), this, TQT_SLOT( stopAutomaticPresentation() ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( restartPresentation() ), this, TQT_SLOT( restartPresentation() ) ); - - connect( getVRuler(), TQT_SIGNAL( addGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( addGuide( const TQPoint &, bool, int ) ) ); - connect( getVRuler(), TQT_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); - connect( getHRuler(), TQT_SIGNAL( addGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( addGuide( const TQPoint &, bool, int ) ) ); - connect( getHRuler(), TQT_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); - connect( &( m_canvas->guideLines() ), TQT_SIGNAL( moveGuides( bool ) ), - m_canvas, TQT_SLOT( setPaintGuides( bool ) ) ); - connect( &( m_canvas->guideLines() ), TQT_SIGNAL( paintGuides( bool ) ), - m_canvas, TQT_SLOT( setPaintGuides( bool ) ) ); - connect( &( m_canvas->guideLines() ), TQT_SIGNAL( guideLinesChanged( KoView * ) ), - m_pKPresenterDoc, TQT_SLOT( slotGuideLinesChanged( KoView * ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( stopAutomaticPresentation() ), this, TQ_SLOT( stopAutomaticPresentation() ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( restartPresentation() ), this, TQ_SLOT( restartPresentation() ) ); + + connect( getVRuler(), TQ_SIGNAL( addGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( addGuide( const TQPoint &, bool, int ) ) ); + connect( getVRuler(), TQ_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); + connect( getHRuler(), TQ_SIGNAL( addGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( addGuide( const TQPoint &, bool, int ) ) ); + connect( getHRuler(), TQ_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); + connect( &( m_canvas->guideLines() ), TQ_SIGNAL( moveGuides( bool ) ), + m_canvas, TQ_SLOT( setPaintGuides( bool ) ) ); + connect( &( m_canvas->guideLines() ), TQ_SIGNAL( paintGuides( bool ) ), + m_canvas, TQ_SLOT( setPaintGuides( bool ) ) ); + connect( &( m_canvas->guideLines() ), TQ_SIGNAL( guideLinesChanged( KoView * ) ), + m_pKPresenterDoc, TQ_SLOT( slotGuideLinesChanged( KoView * ) ) ); m_canvas->guideLines().setGuideLines( m_pKPresenterDoc->horizontalGuideLines(), m_pKPresenterDoc->verticalGuideLines() ); } @@ -2250,7 +2250,7 @@ void KPrView::createGUI() } else actionViewShowNoteBar->setChecked(true); // HACK This is needed to be able to calculate a good initial size for the notebar - TQTimer::singleShot( 0, this, TQT_SLOT( initialLayoutOfSplitter() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( initialLayoutOfSplitter() ) ); } KPrPage *initPage=m_pKPresenterDoc->initialActivePage(); if ( !initPage ) @@ -2316,179 +2316,179 @@ void KPrView::guiActivateEvent( KParts::GUIActivateEvent *ev ) void KPrView::setupActions() { - actionEditCut = KStdAction::cut( this, TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - actionEditCopy = KStdAction::copy( this, TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - actionEditPaste = KStdAction::paste( this, TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - connect( m_pKPresenterDoc, TQT_SIGNAL( enablePaste( bool ) ), - actionEditPaste, TQT_SLOT( setEnabled( bool ) ) ); + actionEditCut = KStdAction::cut( this, TQ_SLOT( editCut() ), actionCollection(), "edit_cut" ); + actionEditCopy = KStdAction::copy( this, TQ_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + actionEditPaste = KStdAction::paste( this, TQ_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + connect( m_pKPresenterDoc, TQ_SIGNAL( enablePaste( bool ) ), + actionEditPaste, TQ_SLOT( setEnabled( bool ) ) ); m_pKPresenterDoc->clipboardDataChanged(); // set paste's initial state actionEditDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", CTRL + TQt::Key_Delete, - this, TQT_SLOT( editDelete() ), + this, TQ_SLOT( editDelete() ), actionCollection(), "edit_delete" ); - actionEditSelectAll = KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - actionEditDeSelectAll= KStdAction::deselect( this, TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); + actionEditSelectAll = KStdAction::selectAll( this, TQ_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); + actionEditDeSelectAll= KStdAction::deselect( this, TQ_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); actionEditCopyPage = new TDEAction( i18n( "Copy Slide" ), "edit-copy", - 0, this, TQT_SLOT( editCopyPage() ), + 0, this, TQ_SLOT( editCopyPage() ), actionCollection(), "edit_copypage" ); actionEditDuplicatePage = new TDEAction( i18n( "Duplicate Slide" ), "newslide", - 0, this, TQT_SLOT( editDuplicatePage() ), + 0, this, TQ_SLOT( editDuplicatePage() ), actionCollection(), "edit_duplicatepage" ); actionEditDelPage = new TDEAction( i18n( "Delete Slide" ), "delslide", 0, - this, TQT_SLOT( editDelPage() ), + this, TQ_SLOT( editDelPage() ), actionCollection(), "edit_delpage" ); - actionEditFind=KStdAction::find( this, TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); - actionEditFindNext = KStdAction::findNext( this, TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - actionEditFindPrevious = KStdAction::findPrev( this, TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - actionEditReplace=KStdAction::replace( this, TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); + actionEditFind=KStdAction::find( this, TQ_SLOT( editFind() ), actionCollection(), "edit_find" ); + actionEditFindNext = KStdAction::findNext( this, TQ_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); + actionEditFindPrevious = KStdAction::findPrev( this, TQ_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); + actionEditReplace=KStdAction::replace( this, TQ_SLOT( editReplace() ), actionCollection(), "edit_replace" ); // ---------------- View actions if ( !m_pKPresenterDoc->isEmbedded() ) { actionViewShowSideBar = new TDEToggleAction( i18n("Show Sidebar"), 0, - this, TQT_SLOT( viewShowSideBar() ), + this, TQ_SLOT( viewShowSideBar() ), actionCollection(), "view_showsidebar" ); actionViewShowSideBar->setCheckedState(i18n("Hide Sidebar")); actionViewShowNoteBar = new TDEToggleAction( i18n("Show Notebar"), 0, - this, TQT_SLOT( viewShowNoteBar() ), + this, TQ_SLOT( viewShowNoteBar() ), actionCollection(), "view_shownotebar" ); actionViewShowNoteBar->setCheckedState(i18n("Hide Notebar")); } actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, - this, TQT_SLOT( slotViewFormattingChars() ), + this, TQ_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.<br><br>When this is enabled, KPresenter shows you tabs, spaces, carriage returns and other non-printing characters." ) ); actionViewSlideMaster = new TDEToggleAction( i18n( "Slide &Master" ), 0, - this, TQT_SLOT( viewSlideMaster() ), + this, TQ_SLOT( viewSlideMaster() ), actionCollection(), "view_master" ); actionViewShowGuideLine= new TDEToggleAction( i18n( "Guide Lines" ), 0, - this, TQT_SLOT( viewGuideLines() ), + this, TQ_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); actionViewShowGrid = new TDEToggleAction( i18n( "Show &Grid" ), 0, - this, TQT_SLOT( viewGrid() ), + this, TQ_SLOT( viewGrid() ), actionCollection(), "view_grid" ); actionViewShowGrid->setCheckedState(i18n("Hide &Grid")); actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, - this, TQT_SLOT(viewSnapToGrid() ), + this, TQ_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); // ---------------- insert actions actionInsertPage = new TDEAction( i18n( "&Slide..." ), "slide", TQt::Key_F2, - this, TQT_SLOT( insertPage() ), + this, TQ_SLOT( insertPage() ), actionCollection(), "insert_page" ); new TDEAction( i18n( "Insert &Slide..." ), "newslide", 0, - this, TQT_SLOT( insertPage() ), + this, TQ_SLOT( insertPage() ), actionCollection(), "insert_page_popup" ); actionInsertPicture = new TDEAction( i18n( "P&icture..." ), "frame_image", TQt::SHIFT+TQt::Key_F5, - this, TQT_SLOT( insertPicture() ), + this, TQ_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); // ----------------- tools actions actionToolsMouse = new TDEToggleAction( i18n( "Select" ), "select", 0, - this, TQT_SLOT( toolsMouse() ), + this, TQ_SLOT( toolsMouse() ), actionCollection(), "tools_mouse" ); actionToolsMouse->setExclusiveGroup( "tools" ); actionToolsMouse->setChecked( true ); actionToolsRotate = new TDEToggleAction( i18n( "&Rotate" ), "rotate", 0, - this, TQT_SLOT( toolsRotate() ), + this, TQ_SLOT( toolsRotate() ), actionCollection(), "tools_rotate" ); actionToolsRotate->setExclusiveGroup( "tools" ); actionToolsZoom = new TDEToggleAction( i18n( "&Zoom" ), "viewmag", 0, - this, TQT_SLOT( toolsZoom() ), + this, TQ_SLOT( toolsZoom() ), actionCollection(), "tools_zoom" ); actionToolsZoom->setExclusiveGroup( "tools" ); actionToolsShapePopup = new TDEActionMenu( i18n( "&Shape" ), "rectangle", actionCollection(), "tools_shapepopup" ); actionToolsShapePopup->setDelayed(true); - connect(actionToolsShapePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsShapePopup())); + connect(actionToolsShapePopup, TQ_SIGNAL(activated()), this, TQ_SLOT(toolsShapePopup())); actionToolsRectangle = new TDEToggleAction( i18n( "&Rectangle" ), "rectangle", - 0, this, TQT_SLOT( toolsRectangle() ), + 0, this, TQ_SLOT( toolsRectangle() ), actionCollection(), "tools_rectangle" ); actionToolsRectangle->setExclusiveGroup( "tools" ); actionToolsCircleOrEllipse = new TDEToggleAction( i18n( "&Circle/Ellipse" ), "circle", - 0, this, TQT_SLOT( toolsCircleOrEllipse() ), + 0, this, TQ_SLOT( toolsCircleOrEllipse() ), actionCollection(), "tools_circle" ); actionToolsCircleOrEllipse->setExclusiveGroup( "tools" ); actionToolsPie = new TDEToggleAction( i18n( "&Pie/Arc/Chord" ), "pie", 0, - this, TQT_SLOT( toolsPie() ), + this, TQ_SLOT( toolsPie() ), actionCollection(), "tools_pie" ); actionToolsPie->setExclusiveGroup( "tools" ); actionToolsText = new TDEToggleAction( i18n( "&Text" ), "frame_text", TQt::Key_F10, // same shortcut as KWord - this, TQT_SLOT( toolsText() ), + this, TQ_SLOT( toolsText() ), actionCollection(), "tools_text" ); actionToolsText->setExclusiveGroup( "tools" ); actionToolsAutoform = new TDEToggleAction( i18n( "&Arrows && Connections" ), "autoform", - 0, this, TQT_SLOT( toolsAutoform() ), + 0, this, TQ_SLOT( toolsAutoform() ), actionCollection(), "tools_autoform" ); actionToolsAutoform->setExclusiveGroup( "tools" ); actionToolsDiagramm = new TDEToggleAction( i18n( "&Chart" ), "frame_chart", 0, - this, TQT_SLOT( toolsDiagramm() ), + this, TQ_SLOT( toolsDiagramm() ), actionCollection(), "tools_diagramm" ); actionToolsDiagramm->setExclusiveGroup( "tools" ); actionToolsTable = new TDEToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", TQt::Key_F5 /*same as kword*/, - this, TQT_SLOT( toolsTable() ), + this, TQ_SLOT( toolsTable() ), actionCollection(), "tools_table" ); actionToolsTable->setExclusiveGroup( "tools" ); actionToolsObject = new KoPartSelectAction( i18n( "&Object" ), "frame_query", - this, TQT_SLOT( toolsObject() ), + this, TQ_SLOT( toolsObject() ), actionCollection(), "tools_object" ); actionToolsLinePopup = new TDEActionMenu( i18n( "&Line" ), "line", actionCollection(), "tools_linepopup" ); actionToolsLinePopup->setDelayed(true); - connect(actionToolsLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsLinePopup())); + connect(actionToolsLinePopup, TQ_SIGNAL(activated()), this, TQ_SLOT(toolsLinePopup())); actionToolsLine = new TDEToggleAction( i18n( "&Line" ), "line", 0, - this, TQT_SLOT( toolsLine() ), + this, TQ_SLOT( toolsLine() ), actionCollection(), "tools_line" ); actionToolsLine->setExclusiveGroup( "tools" ); actionToolsFreehand = new TDEToggleAction( i18n( "&Freehand" ), "freehand", 0, - this, TQT_SLOT( toolsFreehand() ), + this, TQ_SLOT( toolsFreehand() ), actionCollection(), "tools_freehand" ); actionToolsFreehand->setExclusiveGroup( "tools" ); actionToolsPolyline = new TDEToggleAction( i18n( "Po&lyline" ), "polyline", 0, - this, TQT_SLOT( toolsPolyline() ), + this, TQ_SLOT( toolsPolyline() ), actionCollection(), "tools_polyline" ); actionToolsPolyline->setExclusiveGroup( "tools" ); actionToolsQuadricBezierCurve = new TDEToggleAction( i18n( "&Quadric Bezier Curve" ), "quadricbeziercurve", 0, - this, TQT_SLOT( toolsQuadricBezierCurve() ), + this, TQ_SLOT( toolsQuadricBezierCurve() ), actionCollection(), "tools_quadricbeziercurve" ); actionToolsQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsCubicBezierCurve = new TDEToggleAction( i18n( "C&ubic Bezier Curve" ), "cubicbeziercurve", 0, - this, TQT_SLOT( toolsCubicBezierCurve() ), + this, TQ_SLOT( toolsCubicBezierCurve() ), actionCollection(), "tools_cubicbeziercurve" ); actionToolsCubicBezierCurve->setExclusiveGroup( "tools" ); actionToolsConvexOrConcavePolygon = new TDEToggleAction( i18n( "Co&nvex/Concave Polygon" ), "polygon", 0, - this, TQT_SLOT( toolsConvexOrConcavePolygon() ), + this, TQ_SLOT( toolsConvexOrConcavePolygon() ), actionCollection(), "tools_polygon" ); actionToolsConvexOrConcavePolygon->setExclusiveGroup( "tools" ); @@ -2496,39 +2496,39 @@ void KPrView::setupActions() actionToolsClosedLinePopup = new TDEActionMenu( i18n( "&Closed Line" ), "closed_freehand", actionCollection(), "tools_closed_linepopup" ); actionToolsClosedLinePopup->setDelayed(true); - connect(actionToolsClosedLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsClosedLinePopup())); + connect(actionToolsClosedLinePopup, TQ_SIGNAL(activated()), this, TQ_SLOT(toolsClosedLinePopup())); actionToolsClosedFreehand = new TDEToggleAction( i18n( "Closed &Freehand" ), "closed_freehand", 0, - this, TQT_SLOT( toolsClosedFreehand() ), + this, TQ_SLOT( toolsClosedFreehand() ), actionCollection(), "tools_closed_freehand" ); actionToolsClosedFreehand->setExclusiveGroup( "tools" ); actionToolsClosedPolyline = new TDEToggleAction( i18n( "Closed Po&lyline" ), "closed_polyline", 0, - this, TQT_SLOT( toolsClosedPolyline() ), + this, TQ_SLOT( toolsClosedPolyline() ), actionCollection(), "tools_closed_polyline" ); actionToolsClosedPolyline->setExclusiveGroup( "tools" ); actionToolsClosedQuadricBezierCurve = new TDEToggleAction( i18n( "Closed &Quadric Bezier Curve" ), "closed_quadricbeziercurve", 0, - this, TQT_SLOT( toolsClosedQuadricBezierCurve() ), + this, TQ_SLOT( toolsClosedQuadricBezierCurve() ), actionCollection(), "tools_closed_quadricbeziercurve" ); actionToolsClosedQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsClosedCubicBezierCurve = new TDEToggleAction( i18n( "Closed C&ubic Bezier Curve" ), "closed_cubicbeziercurve", 0, - this, TQT_SLOT( toolsClosedCubicBezierCurve() ), + this, TQ_SLOT( toolsClosedCubicBezierCurve() ), actionCollection(), "tools_closed_cubicbeziercurve" ); actionToolsClosedCubicBezierCurve->setExclusiveGroup( "tools" ); // ----------------- text actions - actionTextFont = new TDEAction( i18n( "&Font..." ), 0, this, TQT_SLOT( mtextFont() ), + actionTextFont = new TDEAction( i18n( "&Font..." ), 0, this, TQ_SLOT( mtextFont() ), actionCollection(), "text_font" ); actionTextFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "text_fontsize" ); - connect( actionTextFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - this, TQT_SLOT( sizeSelected( int ) ) ); + connect( actionTextFontSize, TQ_SIGNAL( fontSizeChanged( int ) ), + this, TQ_SLOT( sizeSelected( int ) ) ); #ifdef KFONTACTION_HAS_CRITERIA_ARG actionTextFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, @@ -2538,49 +2538,49 @@ void KPrView::setupActions() actionTextFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "text_fontfamily" ); #endif - connect( actionTextFontFamily , TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( fontSelected( const TQString & ) ) ); + connect( actionTextFontFamily , TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( fontSelected( const TQString & ) ) ); actionTextBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", CTRL + TQt::Key_B, - this, TQT_SLOT( textBold() ), + this, TQ_SLOT( textBold() ), actionCollection(), "format-text-bold" ); actionTextItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", CTRL + TQt::Key_I, - this, TQT_SLOT( textItalic() ), + this, TQ_SLOT( textItalic() ), actionCollection(), "format-text-italic" ); actionTextUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", CTRL + TQt::Key_U, - this, TQT_SLOT( textUnderline() ), + this, TQ_SLOT( textUnderline() ), actionCollection(), "text_underline" ); actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 , - this, TQT_SLOT( textStrikeOut() ), + this, TQ_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); actionTextColor = new TTDESelectColorAction( i18n( "&Color..." ), TTDESelectColorAction::TextColor, actionCollection(), "text_color" ,true); - connect( actionTextColor, TQT_SIGNAL( activated() ), TQT_SLOT( textColor() ) ); + connect( actionTextColor, TQ_SIGNAL( activated() ), TQ_SLOT( textColor() ) ); actionTextColor->setDefaultColor(TQColor()); actionTextAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", ALT + TQt::Key_L, - this, TQT_SLOT( textAlignLeft() ), + this, TQ_SLOT( textAlignLeft() ), actionCollection(), "text_alignleft" ); actionTextAlignLeft->setExclusiveGroup( "align" ); actionTextAlignLeft->setChecked( true ); actionTextAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", ALT + TQt::Key_C, - this, TQT_SLOT( textAlignCenter() ), + this, TQ_SLOT( textAlignCenter() ), actionCollection(), "text_aligncenter" ); actionTextAlignCenter->setExclusiveGroup( "align" ); actionTextAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", ALT + TQt::Key_R, - this, TQT_SLOT( textAlignRight() ), + this, TQ_SLOT( textAlignRight() ), actionCollection(), "text_alignright" ); actionTextAlignRight->setExclusiveGroup( "align" ); actionTextAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", CTRL + TQt::Key_J, - this, TQT_SLOT( textAlignBlock() ), + this, TQ_SLOT( textAlignBlock() ), actionCollection(), "text_alignblock" ); actionTextAlignBlock->setExclusiveGroup( "align" ); @@ -2596,7 +2596,7 @@ void KPrView::setupActions() // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu TDEToggleAction* act = new TDEToggleAction( styleIt.current()->name(), /*TODO icon,*/ - 0, this, TQT_SLOT( slotCounterStyleSelected() ), + 0, this, TQ_SLOT( slotCounterStyleSelected() ), actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise @@ -2609,29 +2609,29 @@ void KPrView::setupActions() actionFormatNumber->insert( act ); } actionTextDepthPlus = new TDEAction( i18n( "&Increase Depth" ), TQApplication::reverseLayout() ?"format_decreaseindent" : "format_increaseindent", - CTRL + TQt::Key_Plus, this, TQT_SLOT( textDepthPlus() ), + CTRL + TQt::Key_Plus, this, TQ_SLOT( textDepthPlus() ), actionCollection(), "text_depthPlus" ); actionTextDepthMinus = new TDEAction( i18n( "&Decrease Depth" ), TQApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", - CTRL + TQt::Key_Minus, this, TQT_SLOT( textDepthMinus() ), + CTRL + TQt::Key_Minus, this, TQ_SLOT( textDepthMinus() ), actionCollection(), "text_depthMinus" ); actionTextExtentCont2Height = new TDEAction( i18n( "Extend Contents to Object &Height" ), 0, - this, TQT_SLOT( textContentsToHeight() ), + this, TQ_SLOT( textContentsToHeight() ), actionCollection(), "text_con2hei" ); actionTextExtendObj2Cont = new TDEAction( i18n( "&Extend Object to Fit Contents" ), 0, - this, TQT_SLOT( textObjectToContents() ), + this, TQ_SLOT( textObjectToContents() ), actionCollection(), "text_obj2cont" ); actionTextInsertPageNum = new TDEAction( i18n( "&Insert Slide Number" ), "pgnum", 0, - this, TQT_SLOT( textInsertPageNum() ), + this, TQ_SLOT( textInsertPageNum() ), actionCollection(), "text_inspgnum" ); // ----------------- format actions actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - this, TQT_SLOT( extraProperties() ), + this, TQ_SLOT( extraProperties() ), actionCollection(), "extra_properties" ); actionExtraArrangePopup = new TDEActionMenu( i18n( "Arra&nge Objects" ), "arrange", @@ -2639,98 +2639,98 @@ void KPrView::setupActions() actionExtraArrangePopup->setDelayed( false ); actionExtraRaise = new TDEAction( i18n( "Ra&ise Objects" ), "raise", - CTRL+TQt::SHIFT+TQt::Key_R, this, TQT_SLOT( extraRaise() ), + CTRL+TQt::SHIFT+TQt::Key_R, this, TQ_SLOT( extraRaise() ), actionCollection(), "extra_raise" ); actionExtraLower = new TDEAction( i18n( "&Lower Objects" ), "lower", CTRL +TQt::SHIFT+ TQt::Key_L, - this, TQT_SLOT( extraLower() ), + this, TQ_SLOT( extraLower() ), actionCollection(), "extra_lower" ); actionExtraBringForward= new TDEAction( i18n( "Bring to Front" ), "bring_forward", - 0, this, TQT_SLOT( extraBringForward() ), + 0, this, TQ_SLOT( extraBringForward() ), actionCollection(), "extra_bring_forward" ); actionExtraSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", - 0, this, TQT_SLOT( extraSendBackward() ), + 0, this, TQ_SLOT( extraSendBackward() ), actionCollection(), "extra_send_backward" ); actionExtraRotate = new TDEAction( i18n( "R&otate Objects..." ), "object-rotate-right", 0, - this, TQT_SLOT( extraRotate() ), + this, TQ_SLOT( extraRotate() ), actionCollection(), "extra_rotate" ); actionExtraShadow = new TDEAction( i18n( "&Shadow Objects..." ), "shadow", 0, - this, TQT_SLOT( extraShadow() ), + this, TQ_SLOT( extraShadow() ), actionCollection(), "extra_shadow" ); actionExtraAlignObjLeft = new TDEAction( i18n( "Align &Left" ), "aoleft", 0, - this, TQT_SLOT( extraAlignObjLeft() ), + this, TQ_SLOT( extraAlignObjLeft() ), actionCollection(), "extra_alignleft" ); actionExtraAlignObjCenterH = new TDEAction( i18n( "Align Center (&horizontally)" ), "aocenterh", 0, - this, TQT_SLOT( extraAlignObjCenterH() ), + this, TQ_SLOT( extraAlignObjCenterH() ), actionCollection(), "extra_aligncenterh" ); actionExtraAlignObjRight = new TDEAction( i18n( "Align &Right" ), "aoright", 0, - this, TQT_SLOT( extraAlignObjRight() ), + this, TQ_SLOT( extraAlignObjRight() ), actionCollection(), "extra_alignright" ); actionExtraAlignObjTop = new TDEAction( i18n( "Align &Top" ), "aotop", 0, - this, TQT_SLOT( extraAlignObjTop() ), + this, TQ_SLOT( extraAlignObjTop() ), actionCollection(), "extra_aligntop" ); actionExtraAlignObjCenterV = new TDEAction( i18n( "Align Center (&vertically)" ), "aocenterv", 0, - this, TQT_SLOT( extraAlignObjCenterV() ), + this, TQ_SLOT( extraAlignObjCenterV() ), actionCollection(), "extra_aligncenterv" ); actionExtraAlignObjBottom = new TDEAction( i18n( "Align &Bottom" ), "aobottom", 0, - this, TQT_SLOT( extraAlignObjBottom() ), + this, TQ_SLOT( extraAlignObjBottom() ), actionCollection(), "extra_alignbottom" ); actionExtraBackground = new TDEAction( i18n( "Slide Bac&kground..." ), "background", 0, - this, TQT_SLOT( extraBackground() ), + this, TQ_SLOT( extraBackground() ), actionCollection(), "extra_background" ); actionExtraLayout = new TDEAction( i18n( "Page &Layout..." ), 0, - this, TQT_SLOT( extraLayout() ), + this, TQ_SLOT( extraLayout() ), actionCollection(), "extra_layout" ); m_actionExtraHeader = new TDEToggleAction( i18n( "Enable Document &Header" ), 0, - this, TQT_SLOT( viewHeader() ), + this, TQ_SLOT( viewHeader() ), actionCollection(), "extra_header" ); m_actionExtraHeader->setCheckedState( i18n( "Disable Document &Header" ) ); m_actionExtraHeader->setToolTip( i18n( "Shows and hides header display for the current slide." ) ); m_actionExtraFooter = new TDEToggleAction( i18n( "Enable Document Foo&ter" ), 0, - this, TQT_SLOT( viewFooter() ), + this, TQ_SLOT( viewFooter() ), actionCollection(), "extra_footer" ); m_actionExtraFooter->setCheckedState( i18n( "Disable Document Foo&ter" ) ); m_actionExtraFooter->setToolTip( i18n( "Shows and hides footer display for the current slide." ) ); actionExtraConfigure = new TDEAction( i18n( "Configure KPresenter..." ), "configure", 0, - this, TQT_SLOT( extraConfigure() ), + this, TQ_SLOT( extraConfigure() ), actionCollection(), "extra_configure" ); actionExtraWebPres = new TDEAction( i18n( "Create &HTML Slideshow..." ), "webpres", 0, - this, TQT_SLOT( extraWebPres() ), + this, TQ_SLOT( extraWebPres() ), actionCollection(), "extra_webpres" ); actionExtraMSPres = new TDEAction( i18n( "Create Memor&y Stick Slideshow..." ), - 0, this, TQT_SLOT( extraMSPres() ), + 0, this, TQ_SLOT( extraMSPres() ), actionCollection(), "extra_mspres" ); actionExtraCreateTemplate = new TDEAction( i18n( "Template Manager" ), 0, - this, TQT_SLOT( extraCreateTemplate() ), + this, TQ_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); actionExtraDefaultTemplate = new TDEAction( i18n( "Use Current Slide as Default Template" ), 0, - this, TQT_SLOT( extraDefaultTemplate() ), + this, TQ_SLOT( extraDefaultTemplate() ), actionCollection(), "extra_defaulttemplate" ); actionExtraAlignObjsPopup = new TDEActionMenu( i18n("Align O&bjects"), "alignobjs", @@ -2738,207 +2738,207 @@ void KPrView::setupActions() actionExtraAlignObjsPopup->setDelayed( false ); actionExtraLineBegin = new TDEAction( i18n("Line Begin"), "line_begin", 0, - this, TQT_SLOT( extraLineBegin() ), + this, TQ_SLOT( extraLineBegin() ), actionCollection(), "extra_linebegin" ); actionExtraLineEnd = new TDEAction( i18n("Line End"), "line_end", 0, - this, TQT_SLOT( extraLineEnd() ), + this, TQ_SLOT( extraLineEnd() ), actionCollection(), "extra_lineend" ); actionExtraPenStyle = new KoLineStyleAction( i18n("Outline Style"), "pen_style", - this, TQT_SLOT( extraPenStyle(int) ), + this, TQ_SLOT( extraPenStyle(int) ), actionCollection(), "extra_penstyle" ); actionExtraPenStyle->setShowCurrentSelection(false); actionExtraPenWidth = new KoLineWidthAction( i18n("Outline Width"), "pen_width", - this, TQT_SLOT( extraPenWidth(double) ), + this, TQ_SLOT( extraPenWidth(double) ), actionCollection(), "extra_penwidth" ); actionExtraPenWidth->setUnit( kPresenterDoc()->unit() ); actionExtraPenWidth->setShowCurrentSelection(false); - connect( kPresenterDoc(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - actionExtraPenWidth, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( kPresenterDoc(), TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), + actionExtraPenWidth, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); actionExtraGroup = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), - this, TQT_SLOT( extraGroup() ), + this, TQ_SLOT( extraGroup() ), actionCollection(), "extra_group" ); actionExtraUnGroup = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), - this, TQT_SLOT( extraUnGroup() ), + this, TQ_SLOT( extraUnGroup() ), actionCollection(), "extra_ungroup" ); // ----------------- slideshow actions actionScreenConfigPages = new TDEAction( i18n( "&Configure Slide Show..." ), "configure", 0, - this, TQT_SLOT( screenConfigPages() ), + this, TQ_SLOT( screenConfigPages() ), actionCollection(), "screen_configpages" ); actionScreenAssignEffect = new TDEAction( i18n( "Edit &Object Effect..." ), "effect", 0, - this, TQT_SLOT( screenAssignEffect() ), + this, TQ_SLOT( screenAssignEffect() ), actionCollection(), "screen_assigneffect"); actionScreenTransEffect = new TDEAction( i18n( "Edit Slide &Transition..." ), "slide_effect", 0, - this, TQT_SLOT( screenTransEffect() ), + this, TQ_SLOT( screenTransEffect() ), actionCollection(), "screen_transeffect"); actionScreenStart = new TDEAction( i18n( "&Start" ), "2rightarrow", TQt::Key_F12, - this, TQT_SLOT( screenStart() ), + this, TQ_SLOT( screenStart() ), actionCollection(), "screen_start" ); actionScreenStartFromFirst = new TDEAction( i18n( "Start From &First Slide" ), "1rightarrow", 0, - this, TQT_SLOT( screenStartFromFirst() ), + this, TQ_SLOT( screenStartFromFirst() ), actionCollection(), "screen_startfromfirst" ); actionScreenFirst = new TDEAction( i18n( "&Go to Start" ), "go-first", 0, - this, TQT_SLOT( screenFirst() ), + this, TQ_SLOT( screenFirst() ), actionCollection(), "screen_first" ); actionScreenPrev = new TDEAction( i18n( "&Previous Slide" ), "back", TQt::Key_Prior, - this, TQT_SLOT( screenPrev() ), + this, TQ_SLOT( screenPrev() ), actionCollection(), "screen_prev" ); actionScreenNext = new TDEAction( i18n( "&Next Slide" ), "forward", TQt::Key_Next, - this, TQT_SLOT( screenNext() ), + this, TQ_SLOT( screenNext() ), actionCollection(), "screen_next" ); actionScreenLast = new TDEAction( i18n( "Go to &End" ), "go-last", 0, - this, TQT_SLOT( screenLast() ), + this, TQ_SLOT( screenLast() ), actionCollection(), "screen_last" ); actionScreenSkip = new TDEAction( i18n( "Goto &Slide..." ), "goto", 0, - this, TQT_SLOT( screenSkip() ), + this, TQ_SLOT( screenSkip() ), actionCollection(), "screen_skip" ); // ----------------- colorbar(Brush and Pen) action actionBrushColor = new TTDESelectColorAction( i18n( "Fill Color..." ), TTDESelectColorAction::FillColor, actionCollection(), "brush_color" ,true); - connect( actionBrushColor, TQT_SIGNAL( activated() ), TQT_SLOT( brushChosen() ) ); + connect( actionBrushColor, TQ_SIGNAL( activated() ), TQ_SLOT( brushChosen() ) ); actionBrushColor->setDefaultColor(TQColor()); actionPenColor = new TTDESelectColorAction( i18n( "Outline Color..." ), TTDESelectColorAction::LineColor, actionCollection(), "pen_color" ); - connect( actionPenColor, TQT_SIGNAL( activated() ), TQT_SLOT( penChosen() ) ); + connect( actionPenColor, TQ_SIGNAL( activated() ), TQ_SLOT( penChosen() ) ); actionPenColor->setDefaultColor(TQColor()); - actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, this, TQT_SLOT( textContentsToHeight() ), + actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, this, TQ_SLOT( textContentsToHeight() ), actionCollection(), "extendobjectheight" ); - actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, this, TQT_SLOT( textObjectToContents() ), + actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, this, TQ_SLOT( textObjectToContents() ), actionCollection(), "resizetextobject" ); actionRenamePage=new TDEAction(i18n( "&Rename Slide..." ),0,this, - TQT_SLOT( renamePageTitle() ), + TQ_SLOT( renamePageTitle() ), actionCollection(), "rename_page" ); actionPicOriginalSize = new TDEAction( i18n( "Sca&le to Original Size" ), 0, this, - TQT_SLOT( picViewOriginalSize() ), + TQ_SLOT( picViewOriginalSize() ), actionCollection(), "pic_original_size" ); actionPic640x480=new TDEAction(i18n( "640x480" ),0,this, - TQT_SLOT( picViewOrig640x480() ), + TQ_SLOT( picViewOrig640x480() ), actionCollection(), "pic_640_480" ); actionPic800x600=new TDEAction(i18n( "800x600" ),0,this, - TQT_SLOT( picViewOrig800x600() ), + TQ_SLOT( picViewOrig800x600() ), actionCollection(), "pic_800_600" ); actionPic1024x768=new TDEAction(i18n( "1024x768" ),0,this, - TQT_SLOT( picViewOrig1024x768() ), + TQ_SLOT( picViewOrig1024x768() ), actionCollection(), "pic_1024_768" ); actionPic1280x1024=new TDEAction(i18n( "1280x1024" ),0,this, - TQT_SLOT( picViewOrig1280x1024() ), + TQ_SLOT( picViewOrig1280x1024() ), actionCollection(), "pic_1280_1024" ); actionPic1600x1200=new TDEAction(i18n( "1600x1200" ),0,this, - TQT_SLOT( picViewOrig1600x1200() ), + TQ_SLOT( picViewOrig1600x1200() ), actionCollection(), "pic_1600_1200" ); actionChangePic=new TDEAction( i18n( "&Change Picture..." ),"frame_image",0,this, - TQT_SLOT( chPic() ), actionCollection(), "change_picture" ); + TQ_SLOT( chPic() ), actionCollection(), "change_picture" ); actionImageEffect = new TDEAction( i18n("Image &Effect..."), 0, this, - TQT_SLOT(imageEffect()), actionCollection(), "image_effect"); + TQ_SLOT(imageEffect()), actionCollection(), "image_effect"); actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - this, TQT_SLOT( textSuperScript() ), + this, TQ_SLOT( textSuperScript() ), actionCollection(), "format_super" ); actionFormatSuper->setExclusiveGroup( "valign" ); actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - this, TQT_SLOT( textSubScript() ), + this, TQ_SLOT( textSubScript() ), actionCollection(), "format_sub" ); actionFormatSub->setExclusiveGroup( "valign" ); actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", ALT + TQt::SHIFT + TQt::Key_C, - this, TQT_SLOT( insertSpecialChar() ), + this, TQ_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); actionInsertLink = new TDEAction( i18n( "Link..." ), 0, - this, TQT_SLOT( insertLink() ), + this, TQ_SLOT( insertLink() ), actionCollection(), "insert_link" ); #if 0 //code from page.cpp //not implemented picResizeMenu->insertSeparator(); - picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), this, TQT_SLOT( picViewOrigFactor() ) ); + picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), this, TQ_SLOT( picViewOrigFactor() ) ); #endif (void) new TDEAction( i18n( "Configure &Autocorrection..." ), 0, - this, TQT_SLOT( extraAutoFormat() ), + this, TQ_SLOT( extraAutoFormat() ), actionCollection(), "extra_autocorrection" ); - actionExtraSpellCheck = KStdAction::spelling( this, TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + actionExtraSpellCheck = KStdAction::spelling( this, TQ_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), ALT + CTRL + TQt::Key_P, - this, TQT_SLOT( formatParagraph() ), + this, TQ_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, - this, TQT_SLOT( textDefaultFormat() ), + this, TQ_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, - this, TQT_SLOT( openLink() ), + this, TQ_SLOT( openLink() ), actionCollection(), "open_link" ); actionChangeLink=new TDEAction( i18n("Change Link..."), 0, - this, TQT_SLOT(changeLink()), + this, TQ_SLOT(changeLink()), actionCollection(), "change_link"); actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, - this, TQT_SLOT( copyLink() ), + this, TQ_SLOT( copyLink() ), actionCollection(), "copy_link" ); actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, - this, TQT_SLOT( removeLink() ), + this, TQ_SLOT( removeLink() ), actionCollection(), "remove_link" ); actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, - this, TQT_SLOT( addToBookmark() ), + this, TQ_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); actionEditCustomVarsEdit = new TDEAction( i18n( "&Custom Variables..." ), 0, - this, TQT_SLOT( editCustomVars() ), + this, TQ_SLOT( editCustomVars() ), actionCollection(), "edit_vars" ); actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, - this, TQT_SLOT( editCustomVariable() ), + this, TQ_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); @@ -2960,31 +2960,31 @@ void KPrView::setupActions() actionInsertVariable->popupMenu()->insertSeparator(); actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, - this, TQT_SLOT( refreshAllVariable() ), + this, TQ_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); actionInsertVariable->insert(actionRefreshAllVariable); actionIncreaseFontSize = new TDEAction( i18n("Increase Font Size"),"fontsizeup", 0, - this, TQT_SLOT( increaseFontSize() ), + this, TQ_SLOT( increaseFontSize() ), actionCollection(), "increaseFontSize" ); actionDecreaseFontSize = new TDEAction( i18n("Decrease Font Size"),"fontsizedown", 0, - this, TQT_SLOT( decreaseFontSize() ), + this, TQ_SLOT( decreaseFontSize() ), actionCollection(), "decreaseFontSize" ); actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, - this, TQT_SLOT( changeCaseOfText() ), + this, TQ_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); - connect( actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( viewZoom( const TQString & ) ) ); + connect( actionViewZoom, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( viewZoom( const TQString & ) ) ); actionViewZoom->setEditable(true); changeZoomMenu( ); actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), ALT + CTRL + TQt::Key_S, - this, TQT_SLOT( extraStylist() ), + this, TQ_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, @@ -2993,167 +2993,167 @@ void KPrView::setupActions() actionFormatStyle = new TDESelectAction( i18n( "St&yle" ), 0, actionCollection(), "format_style" ); - connect( actionFormatStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( textStyleSelected( int ) ) ); + connect( actionFormatStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( textStyleSelected( int ) ) ); actionFormatStyle->setMenuAccelsEnabled( true ); updateStyleList(); actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, - this, TQT_SLOT( slotAllowAutoFormat() ), + this, TQ_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); // ------------------- Actions with a key binding and no GUI item new TDEAction( i18n( "Insert Non-Breaking Space" ), CTRL+TQt::Key_Space, - this, TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + this, TQ_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+TQt::SHIFT+TQt::Key_Minus, - this, TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + this, TQ_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); new TDEAction( i18n( "Insert Soft Hyphen" ), CTRL+TQt::Key_Minus, - this, TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + this, TQ_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, - this, TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + this, TQ_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), - this, TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + this, TQ_SLOT( slotCompletion() ), actionCollection(), "completion" ); new TDEAction( i18n( "Increase Numbering Level" ), ALT+TQt::Key_Right, - this, TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + this, TQ_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); new TDEAction( i18n( "Decrease Numbering Level" ), ALT+TQt::Key_Left, - this, TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + this, TQ_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, - this, TQT_SLOT( insertComment() ), + this, TQ_SLOT( insertComment() ), actionCollection(), "insert_comment" ); actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, - this, TQT_SLOT(editComment()), + this, TQ_SLOT(editComment()), actionCollection(), "edit_comment"); actionAddGuideLine = new TDEAction( i18n( "Add Guide Line..."), 0, - this, TQT_SLOT( addGuideLine()), + this, TQ_SLOT( addGuideLine()), actionCollection(), "add_guideline"); actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, - this, TQT_SLOT(removeComment()), + this, TQ_SLOT(removeComment()), actionCollection(), "remove_comment"); actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, - this, TQT_SLOT(copyTextOfComment()), + this, TQ_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); actionConfigureCompletion = new TDEAction( i18n( "&Configure Completion..." ), 0, - this, TQT_SLOT( configureCompletion() ), + this, TQ_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); actionZoomMinus = new TDEAction( i18n( "Zoom Out" ), "zoom-out",0, - this, TQT_SLOT( zoomMinus() ), + this, TQ_SLOT( zoomMinus() ), actionCollection(), "zoom_minus" ); actionZoomPlus = new TDEAction( i18n( "Zoom In" ), "zoom-in",0, - this, TQT_SLOT( zoomPlus() ), + this, TQ_SLOT( zoomPlus() ), actionCollection(), "zoom_plus" ); actionZoomEntirePage = new TDEAction( i18n( "Zoom Entire Slide" ), 0, - this, TQT_SLOT( zoomEntirePage() ), + this, TQ_SLOT( zoomEntirePage() ), actionCollection(), "zoom_entire_page" ); actionZoomMinus = new TDEAction( i18n( "Zoom Slide Width" ), 0, - this, TQT_SLOT( zoomPageWidth() ), + this, TQ_SLOT( zoomPageWidth() ), actionCollection(), "zoom_page_width" ); actionZoomSelectedObject= new TDEAction( i18n( "Zoom Selected Objects" ), "zoom-fit-best",0, - this, TQT_SLOT( zoomSelectedObject() ), + this, TQ_SLOT( zoomSelectedObject() ), actionCollection(), "zoom_selected_object" ); actionZoomPageHeight= new TDEAction( i18n( "Zoom Slide Height" ), 0, - this, TQT_SLOT( zoomPageHeight() ), + this, TQ_SLOT( zoomPageHeight() ), actionCollection(), "zoom_page_height" ); actionZoomAllObject= new TDEAction( i18n( "Zoom All Objects" ), 0, - this, TQT_SLOT( zoomAllObject() ), + this, TQ_SLOT( zoomAllObject() ), actionCollection(), "zoom_all_object" ); actionFlipHorizontal= new TDEAction( i18n( "Horizontal Flip" ), 0, - this, TQT_SLOT( flipHorizontal() ), + this, TQ_SLOT( flipHorizontal() ), actionCollection(), "horizontal_flip" ); actionFlipVertical= new TDEAction( i18n( "Vertical Flip" ), 0, - this, TQT_SLOT( flipVertical() ), + this, TQ_SLOT( flipVertical() ), actionCollection(), "vertical_flip" ); actionDuplicateObj = new TDEAction( i18n( "Duplicate Object..." ), 0, - this, TQT_SLOT( duplicateObj() ), + this, TQ_SLOT( duplicateObj() ), actionCollection(), "duplicate_obj" ); actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, - this, TQT_SLOT( applyAutoFormat() ), + this, TQ_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, - this, TQT_SLOT( createStyleFromSelection()), + this, TQ_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); actionCloseObject = new TDEAction( i18n( "Close Object" ), 0, - this, TQT_SLOT( closeObject()), + this, TQ_SLOT( closeObject()), actionCollection(), "close_object" ); actionAlignVerticalTop = new TDEToggleAction( i18n( "Align Top" ), 0, - this, TQT_SLOT( alignVerticalTop() ), + this, TQ_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalTop->setChecked( true ); actionAlignVerticalBottom = new TDEToggleAction( i18n( "Align Bottom" ), 0, - this, TQT_SLOT( alignVerticalBottom() ), + this, TQ_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalCenter = new TDEToggleAction( i18n( "Align Middle" ), 0, - this, TQT_SLOT( alignVerticalCenter() ), + this, TQ_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); actionSavePicture= new TDEAction( i18n("Save Picture..."), 0, - this, TQT_SLOT( savePicture() ), + this, TQ_SLOT( savePicture() ), actionCollection(), "save_picture"); actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, - this, TQT_SLOT( autoSpellCheck() ), + this, TQ_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); actionInsertFile= new TDEAction( i18n( "File..." ), 0, - this, TQT_SLOT( insertFile() ), + this, TQ_SLOT( insertFile() ), actionCollection(), "insert_file" ); actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, - this, TQT_SLOT( importStyle() ), + this, TQ_SLOT( importStyle() ), actionCollection(), "import_style" ); actionSaveBackgroundPicture= new TDEAction( i18n( "Save Background Picture..." ), 0, - this, TQT_SLOT(backgroundPicture() ), + this, TQ_SLOT(backgroundPicture() ), actionCollection(), "save_bgpicture" ); #if 0 actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, - this, TQT_SLOT( insertDirectCursor() ), + this, TQ_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, - this, TQT_SLOT( slotAddIgnoreAllWord() ), + this, TQ_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, - this, TQT_SLOT( addWordToDictionary() ), + this, TQ_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); actionCustomSlideShow = new TDEAction( i18n( "Custom Slide Show..." ), 0, - this, TQT_SLOT( customSlideShow() ), + this, TQ_SLOT( customSlideShow() ), actionCollection(), "custom_slide_show" ); actionDisplayObjectFromMasterPage = new TDEToggleAction( i18n( "Hide Object From Slide Master" ), 0, - this, TQT_SLOT( displayObjectFromMasterPage() ), + this, TQ_SLOT( displayObjectFromMasterPage() ), actionCollection(), "display_object_from_master_page" ); actionDisplayObjectFromMasterPage->setCheckedState(i18n("Display Object From Slide Master")); actionDisplayBackgroundPage = new TDEToggleAction( i18n( "Hide Background" ), 0, - this, TQT_SLOT( displayBackground() ), + this, TQ_SLOT( displayBackground() ), actionCollection(), "display_background" ); actionDisplayBackgroundPage->setCheckedState(i18n("Display Background")); } @@ -3658,55 +3658,55 @@ void KPrView::setupPopupMenus() // create right button line begin rb_lbegin = new TQPopupMenu(); TQ_CHECK_PTR( rb_lbegin ); - rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), this, TQT_SLOT( extraLineBeginNormal() ) ); + rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), this, TQ_SLOT( extraLineBeginNormal() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), this, TQT_SLOT( extraLineBeginArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), this, TQ_SLOT( extraLineBeginArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), this, TQT_SLOT( extraLineBeginRect() ) ); + rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), this, TQ_SLOT( extraLineBeginRect() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), this, TQT_SLOT( extraLineBeginCircle() ) ); + rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), this, TQ_SLOT( extraLineBeginCircle() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), this, TQT_SLOT( extraLineBeginLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), this, TQ_SLOT( extraLineBeginLineArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), this, TQT_SLOT( extraLineBeginDimensionLine() ) ); + rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), this, TQ_SLOT( extraLineBeginDimensionLine() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), this, TQT_SLOT( extraLineBeginDoubleArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), this, TQ_SLOT( extraLineBeginDoubleArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), this, TQT_SLOT( extraLineBeginDoubleLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), this, TQ_SLOT( extraLineBeginDoubleLineArrow() ) ); rb_lbegin->setMouseTracking( true ); rb_lbegin->setCheckable( false ); // create right button line end rb_lend = new TQPopupMenu(); TQ_CHECK_PTR( rb_lend ); - rb_lend->insertItem( KPBarIcon("line_normal_end" ), this, TQT_SLOT( extraLineEndNormal() ) ); + rb_lend->insertItem( KPBarIcon("line_normal_end" ), this, TQ_SLOT( extraLineEndNormal() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_arrow_end" ), this, TQT_SLOT( extraLineEndArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_arrow_end" ), this, TQ_SLOT( extraLineEndArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_rect_end" ), this, TQT_SLOT( extraLineEndRect() ) ); + rb_lend->insertItem( KPBarIcon("line_rect_end" ), this, TQ_SLOT( extraLineEndRect() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_circle_end" ), this, TQT_SLOT( extraLineEndCircle() ) ); + rb_lend->insertItem( KPBarIcon("line_circle_end" ), this, TQ_SLOT( extraLineEndCircle() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), this, TQT_SLOT( extraLineEndLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), this, TQ_SLOT( extraLineEndLineArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), this, TQT_SLOT( extraLineEndDimensionLine() ) ); + rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), this, TQ_SLOT( extraLineEndDimensionLine() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), this, TQT_SLOT( extraLineEndDoubleArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), this, TQ_SLOT( extraLineEndDoubleArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), this, TQT_SLOT( extraLineEndDoubleLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), this, TQ_SLOT( extraLineEndDoubleLineArrow() ) ); rb_lend->setMouseTracking( true ); rb_lend->setCheckable( false ); // create arrange-objects popup m_arrangeObjectsPopup = new TQPopupMenu(); TQ_CHECK_PTR(m_arrangeObjectsPopup); - m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), this, TQT_SLOT(extraLower())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), this, TQ_SLOT(extraLower())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), this, TQT_SLOT(extraSendBackward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), this, TQ_SLOT(extraSendBackward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), this, TQT_SLOT(extraBringForward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), this, TQ_SLOT(extraBringForward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), this, TQT_SLOT(extraRaise())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), this, TQ_SLOT(extraRaise())); m_arrangeObjectsPopup->setMouseTracking(true); m_arrangeObjectsPopup->setCheckable(false); @@ -3748,8 +3748,8 @@ void KPrView::setupScrollbars() horz = new TQScrollBar( TQt::Horizontal, pageBase ); vert->show(); horz->show(); - TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( scrollV( int ) ) ); - TQObject::connect( horz, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( scrollH( int ) ) ); + TQObject::connect( vert, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( scrollV( int ) ) ); + TQObject::connect( horz, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( scrollH( int ) ) ); vert->setValue(vert->maxValue()); horz->setValue(horz->maxValue()); vert->setValue(vert->minValue()); @@ -3758,12 +3758,12 @@ void KPrView::setupScrollbars() pgNext->setPixmap( TQPixmap( pagedown_xpm ) ); pgNext->setAutoRepeat( TRUE ); TQToolTip::add( pgNext, i18n( "Next slide" ) ); - connect( pgNext, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) ); + connect( pgNext, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); pgPrev = new TQToolButton( pageBase ); pgPrev->setPixmap( TQPixmap( pageup_xpm ) ); pgPrev->setAutoRepeat( TRUE ); TQToolTip::add( pgPrev, i18n( "Previous slide" ) ); - connect( pgPrev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); + connect( pgPrev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); } void KPrView::setupRulers() @@ -3786,26 +3786,26 @@ void KPrView::setupRulers() h_ruler->setGeometry( hSpace, 0, m_canvas->width(), vSpace ); v_ruler->setGeometry( 0, vSpace, hSpace, m_canvas->height() ); - TQObject::connect( h_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); - TQObject::connect( h_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); + TQObject::connect( h_ruler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), + this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); + TQObject::connect( h_ruler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), + this, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); - connect( h_ruler, TQT_SIGNAL( doubleClicked() ), this, - TQT_SLOT( slotHRulerDoubleClicked() ) ); - connect( h_ruler, TQT_SIGNAL( doubleClicked(double) ), this, - TQT_SLOT( slotHRulerDoubleClicked(double) ) ); + connect( h_ruler, TQ_SIGNAL( doubleClicked() ), this, + TQ_SLOT( slotHRulerDoubleClicked() ) ); + connect( h_ruler, TQ_SIGNAL( doubleClicked(double) ), this, + TQ_SLOT( slotHRulerDoubleClicked(double) ) ); - TQObject::connect( v_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); - TQObject::connect( v_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); - TQObject::connect( v_ruler, TQT_SIGNAL( doubleClicked() ), - this, TQT_SLOT( openPageLayoutDia() ) ); + TQObject::connect( v_ruler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), + this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); + TQObject::connect( v_ruler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), + this, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); + TQObject::connect( v_ruler, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( openPageLayoutDia() ) ); - connect( h_ruler, TQT_SIGNAL( newLeftIndent( double ) ), this, TQT_SLOT( newLeftIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newFirstIndent( double ) ), this, TQT_SLOT( newFirstIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newRightIndent( double ) ), this, TQT_SLOT( newRightIndent( double ) ) ); + connect( h_ruler, TQ_SIGNAL( newLeftIndent( double ) ), this, TQ_SLOT( newLeftIndent( double ) ) ); + connect( h_ruler, TQ_SIGNAL( newFirstIndent( double ) ), this, TQ_SLOT( newFirstIndent( double ) ) ); + connect( h_ruler, TQ_SIGNAL( newRightIndent( double ) ), this, TQ_SLOT( newRightIndent( double ) ) ); } void KPrView::unitChanged( KoUnit::Unit u ) @@ -4357,10 +4357,10 @@ void KPrView::insertSpecialChar() if (m_specialCharDlg==0) { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); - connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - connect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + connect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + connect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -4369,10 +4369,10 @@ void KPrView::slotSpecialCharDlgClosed() { if ( m_specialCharDlg) { - disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + disconnect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + disconnect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } @@ -4593,16 +4593,16 @@ void KPrView::startKSpell() delete m_spell.dlg; m_spell.dlg = new KSpell2::Dialog( m_spell.kospell, this ); m_spell.dlg->activeAutoCorrect( true ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), - this, TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), - this, TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), - this, TQT_SLOT(spellCheckerDone(const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), - this, TQT_SLOT( spellCheckerCancel() ) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), - this, TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(misspelling(const TQString&, int)), + this, TQ_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(replace(const TQString&, int, const TQString&)), + this, TQ_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(done(const TQString&) ), + this, TQ_SLOT(spellCheckerDone(const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(cancel() ), + this, TQ_SLOT( spellCheckerCancel() ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), + this, TQ_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); m_spell.dlg->show(); } @@ -4759,7 +4759,7 @@ void KPrView::showParagraphDialog(int initialPage, double initialTabPos) if ( initialPage == KoParagDia::PD_TABS ) m_paragDlg->tabulatorsWidget()->setCurrentTab( initialTabPos ); } - connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), this, TQT_SLOT( slotApplyParag() ) ); + connect( m_paragDlg, TQ_SIGNAL( applyParagStyle() ), this, TQ_SLOT( slotApplyParag() ) ); m_paragDlg->exec(); delete m_paragDlg; @@ -4837,7 +4837,7 @@ void KPrView::addVariableActions( int type, const TQStringList & texts, VariableDef v; v.type = type; v.subtype = i; - TDEAction * act = new TDEAction( (*it), 0, this, TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, this, TQ_SLOT( insertVariable() ), actionCollection(), "var-action" ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); @@ -4883,7 +4883,7 @@ void KPrView::refreshCustomMenu() lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); act = new TDEAction( varName, shortCuts[varName], this, - TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); + TQ_SLOT( insertCustomVariable() ), actionCollection(), name ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -4895,7 +4895,7 @@ void KPrView::refreshCustomMenu() if(state) actionInsertCustom->popupMenu()->insertSeparator(); - act = new TDEAction( i18n("New..."), 0, this, TQT_SLOT( insertNewCustomVariable() ), actionCollection(), + act = new TDEAction( i18n("New..."), 0, this, TQ_SLOT( insertNewCustomVariable() ), actionCollection(), TQString("custom-action_%1").arg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -5394,7 +5394,7 @@ void KPrView::openThePresentationDurationDialog() presDurationDia = new KPrPresDurationDia( this, "presDurationDia", kPresenterDoc(), presentationDurationStringList, presentationTotalDurationString ); presDurationDia->setCaption( i18n( "Presentation Duration" ) ); - TQObject::connect( presDurationDia, TQT_SIGNAL( presDurationDiaClosed() ), this, TQT_SLOT( pddClosed() ) ); + TQObject::connect( presDurationDia, TQ_SIGNAL( presDurationDiaClosed() ), this, TQ_SLOT( pddClosed() ) ); presDurationDia->exec(); delete presDurationDia; @@ -5488,7 +5488,7 @@ void KPrView::updateStyleList() { TQString name = "paragstyle_" + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), - shortCuts[name], this, TQT_SLOT( slotStyleSelected() ), + shortCuts[name], this, TQ_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); act->setExclusiveGroup( "styleListAction" ); @@ -6377,7 +6377,7 @@ TQPtrList<TDEAction> KPrView::listOfResultOfCheckWord( const TQString &word ) if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { TDEAction * act = new TDEAction( (*it)); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotCorrectWord()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotCorrectWord()) ); listAction.append( act ); } } diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 5d8998474..5578b6b2d 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -626,9 +626,9 @@ KPrWebPresentationWizard::KPrWebPresentationWizard( const TQString &_config, KPr setupPage4(); setupPage5(); - connect( nextButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( pageChanged() ) ); - connect( backButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( pageChanged() ) ); - connect( finishButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( finish() ) ); + connect( nextButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( pageChanged() ) ); + connect( backButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( pageChanged() ) ); + connect( finishButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( finish() ) ); } KPrWebPresentationWizard::~KPrWebPresentationWizard() @@ -734,10 +734,10 @@ void KPrWebPresentationWizard::setupPage1() TQSizePolicy::Minimum, TQSizePolicy::Expanding ); layout->addMultiCell( spacer, 6, 6, 0, 1 ); - connect(path, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChoosePath(const TQString&))); - connect(path, TQT_SIGNAL(urlSelected( const TQString& )), - this,TQT_SLOT(slotChoosePath(const TQString&))); + connect(path, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChoosePath(const TQString&))); + connect(path, TQ_SIGNAL(urlSelected( const TQString& )), + this,TQ_SLOT(slotChoosePath(const TQString&))); addPage( page1, i18n( "Step 1: General Information" ) ); @@ -928,15 +928,15 @@ void KPrWebPresentationWizard::setupPage4() slideTitle = new KLineEdit( canvas ); layout->addWidget( slideTitle, 1, 1 ); - connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this, - TQT_SLOT( slideTitleChanged( const TQString & ) ) ); + connect( slideTitle, TQ_SIGNAL( textChanged( const TQString & ) ), this, + TQ_SLOT( slideTitleChanged( const TQString & ) ) ); slideTitles = new TDEListView( canvas ); layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); slideTitles->addColumn( i18n( "No." ) ); slideTitles->addColumn( i18n( "Slide Title" ) ); - connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( slideTitleChanged( TQListViewItem * ) ) ); + connect( slideTitles, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( slideTitleChanged( TQListViewItem * ) ) ); slideTitles->setSorting( -1 ); slideTitles->setAllColumnsShowFocus( true ); slideTitles->setResizeMode( TQListView::LastColumn ); @@ -1269,8 +1269,8 @@ void KPrWebPresentationCreateDialog::setupGUI() bSave->setEnabled( false ); bDone->setEnabled( false ); - connect( bDone, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( bSave, TQT_SIGNAL( clicked() ), this, TQT_SLOT( saveConfig() ) ); + connect( bDone, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( bSave, TQ_SIGNAL( clicked() ), this, TQ_SLOT( saveConfig() ) ); } void KPrWebPresentationCreateDialog::resizeEvent( TQResizeEvent *e ) diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index 546ae35a9..a9483b7eb 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -42,8 +42,8 @@ AFChoose::AFChoose(TQWidget *parent, const TQString &caption, const char *name) groupList.setAutoDelete(true); getGroups(); setupTabs(); - connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(chosen())); - connect(this,TQT_SIGNAL(cancelButtonPressed()),this,TQT_SLOT(cancelClicked())); + connect(this,TQ_SIGNAL(applyButtonPressed()),this,TQ_SLOT(chosen())); + connect(this,TQ_SIGNAL(cancelButtonPressed()),this,TQ_SLOT(cancelClicked())); } AFChoose::~AFChoose() @@ -139,12 +139,12 @@ void AFChoose::setupTabs() grpPtr->loadWid->setBackgroundColor(colorGroup().base()); grpPtr->loadWid->setResizeMode(TQIconView::Adjust); grpPtr->loadWid->sort(); - connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)), - this,TQT_SLOT(nameChanged(TQString))); - connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), this, - TQT_SLOT(tabChanged(TQWidget*))); - connect(grpPtr->loadWid,TQT_SIGNAL( doubleClicked ( TQIconViewItem *)),this, - TQT_SLOT(slotDoubleClick())); + connect(grpPtr->loadWid,TQ_SIGNAL(nameChanged(TQString)), + this,TQ_SLOT(nameChanged(TQString))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), this, + TQ_SLOT(tabChanged(TQWidget*))); + connect(grpPtr->loadWid,TQ_SIGNAL( doubleClicked ( TQIconViewItem *)),this, + TQ_SLOT(slotDoubleClick())); grpPtr->label = new TQLabel(grpPtr->tab); grpPtr->label->setText(" "); grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height()); diff --git a/kspread/dialogs/kspread_dlg_angle.cpp b/kspread/dialogs/kspread_dlg_angle.cpp index 763e47a59..defb59bfd 100644 --- a/kspread/dialogs/kspread_dlg_angle.cpp +++ b/kspread/dialogs/kspread_dlg_angle.cpp @@ -60,7 +60,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker) m_pAngle->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); Cell *cell = m_pView->activeSheet()->cellAt( marker.x(), marker.y() ); int angle=-(cell->format()->getAngle(marker.x(), marker.y())); diff --git a/kspread/dialogs/kspread_dlg_area.cpp b/kspread/dialogs/kspread_dlg_area.cpp index 108511ad0..b160cb528 100644 --- a/kspread/dialogs/kspread_dlg_area.cpp +++ b/kspread/dialogs/kspread_dlg_area.cpp @@ -55,8 +55,8 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke lay1->addWidget( m_areaName ); m_areaName->setFocus(); - connect ( m_areaName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotAreaNamechanged( const TQString &))); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect ( m_areaName, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotAreaNamechanged( const TQString &))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); enableButtonOK(!m_areaName->text().isEmpty()); } diff --git a/kspread/dialogs/kspread_dlg_comment.cpp b/kspread/dialogs/kspread_dlg_comment.cpp index 2494959c2..7c9bdb1c5 100644 --- a/kspread/dialogs/kspread_dlg_comment.cpp +++ b/kspread/dialogs/kspread_dlg_comment.cpp @@ -57,8 +57,8 @@ CommentDialog::CommentDialog( View* parent, const char* name,const TQPoint &_mar if(!cell->format()->comment(marker.x(),marker.y()).isEmpty()) multiLine->setText(cell->format()->comment(marker.x(),marker.y())); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect(multiLine, TQT_SIGNAL(textChanged ()),this, TQT_SLOT(slotTextChanged())); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect(multiLine, TQ_SIGNAL(textChanged ()),this, TQ_SLOT(slotTextChanged())); slotTextChanged(); diff --git a/kspread/dialogs/kspread_dlg_conditional.cpp b/kspread/dialogs/kspread_dlg_conditional.cpp index 42e60b6a6..cc35e45fd 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cpp +++ b/kspread/dialogs/kspread_dlg_conditional.cpp @@ -189,9 +189,9 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags textLabel2_2->setText( i18n( "Cell style" ) ); textLabel2_3->setText( i18n( "Cell style" ) ); - connect( m_condition_1, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged1( const TQString & ) ) ); - connect( m_condition_2, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged2( const TQString & ) ) ); - connect( m_condition_3, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged3( const TQString & ) ) ); + connect( m_condition_1, TQ_SIGNAL( highlighted( const TQString & ) ), this, TQ_SLOT( slotTextChanged1( const TQString & ) ) ); + connect( m_condition_2, TQ_SIGNAL( highlighted( const TQString & ) ), this, TQ_SLOT( slotTextChanged2( const TQString & ) ) ); + connect( m_condition_3, TQ_SIGNAL( highlighted( const TQString & ) ), this, TQ_SLOT( slotTextChanged3( const TQString & ) ) ); } ConditionalWidget::~ConditionalWidget() diff --git a/kspread/dialogs/kspread_dlg_cons.cpp b/kspread/dialogs/kspread_dlg_cons.cpp index 139113c79..0852deb9f 100644 --- a/kspread/dialogs/kspread_dlg_cons.cpp +++ b/kspread/dialogs/kspread_dlg_cons.cpp @@ -111,12 +111,12 @@ ConsolidateDialog::ConsolidateDialog( View* parent, const char* name ) grid1->addWidget(m_pRemove,3,1); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pRef, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotReturnPressed() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pRef, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotReturnPressed() ) ); - connect(m_pView->selectionInfo(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect(m_pView->selectionInfo(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); } ConsolidateDialog::~ConsolidateDialog() diff --git a/kspread/dialogs/kspread_dlg_csv.cpp b/kspread/dialogs/kspread_dlg_csv.cpp index c40074b90..a93db2281 100644 --- a/kspread/dialogs/kspread_dlg_csv.cpp +++ b/kspread/dialogs/kspread_dlg_csv.cpp @@ -253,22 +253,22 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_sheet->setSelectionMode(TQTable::NoSelection); - connect(m_formatBox, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(formatClicked(int))); - connect(m_delimiterBox, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(delimiterClicked(int))); - connect(m_delimiterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(returnPressed())); - connect(m_delimiterEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(textChanged ( const TQString & ) )); - connect(m_comboLine, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(lineSelected(const TQString&))); - connect(m_comboQuote, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(textquoteSelected(const TQString&))); - connect(m_sheet, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(currentCellChanged(int, int))); - connect(m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(ignoreDuplicatesChanged(int))); + connect(m_formatBox, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(formatClicked(int))); + connect(m_delimiterBox, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(delimiterClicked(int))); + connect(m_delimiterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(returnPressed())); + connect(m_delimiterEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(textChanged ( const TQString & ) )); + connect(m_comboLine, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(lineSelected(const TQString&))); + connect(m_comboQuote, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(textquoteSelected(const TQString&))); + connect(m_sheet, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(currentCellChanged(int, int))); + connect(m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(ignoreDuplicatesChanged(int))); } CSVDialog::~CSVDialog() diff --git a/kspread/dialogs/kspread_dlg_database.cpp b/kspread/dialogs/kspread_dlg_database.cpp index 34e680cdb..a8c882493 100644 --- a/kspread/dialogs/kspread_dlg_database.cpp +++ b/kspread/dialogs/kspread_dlg_database.cpp @@ -413,16 +413,16 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * finishButton()->setEnabled(false); // signals and slots connections - connect( m_orBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( orBox_clicked() ) ); - connect( m_andBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( andBox_clicked() ) ); - connect( m_startingCell, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startingCell_clicked() ) ); - connect( m_startingRegion, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startingRegion_clicked() ) ); - connect( m_driver, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( databaseDriverChanged(int) ) ); - connect( m_host, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( databaseHostChanged(const TQString &) ) ); - connect( m_databaseName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( databaseNameChanged(const TQString &) ) ); - connect( m_sheetView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( popupSheetViewMenu(TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_sheetView, TQT_SIGNAL( clicked( TQListViewItem * ) ), this, TQT_SLOT( sheetViewClicked( TQListViewItem * ) ) ); + connect( m_orBox, TQ_SIGNAL( clicked() ), this, TQ_SLOT( orBox_clicked() ) ); + connect( m_andBox, TQ_SIGNAL( clicked() ), this, TQ_SLOT( andBox_clicked() ) ); + connect( m_startingCell, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startingCell_clicked() ) ); + connect( m_startingRegion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startingRegion_clicked() ) ); + connect( m_driver, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( databaseDriverChanged(int) ) ); + connect( m_host, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( databaseHostChanged(const TQString &) ) ); + connect( m_databaseName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( databaseNameChanged(const TQString &) ) ); + connect( m_sheetView, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( popupSheetViewMenu(TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_sheetView, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( sheetViewClicked( TQListViewItem * ) ) ); TQStringList str = TQSqlDatabase::drivers(); m_driver->insertItem(""); diff --git a/kspread/dialogs/kspread_dlg_find.cpp b/kspread/dialogs/kspread_dlg_find.cpp index aa1c7f71e..a63ff2760 100644 --- a/kspread/dialogs/kspread_dlg_find.cpp +++ b/kspread/dialogs/kspread_dlg_find.cpp @@ -34,7 +34,7 @@ FindOption::FindOption( TQWidget *parent) m_moreOptions = new TQPushButton( i18n( "More Options" ), parent ); layout->addWidget( m_moreOptions ); - connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) ); + connect( m_moreOptions, TQ_SIGNAL( clicked () ), this, TQ_SLOT( slotMoreOptions() ) ); m_findExtension = new TQWidget( parent ); layout->addWidget( m_findExtension ); @@ -119,7 +119,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin : KFindDialog(parent,name,options,findStrings,hasSelection ) { m_findOptions = new FindOption( findExtension() ); - connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); + connect( m_findOptions, TQ_SIGNAL( adjustSize() ), TQ_SLOT( slotAjustSize() ) ); setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } @@ -143,7 +143,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS : KReplaceDialog(parent,name,options,findStrings,replaceStrings,hasSelection ) { m_findOptions = new FindOption( findExtension() ); - connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); + connect( m_findOptions, TQ_SIGNAL( adjustSize() ), TQ_SLOT( slotAjustSize() ) ); setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } diff --git a/kspread/dialogs/kspread_dlg_format.cpp b/kspread/dialogs/kspread_dlg_format.cpp index 501d8bf36..3b304f1d4 100644 --- a/kspread/dialogs/kspread_dlg_format.cpp +++ b/kspread/dialogs/kspread_dlg_format.cpp @@ -88,8 +88,8 @@ FormatDialog::FormatDialog( View* view, const char* name ) slotActivated( 0 ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( m_combo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( m_combo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } FormatDialog::~FormatDialog() diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 23d9f057f..324df02d8 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -165,38 +165,38 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for refresh_result = true; - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotClose() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( typeFunction, TQT_SIGNAL( activated(const TQString &) ), - this, TQT_SLOT( slotActivated(const TQString &) ) ); - connect( functions, TQT_SIGNAL( highlighted(const TQString &) ), - this, TQT_SLOT( slotSelected(const TQString &) ) ); - connect( functions, TQT_SIGNAL( selected(const TQString &) ), - this, TQT_SLOT( slotSelected(const TQString &) ) ); - connect( functions, TQT_SIGNAL( doubleClicked(TQListBoxItem * ) ), - this ,TQT_SLOT( slotDoubleClicked(TQListBoxItem *) ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotClose() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( typeFunction, TQ_SIGNAL( activated(const TQString &) ), + this, TQ_SLOT( slotActivated(const TQString &) ) ); + connect( functions, TQ_SIGNAL( highlighted(const TQString &) ), + this, TQ_SLOT( slotSelected(const TQString &) ) ); + connect( functions, TQ_SIGNAL( selected(const TQString &) ), + this, TQ_SLOT( slotSelected(const TQString &) ) ); + connect( functions, TQ_SIGNAL( doubleClicked(TQListBoxItem * ) ), + this ,TQ_SLOT( slotDoubleClicked(TQListBoxItem *) ) ); slotActivated(i18n("All")); - connect( selectFunction, TQT_SIGNAL(clicked()), - this,TQT_SLOT(slotSelectButton())); + connect( selectFunction, TQ_SIGNAL(clicked()), + this,TQ_SLOT(slotSelectButton())); - connect( firstElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( secondElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( thirdElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( fourElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( fiveElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); + connect( firstElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( secondElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( thirdElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( fourElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( fiveElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); - connect( m_pView->choice(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect( m_pView->choice(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); - connect( m_browser, TQT_SIGNAL( linkClicked( const TQString& ) ), - this, TQT_SLOT( slotShowFunction( const TQString& ) ) ); + connect( m_browser, TQ_SIGNAL( linkClicked( const TQString& ) ), + this, TQ_SLOT( slotShowFunction( const TQString& ) ) ); // Save the name of the active sheet. m_sheetName = m_pView->activeSheet()->sheetName(); @@ -240,10 +240,10 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for if( functions->currentItem() == -1 ) selectFunction->setEnabled( false ); - connect( searchFunct, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotSearchText(const TQString &) ) ); - connect( searchFunct, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotPressReturn() ) ); + connect( searchFunct, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotSearchText(const TQString &) ) ); + connect( searchFunct, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotPressReturn() ) ); } FormulaDialog::~FormulaDialog() diff --git a/kspread/dialogs/kspread_dlg_goalseek.cpp b/kspread/dialogs/kspread_dlg_goalseek.cpp index 1a2e5d599..1a2dbb378 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cpp +++ b/kspread/dialogs/kspread_dlg_goalseek.cpp @@ -168,11 +168,11 @@ GoalSeekDialog::GoalSeekDialog( View * parent, TQPoint const & marker, tqApp->installEventFilter( this ); // signals and slots connections - connect( m_buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonOkClicked() ) ); - connect( m_buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonCancelClicked() ) ); + connect( m_buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonOkClicked() ) ); + connect( m_buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonCancelClicked() ) ); - connect( m_pView->choice(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect( m_pView->choice(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); // tab order setTabOrder( m_targetEdit, m_targetValueEdit ); diff --git a/kspread/dialogs/kspread_dlg_goto.cpp b/kspread/dialogs/kspread_dlg_goto.cpp index 2d9935ac2..4c74c9b93 100644 --- a/kspread/dialogs/kspread_dlg_goto.cpp +++ b/kspread/dialogs/kspread_dlg_goto.cpp @@ -55,9 +55,9 @@ GotoDialog::GotoDialog( View* parent, const char* name ) m_nameCell->setFocus(); enableButtonOK( false ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( m_nameCell, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(textChanged ( const TQString & ))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( m_nameCell, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(textChanged ( const TQString & ))); } void GotoDialog::textChanged ( const TQString &_text ) diff --git a/kspread/dialogs/kspread_dlg_insert.cpp b/kspread/dialogs/kspread_dlg_insert.cpp index 23f7f841b..8e4e3ae35 100644 --- a/kspread/dialogs/kspread_dlg_insert.cpp +++ b/kspread/dialogs/kspread_dlg_insert.cpp @@ -80,7 +80,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M rb1->setChecked(true); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); } void InsertDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_layout.cpp b/kspread/dialogs/kspread_dlg_layout.cpp index ff4719c62..4b317e425 100644 --- a/kspread/dialogs/kspread_dlg_layout.cpp +++ b/kspread/dialogs/kspread_dlg_layout.cpp @@ -191,8 +191,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - connect( m_parentBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotNewParent( const TQString & ) ) ); - connect( m_nameEdit, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotNameChanged() ) ); + connect( m_parentBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotNewParent( const TQString & ) ) ); + connect( m_nameEdit, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotNameChanged() ) ); groupBoxLayout->addWidget( m_parentBox, 1, 1 ); @@ -936,7 +936,7 @@ void CellFormatDialog::init() tab->adjustSize(); - connect( tab, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotApply() ) ); + connect( tab, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotApply() ) ); tab->exec(); } @@ -1293,24 +1293,24 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d customFormat->setChecked(true); } - connect(generic,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(fraction,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(money,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(date,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(scientific,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(number,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(percent,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(time,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(textFormat,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeState())); - connect(customFormat,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeState())); - - connect(listFormat,TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(makeformat())); - connect(precision,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChangeValue(int))); - connect(prefix,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(makeformat())); - connect(postfix,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(makeformat())); - connect(currency,TQT_SIGNAL(activated ( const TQString & ) ),this, TQT_SLOT(currencyChanged(const TQString &))); - connect(format,TQT_SIGNAL(activated ( int ) ),this,TQT_SLOT(formatChanged(int))); - connect(format, TQT_SIGNAL(activated(int)), this, TQT_SLOT(makeformat())); + connect(generic,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(fraction,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(money,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(date,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(scientific,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(number,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(percent,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(time,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(textFormat,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangeState())); + connect(customFormat,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangeState())); + + connect(listFormat,TQ_SIGNAL(selectionChanged ()),this,TQ_SLOT(makeformat())); + connect(precision,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChangeValue(int))); + connect(prefix,TQ_SIGNAL(textChanged ( const TQString & ) ),this,TQ_SLOT(makeformat())); + connect(postfix,TQ_SIGNAL(textChanged ( const TQString & ) ),this,TQ_SLOT(makeformat())); + connect(currency,TQ_SIGNAL(activated ( const TQString & ) ),this, TQ_SLOT(currencyChanged(const TQString &))); + connect(format,TQ_SIGNAL(activated ( int ) ),this,TQ_SLOT(formatChanged(int))); + connect(format, TQ_SIGNAL(activated(int)), this, TQ_SLOT(makeformat())); slotChangeState(); m_bFormatColorChanged=false; m_bFormatTypeChanged=false; @@ -1959,8 +1959,8 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg bTextColorUndefined = !dlg->bTextColor; - connect( textColorButton, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetTextColor( const TQColor & ) ) ); + connect( textColorButton, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetTextColor( const TQColor & ) ) ); TQStringList tmpListFont; @@ -1990,8 +1990,8 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg family_combo->setCurrentItem(0); } - connect( family_combo, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(family_chosen_slot(const TQString &)) ); + connect( family_combo, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(family_chosen_slot(const TQString &)) ); TQStringList lst; lst.append(""); @@ -2003,29 +2003,29 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg size_combo->setInsertionPolicy(TQComboBox::NoInsertion); - connect( size_combo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(size_chosen_slot(const TQString &)) ); - connect( size_combo ,TQT_SIGNAL( textChanged(const TQString &)), - this,TQT_SLOT(size_chosen_slot(const TQString &))); + connect( size_combo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(size_chosen_slot(const TQString &)) ); + connect( size_combo ,TQ_SIGNAL( textChanged(const TQString &)), + this,TQ_SLOT(size_chosen_slot(const TQString &))); - connect( weight_combo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(weight_chosen_slot(const TQString &)) ); + connect( weight_combo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(weight_chosen_slot(const TQString &)) ); - connect( style_combo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(style_chosen_slot(const TQString &)) ); + connect( style_combo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(style_chosen_slot(const TQString &)) ); strike->setChecked(dlg->strike); - connect( strike, TQT_SIGNAL( clicked()), - TQT_SLOT(strike_chosen_slot()) ); + connect( strike, TQ_SIGNAL( clicked()), + TQ_SLOT(strike_chosen_slot()) ); underline->setChecked(dlg->underline); - connect( underline, TQT_SIGNAL( clicked()), - TQT_SLOT(underline_chosen_slot()) ); + connect( underline, TQ_SIGNAL( clicked()), + TQ_SLOT(underline_chosen_slot()) ); example_label->setText(i18n("Dolor Ipse")); - connect(this,TQT_SIGNAL(fontSelected( const TQFont& )), - this,TQT_SLOT(display_example( const TQFont&))); + connect(this,TQ_SIGNAL(fontSelected( const TQFont& )), + this,TQ_SLOT(display_example( const TQFont&))); setCombos(); display_example( selFont ); @@ -2241,7 +2241,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial else if ( dlg->alignX == Format::Undefined ) standard->setChecked( true ); - connect(horizontalGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int))); + connect(horizontalGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotStateChanged(int))); if ( dlg->alignY ==Format::Top ) top->setChecked( true ); @@ -2307,11 +2307,11 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial defaultWidth->setEnabled(false); } - connect(defaultWidth , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeWidthState())); - connect(defaultHeight , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeHeightState())); - connect(vertical , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeVerticalState())); - connect(multi , TQT_SIGNAL(clicked() ), this, TQT_SLOT(slotChangeMultiState())); - connect(angleRotation, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChangeAngle(int))); + connect(defaultWidth , TQ_SIGNAL(clicked() ),this, TQ_SLOT(slotChangeWidthState())); + connect(defaultHeight , TQ_SIGNAL(clicked() ),this, TQ_SLOT(slotChangeHeightState())); + connect(vertical , TQ_SIGNAL(clicked() ),this, TQ_SLOT(slotChangeVerticalState())); + connect(multi , TQ_SIGNAL(clicked() ), this, TQ_SLOT(slotChangeMultiState())); + connect(angleRotation, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChangeAngle(int))); slotStateChanged( 0 ); m_bOptionText = false; @@ -2784,7 +2784,7 @@ void CellFormatPageBorder::InitializeGrids() TQGridLayout *grid3 = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); customize = new TQCheckBox(i18n("Customize"),tmpTQGroupBox); grid3->addWidget(customize,0,0); - connect( customize, TQT_SIGNAL( clicked()), TQT_SLOT(cutomize_chosen_slot()) ); + connect( customize, TQ_SIGNAL( clicked()), TQ_SLOT(cutomize_chosen_slot()) ); size=new TQComboBox(true,tmpTQGroupBox); grid3->addWidget(size,1,1); @@ -2875,35 +2875,35 @@ void CellFormatPageBorder::InitializePatterns() void CellFormatPageBorder::SetConnections() { - connect( color, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetColorButton( const TQColor & ) ) ); + connect( color, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetColorButton( const TQColor & ) ) ); for (int i=0; i < NUM_BORDER_PATTERNS; i++) { - connect( pattern[i], TQT_SIGNAL( clicked( PatternSelect* ) ), - this, TQT_SLOT( slotUnselect2( PatternSelect* ) ) ); + connect( pattern[i], TQ_SIGNAL( clicked( PatternSelect* ) ), + this, TQ_SLOT( slotUnselect2( PatternSelect* ) ) ); } for (int i = BorderType_Top; i < BorderType_END; i++) { - connect( borderButtons[i], TQT_SIGNAL( clicked (BorderButton *) ), - this, TQT_SLOT( changeState( BorderButton *) ) ); + connect( borderButtons[i], TQ_SIGNAL( clicked (BorderButton *) ), + this, TQ_SLOT( changeState( BorderButton *) ) ); } for (int i = BorderShortcutType_Remove; i < BorderShortcutType_END; i++) { - connect( shortcutButtons[i], TQT_SIGNAL( clicked(BorderButton *) ), - this, TQT_SLOT( preselect(BorderButton *) ) ); + connect( shortcutButtons[i], TQ_SIGNAL( clicked(BorderButton *) ), + this, TQ_SLOT( preselect(BorderButton *) ) ); } - connect( area ,TQT_SIGNAL( redraw()),this,TQT_SLOT(draw())); - connect( area ,TQT_SIGNAL( choosearea(TQMouseEvent * )), - this,TQT_SLOT( slotPressEvent(TQMouseEvent *))); + connect( area ,TQ_SIGNAL( redraw()),this,TQ_SLOT(draw())); + connect( area ,TQ_SIGNAL( choosearea(TQMouseEvent * )), + this,TQ_SLOT( slotPressEvent(TQMouseEvent *))); - connect( style, TQT_SIGNAL( activated(int)), this, TQT_SLOT(slotChangeStyle(int))); - connect( size, TQT_SIGNAL( textChanged(const TQString &)), - this, TQT_SLOT(slotChangeStyle(const TQString &))); - connect( size ,TQT_SIGNAL( activated(int)), this, TQT_SLOT(slotChangeStyle(int))); + connect( style, TQ_SIGNAL( activated(int)), this, TQ_SLOT(slotChangeStyle(int))); + connect( size, TQ_SIGNAL( textChanged(const TQString &)), + this, TQ_SLOT(slotChangeStyle(const TQString &))); + connect( size ,TQ_SIGNAL( activated(int)), this, TQ_SLOT(slotChangeStyle(int))); } void CellFormatPageBorder::cutomize_chosen_slot() @@ -3662,13 +3662,13 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog bgColor = colorGroup().base(); bgColorButton->setColor( bgColor ); - connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetBackgroundColor( const TQColor & ) ) ); + connect( bgColorButton, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetBackgroundColor( const TQColor & ) ) ); notAnyColor=new TQPushButton(i18n("No Color"),tmpTQGroupBox); grid3->addWidget(notAnyColor,0,2); - connect( notAnyColor, TQT_SIGNAL( clicked( ) ), - this, TQT_SLOT( slotNotAnyColor( ) ) ); + connect( notAnyColor, TQ_SIGNAL( clicked( ) ), + this, TQ_SLOT( slotNotAnyColor( ) ) ); b_notAnyColor=false; grid2->addMultiCell(grid3,7,7,0,2); @@ -3689,36 +3689,36 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog grid2->addWidget(current,1,0); grid->addWidget( tmpTQGroupBox,4,0); - connect( brush1, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush2, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush3, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush4, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush5, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush6, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush7, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush8, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush9, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush10, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush11, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush12, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush13, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush14, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush15, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush1, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush2, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush3, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush4, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush5, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush6, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush7, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush8, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush9, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush10, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush11, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush12, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush13, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush14, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush15, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); brush1->setPattern( TQt::red,TQt::VerPattern ); brush2->setPattern( TQt::red,TQt::HorPattern ); @@ -3742,8 +3742,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog color->setColor(dlg->brushColor); current->setBackgroundColor( bgColor ); - connect( color, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetColorButton( const TQColor & ) ) ); + connect( color, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetColorButton( const TQColor & ) ) ); slotSetColorButton( dlg->brushColor ); init(); diff --git a/kspread/dialogs/kspread_dlg_list.cpp b/kspread/dialogs/kspread_dlg_list.cpp index 254470e19..76581a6c4 100644 --- a/kspread/dialogs/kspread_dlg_list.cpp +++ b/kspread/dialogs/kspread_dlg_list.cpp @@ -79,13 +79,13 @@ ListDialog::ListDialog( TQWidget* parent, const char* name ) m_pAdd->setEnabled(false); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNew() ) ); - connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); - connect( m_pCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); - connect( list, TQT_SIGNAL(clicked ( TQListBoxItem * )),this,TQT_SLOT(slotTextClicked(TQListBoxItem * ))); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNew() ) ); + connect( m_pModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModify() ) ); + connect( m_pCopy, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) ); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( list, TQ_SIGNAL(clicked ( TQListBoxItem * )),this,TQ_SLOT(slotTextClicked(TQListBoxItem * ))); init(); entryList->setEnabled(false); m_pModify->setEnabled(false); diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cpp b/kspread/dialogs/kspread_dlg_paperlayout.cpp index 060f65ba8..9414bae3d 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cpp +++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp @@ -57,8 +57,8 @@ PaperLayout::PaperLayout( TQWidget * parent, const char * name, m_pView( view ) { initTab(); - connect(view->selectionInfo(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect(view->selectionInfo(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); tqApp->installEventFilter( this ); m_focus= 0L; } @@ -272,9 +272,9 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) m_rScalingZoom->setChecked( true ); } - connect( m_cZoom, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChooseZoom( int ) ) ); - connect( m_cLimitPagesX, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChoosePageLimit( int ) ) ); - connect( m_cLimitPagesY, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChoosePageLimit( int ) ) ); + connect( m_cZoom, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChooseZoom( int ) ) ); + connect( m_cLimitPagesX, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChoosePageLimit( int ) ) ); + connect( m_cLimitPagesY, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChoosePageLimit( int ) ) ); } void PaperLayout::slotChooseZoom( int /*index*/ ) diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cpp b/kspread/dialogs/kspread_dlg_pasteinsert.cpp index 2ffffc202..b966f6eb2 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cpp +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cpp @@ -55,7 +55,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec rb2 = new TQRadioButton( i18n("Move towards bottom"), grp ); rb1->setChecked(true); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); } void PasteInsertDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_preference.cpp b/kspread/dialogs/kspread_dlg_preference.cpp index 9202bb3a6..66776e346 100644 --- a/kspread/dialogs/kspread_dlg_preference.cpp +++ b/kspread/dialogs/kspread_dlg_preference.cpp @@ -63,7 +63,7 @@ PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/) { m_pView=parent; - connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); + connect(this, TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotApply())); TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("go-home",TDEIcon::SizeMedium)); _localePage=new parameterLocale(parent,page2 ); @@ -169,7 +169,7 @@ parameterLocale::parameterLocale( View* _view, TQVBox *box , char *name ) updateToMatchLocale(locale); m_updateButton=new TQPushButton ( i18n("&Update Locale Settings"), tmpTQGroupBox); - connect(m_updateButton, TQT_SIGNAL(clicked()),this,TQT_SLOT(updateDefaultSystemConfig())); + connect(m_updateButton, TQ_SIGNAL(clicked()),this,TQ_SLOT(updateDefaultSystemConfig())); } void parameterLocale::apply() @@ -449,7 +449,7 @@ miscParameters::miscParameters( View* _view,TQVBox *box, char *name ) typeCompletion->insertStringList(listType); typeCompletion->setCurrentItem(0); comboChanged=false; - connect(typeCompletion,TQT_SIGNAL(activated( const TQString & )),this,TQT_SLOT(slotTextComboChanged(const TQString &))); + connect(typeCompletion,TQ_SIGNAL(activated( const TQString & )),this,TQ_SLOT(slotTextComboChanged(const TQString &))); label=new TQLabel(i18n("&Pressing enter moves cell cursor:"), tmpTQGroupBox); typeOfMove=new TQComboBox( tmpTQGroupBox); @@ -1000,9 +1000,9 @@ configureTTSPage::configureTTSPage( View *_view, TQVBox *box, char *name ) m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); } void configureTTSPage::slotDefault() diff --git a/kspread/dialogs/kspread_dlg_reference.cpp b/kspread/dialogs/kspread_dlg_reference.cpp index 9e747dfbb..96d0d5b59 100644 --- a/kspread/dialogs/kspread_dlg_reference.cpp +++ b/kspread/dialogs/kspread_dlg_reference.cpp @@ -102,14 +102,14 @@ reference::reference( View* parent, const char* name ) m_pEdit->setEnabled( false ); } - connect( m_pOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); - connect( m_pCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCancel() ) ); - connect( m_pEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEdit() ) ); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, - TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); - connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this, - TQT_SLOT(slotHighlighted(TQListBoxItem * ))); + connect( m_pOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) ); + connect( m_pCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCancel() ) ); + connect( m_pEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), this, + TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( m_list, TQ_SIGNAL(highlighted ( TQListBoxItem * ) ), this, + TQ_SLOT(slotHighlighted(TQListBoxItem * ))); m_rangeName->setText(i18n("Area: %1").arg("")); resize( 250, 200 ); diff --git a/kspread/dialogs/kspread_dlg_series.cpp b/kspread/dialogs/kspread_dlg_series.cpp index 6bc31ca17..d424f8253 100644 --- a/kspread/dialogs/kspread_dlg_series.cpp +++ b/kspread/dialogs/kspread_dlg_series.cpp @@ -103,7 +103,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) start->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); } diff --git a/kspread/dialogs/kspread_dlg_show.cpp b/kspread/dialogs/kspread_dlg_show.cpp index 11f55e6d0..4cea9f115 100644 --- a/kspread/dialogs/kspread_dlg_show.cpp +++ b/kspread/dialogs/kspread_dlg_show.cpp @@ -63,8 +63,8 @@ ShowDialog::ShowDialog( View* parent, const char* name ) } if(!list->count()) enableButtonOK(false); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); resize( 200, 150 ); setFocus(); } diff --git a/kspread/dialogs/kspread_dlg_showColRow.cpp b/kspread/dialogs/kspread_dlg_showColRow.cpp index 32c4c631a..0828667f1 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cpp +++ b/kspread/dialogs/kspread_dlg_showColRow.cpp @@ -108,8 +108,8 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) //selection multiple list->setSelectionMode(TQListBox::Multi); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); resize( 200, 150 ); setFocus(); } diff --git a/kspread/dialogs/kspread_dlg_sort.cpp b/kspread/dialogs/kspread_dlg_sort.cpp index 5e5167f8a..a9985db5c 100644 --- a/kspread/dialogs/kspread_dlg_sort.cpp +++ b/kspread/dialogs/kspread_dlg_sort.cpp @@ -247,14 +247,14 @@ SortDialog::SortDialog( View * parent, const char * name, page2Layout->addWidget( m_respectCase, 2,0 ); - connect( m_sortKey2, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( sortKey2textChanged( int ) ) ); - connect( m_useCustomLists, TQT_SIGNAL( stateChanged(int) ), this, - TQT_SLOT( useCustomListsStateChanged(int) ) ); - connect( m_firstRowOrColHeader, TQT_SIGNAL( stateChanged(int) ), this, - TQT_SLOT( firstRowHeaderChanged(int) ) ); - connect( orientationGroup, TQT_SIGNAL( pressed(int) ), this, - TQT_SLOT( slotOrientationChanged(int) ) ); + connect( m_sortKey2, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( sortKey2textChanged( int ) ) ); + connect( m_useCustomLists, TQ_SIGNAL( stateChanged(int) ), this, + TQ_SLOT( useCustomListsStateChanged(int) ) ); + connect( m_firstRowOrColHeader, TQ_SIGNAL( stateChanged(int) ), this, + TQ_SLOT( firstRowHeaderChanged(int) ) ); + connect( orientationGroup, TQ_SIGNAL( pressed(int) ), this, + TQ_SLOT( slotOrientationChanged(int) ) ); init(); } diff --git a/kspread/dialogs/kspread_dlg_special.cpp b/kspread/dialogs/kspread_dlg_special.cpp index 5e835c1fb..2b854f217 100644 --- a/kspread/dialogs/kspread_dlg_special.cpp +++ b/kspread/dialogs/kspread_dlg_special.cpp @@ -74,9 +74,9 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) // cb->layout(); // lay1->addWidget(cb); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( rb3, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); - connect( rb10, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( rb3, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); + connect( rb10, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); } void SpecialDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_styles.cpp b/kspread/dialogs/kspread_dlg_styles.cpp index 461b28cc0..1aae08149 100644 --- a/kspread/dialogs/kspread_dlg_styles.cpp +++ b/kspread/dialogs/kspread_dlg_styles.cpp @@ -58,7 +58,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) m_displayBox->insertItem( i18n( "Applied Styles" ) ); m_displayBox->insertItem( i18n( "Custom Styles" ) ); m_displayBox->insertItem( i18n( "Hierarchical" ) ); - connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle())); + connect( m_styleList, TQ_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQ_SIGNAL( modifyStyle())); resize( TQSize(446, 384).expandedTo(minimumSizeHint()) ); } @@ -86,11 +86,11 @@ StyleDlg::StyleDlg( View * parent, StyleManager * manager, enableButton( KDialogBase::User2, true ); enableButton( KDialogBase::User3, false ); - connect( m_dlg->m_styleList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_dlg->m_displayBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotDisplayMode( int ) ) ); - connect( this, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotUser3() ) ); - connect( m_dlg, TQT_SIGNAL( modifyStyle() ), this, TQT_SLOT( slotUser2())); + connect( m_dlg->m_styleList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_dlg->m_displayBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotDisplayMode( int ) ) ); + connect( this, TQ_SIGNAL( user3Clicked() ), this, TQ_SLOT( slotUser3() ) ); + connect( m_dlg, TQ_SIGNAL( modifyStyle() ), this, TQ_SLOT( slotUser2())); } StyleDlg::~StyleDlg() diff --git a/kspread/dialogs/kspread_dlg_validity.cpp b/kspread/dialogs/kspread_dlg_validity.cpp index b7aca93e5..a90b74db9 100644 --- a/kspread/dialogs/kspread_dlg_validity.cpp +++ b/kspread/dialogs/kspread_dlg_validity.cpp @@ -214,10 +214,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) messageHelp->setTextFormat( TQt::PlainText ); - connect(choose,TQT_SIGNAL(activated(int )),this,TQT_SLOT(changeIndexCond(int))); - connect(chooseType,TQT_SIGNAL(activated(int )),this,TQT_SLOT(changeIndexType(int))); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(OkPressed()) ); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(clearAllPressed()) ); + connect(choose,TQ_SIGNAL(activated(int )),this,TQ_SLOT(changeIndexCond(int))); + connect(chooseType,TQ_SIGNAL(activated(int )),this,TQ_SLOT(changeIndexType(int))); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(OkPressed()) ); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(clearAllPressed()) ); init(); } diff --git a/kspread/dialogs/link.cpp b/kspread/dialogs/link.cpp index e0c1be217..afc64096d 100644 --- a/kspread/dialogs/link.cpp +++ b/kspread/dialogs/link.cpp @@ -76,8 +76,8 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) d->internetLink = new KLineEdit( d->internetPage ); iLayout->add( d->internetLink ); iLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( d->internetText, TQT_SIGNAL( textChanged( const TQString& ) ), this, - TQT_SLOT( setText( const TQString& ) ) ); + connect( d->internetText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); // link for e-mail d->mailPage = addPage( i18n( "Mail" ), TQString(), @@ -90,8 +90,8 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) d->mailLink = new KLineEdit( d->mailPage ); mLayout->add( d->mailLink ); mLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( d->mailText, TQT_SIGNAL( textChanged( const TQString& ) ), this, - TQT_SLOT( setText( const TQString& ) ) ); + connect( d->mailText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); // link for external file d->filePage = addPage( i18n( "File" ), TQString(), @@ -108,10 +108,10 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); fLayout->add( recentFile ); fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); - connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this, - TQT_SLOT( setText( const TQString& ) ) ); - TQObject::connect( recentFile, TQT_SIGNAL( highlighted ( const TQString &) ), - d->fileLink->lineEdit(), TQT_SLOT( setText( const TQString & ) ) ); + connect( d->fileText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); + TQObject::connect( recentFile, TQ_SIGNAL( highlighted ( const TQString &) ), + d->fileLink->lineEdit(), TQ_SLOT( setText( const TQString & ) ) ); // populate recent files @@ -139,8 +139,8 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) d->cellLink = new KLineEdit( d->cellPage ); cLayout->add( d->cellLink ); cLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( d->cellText, TQT_SIGNAL( textChanged( const TQString& ) ), this, - TQT_SLOT( setText( const TQString& ) ) ); + connect( d->cellText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); enableButtonSeparator( true ); d->internetText->setFocus(); diff --git a/kspread/kspread_canvas.cpp b/kspread/kspread_canvas.cpp index 1f52a9550..c78cfea87 100644 --- a/kspread/kspread_canvas.cpp +++ b/kspread/kspread_canvas.cpp @@ -257,16 +257,16 @@ Canvas::Canvas (View *_view) d->prevSpokenCol = -1; d->scrollTimer = new TQTimer( this ); - connect (d->scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); + connect (d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); if( d->view) { - connect( d->view, TQT_SIGNAL( autoScroll( const TQPoint & )), this, TQT_SLOT( slotAutoScroll( const TQPoint &))); + connect( d->view, TQ_SIGNAL( autoScroll( const TQPoint & )), this, TQ_SLOT( slotAutoScroll( const TQPoint &))); } if (kospeaker) { - connect (kospeaker, TQT_SIGNAL(customSpeakWidget(TQWidget*, const TQPoint&, uint)), - this, TQT_SLOT(speakCell(TQWidget*, const TQPoint&, uint))); + connect (kospeaker, TQ_SIGNAL(customSpeakWidget(TQWidget*, const TQPoint&, uint)), + this, TQ_SLOT(speakCell(TQWidget*, const TQPoint&, uint))); } setFocus(); @@ -4647,7 +4647,7 @@ VBorder::VBorder( TQWidget *_parent, Canvas *_canvas, View *_view) m_bMousePressed = false; m_scrollTimer = new TQTimer( this ); - connect (m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); + connect (m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); } @@ -5203,7 +5203,7 @@ HBorder::HBorder( TQWidget *_parent, Canvas *_canvas,View *_view ) m_bMousePressed = false; m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); } diff --git a/kspread/kspread_doc.cpp b/kspread/kspread_doc.cpp index 99feebe50..17f02d487 100644 --- a/kspread/kspread_doc.cpp +++ b/kspread/kspread_doc.cpp @@ -209,8 +209,8 @@ Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, cons d->undoLocked = 0; d->commandHistory = new KoCommandHistory( actionCollection() ); - connect( d->commandHistory, TQT_SIGNAL( commandExecuted() ), TQT_SLOT( commandExecuted() ) ); - connect( d->commandHistory, TQT_SIGNAL( documentRestored() ), TQT_SLOT( documentRestored() ) ); + connect( d->commandHistory, TQ_SIGNAL( commandExecuted() ), TQ_SLOT( commandExecuted() ) ); + connect( d->commandHistory, TQ_SIGNAL( documentRestored() ), TQ_SLOT( documentRestored() ) ); // Make us scripsheet if the document has a name @@ -2331,7 +2331,7 @@ void Doc::addDamage( Damage* damage ) d->damages.append( damage ); if( d->damages.count() == 1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( flushDamages() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( flushDamages() ) ); } void Doc::flushDamages() @@ -2421,7 +2421,7 @@ void Doc::repaint( const KoRect& rect ) void Doc::addShell( KoMainWindow *shell ) { - connect( shell, TQT_SIGNAL( documentSaved() ), d->commandHistory, TQT_SLOT( documentSaved() ) ); + connect( shell, TQ_SIGNAL( documentSaved() ), d->commandHistory, TQ_SLOT( documentSaved() ) ); KoDocument::addShell( shell ); } diff --git a/kspread/kspread_editors.cpp b/kspread/kspread_editors.cpp index add8d217f..a4baad779 100644 --- a/kspread/kspread_editors.cpp +++ b/kspread/kspread_editors.cpp @@ -326,10 +326,10 @@ TQObject( editor ) d->completionListBox->setFrameStyle( TQFrame::NoFrame ); d->completionListBox->setVariableWidth( true ); d->completionListBox->installEventFilter( this ); - connect( d->completionListBox, TQT_SIGNAL(selected(const TQString&)), this, - TQT_SLOT(itemSelected(const TQString&)) ); - connect( d->completionListBox, TQT_SIGNAL(highlighted(const TQString&)), this, - TQT_SLOT(itemSelected(const TQString&)) ); + connect( d->completionListBox, TQ_SIGNAL(selected(const TQString&)), this, + TQ_SLOT(itemSelected(const TQString&)) ); + connect( d->completionListBox, TQ_SIGNAL(highlighted(const TQString&)), this, + TQ_SLOT(itemSelected(const TQString&)) ); d->hintLabel = new TQLabel( 0, "autocalc", TQt::WStyle_StaysOnTop | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_Tool | TQt::WX11BypassWM ); @@ -373,7 +373,7 @@ void FunctionCompletion::itemSelected( const TQString& item ) d->hintLabel->raise(); // do not show it forever - //TQTimer::singleShot( 5000, d->hintLabel, TQT_SLOT( hide()) ); + //TQTimer::singleShot( 5000, d->hintLabel, TQ_SLOT( hide()) ); } bool FunctionCompletion::eventFilter( TQObject *obj, TQEvent *ev ) @@ -517,11 +517,11 @@ CellEditor::CellEditor( Cell* _cell, Canvas* _parent, bool captureAllKeyEvents, d->functionCompletion = new FunctionCompletion( this ); d->functionCompletionTimer = new TQTimer( this ); - connect( d->functionCompletion, TQT_SIGNAL( selectedCompletion( const TQString& ) ), - TQT_SLOT( functionAutoComplete( const TQString& ) ) ); - connect( d->textEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( checkFunctionAutoComplete() ) ); - connect( d->functionCompletionTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( triggerFunctionAutoComplete() ) ); + connect( d->functionCompletion, TQ_SIGNAL( selectedCompletion( const TQString& ) ), + TQ_SLOT( functionAutoComplete( const TQString& ) ) ); + connect( d->textEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( checkFunctionAutoComplete() ) ); + connect( d->functionCompletionTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( triggerFunctionAutoComplete() ) ); if (!cell()->format()->multiRow(cell()->column(),cell()->row())) d->textEdit->setWordWrap(TQTextEdit::NoWrap); @@ -536,11 +536,11 @@ CellEditor::CellEditor( Cell* _cell, Canvas* _parent, bool captureAllKeyEvents, */ setFocusProxy( d->textEdit ); - connect( d->textEdit, TQT_SIGNAL( cursorPositionChanged(int,int) ), this, TQT_SLOT (slotCursorPositionChanged(int,int))); - connect( d->textEdit, TQT_SIGNAL( cursorPositionChanged(TQTextCursor*) ), this, TQT_SLOT (slotTextCursorChanged(TQTextCursor*))); - connect( d->textEdit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) ); + connect( d->textEdit, TQ_SIGNAL( cursorPositionChanged(int,int) ), this, TQ_SLOT (slotCursorPositionChanged(int,int))); + connect( d->textEdit, TQ_SIGNAL( cursorPositionChanged(TQTextCursor*) ), this, TQ_SLOT (slotTextCursorChanged(TQTextCursor*))); + connect( d->textEdit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotTextChanged() ) ); -// connect( d->textEdit, TQT_SIGNAL(completionModeChanged( TDEGlobalSettings::Completion )),this,TQT_SLOT (slotCompletionModeChanged(TDEGlobalSettings::Completion))); +// connect( d->textEdit, TQ_SIGNAL(completionModeChanged( TDEGlobalSettings::Completion )),this,TQ_SLOT (slotCompletionModeChanged(TDEGlobalSettings::Completion))); // A choose should always start at the edited cell // canvas()->setChooseMarkerRow( canvas()->markerRow() ); @@ -743,8 +743,8 @@ void CellEditor::slotCursorPositionChanged(int /* para */, int pos) { d->highlighter->resetRangeChanged(); - disconnect( d->canvas->choice(), TQT_SIGNAL(changed(const Region&)), - d->canvas->view(), TQT_SLOT(slotScrollChoice(const Region&)) ); + disconnect( d->canvas->choice(), TQ_SIGNAL(changed(const Region&)), + d->canvas->view(), TQ_SLOT(slotScrollChoice(const Region&)) ); d->canvas->doc()->emitBeginOperation(); setUpdateChoice(false); @@ -783,8 +783,8 @@ void CellEditor::slotCursorPositionChanged(int /* para */, int pos) } setUpdateChoice(true); d->canvas->doc()->emitEndOperation(*d->canvas->choice()); - connect( d->canvas->choice(), TQT_SIGNAL(changed(const Region&)), - d->canvas->view(), TQT_SLOT(slotScrollChoice(const Region&)) ); + connect( d->canvas->choice(), TQ_SIGNAL(changed(const Region&)), + d->canvas->view(), TQ_SLOT(slotScrollChoice(const Region&)) ); } } } @@ -1267,7 +1267,7 @@ ComboboxLocationEditWidget::ComboboxLocationEditWidget( TQWidget * _parent, TQValueList<Reference> area = _view->doc()->listArea(); for ( it = area.begin(); it != area.end(); ++it ) slotAddAreaName( (*it).ref_name); - connect( this, TQT_SIGNAL( activated ( const TQString & ) ), m_locationWidget, TQT_SLOT( slotActivateItem() ) ); + connect( this, TQ_SIGNAL( activated ( const TQString & ) ), m_locationWidget, TQ_SLOT( slotActivateItem() ) ); } @@ -1465,10 +1465,10 @@ EditWidget::EditWidget( TQWidget *_parent, Canvas *_canvas, if ( !m_pCanvas->doc()->isReadWrite() || !m_pCanvas->activeSheet() ) setEnabled( false ); - TQObject::connect( m_pCancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAbortEdit() ) ); - TQObject::connect( m_pOkButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDoneEdit() ) ); + TQObject::connect( m_pCancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAbortEdit() ) ); + TQObject::connect( m_pOkButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDoneEdit() ) ); setEditMode( false ); // disable buttons } diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp index ae8a2bbc0..347448c38 100644 --- a/kspread/kspread_generalProperty.cpp +++ b/kspread/kspread_generalProperty.cpp @@ -55,8 +55,8 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal m_ui->positionGroup->setTitle( i18n( "Position" ) ); - connect( m_ui->protect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotProtectToggled( bool ) ) ); - connect( m_ui->keepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotKeepRatioToggled( bool ) ) ); + connect( m_ui->protect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotProtectToggled( bool ) ) ); + connect( m_ui->keepRatio, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotKeepRatioToggled( bool ) ) ); double dStep = KoUnit::fromUserValue( 0.5, m_unit ); double dMax = KoUnit::fromUserValue( 9999, m_unit ); @@ -68,11 +68,11 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal m_ui->widthInput->setUnit( m_unit ); m_ui->widthInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotWidthChanged( double ) ) ); + connect( m_ui->widthInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotWidthChanged( double ) ) ); m_ui->heightInput->setUnit( m_unit ); m_ui->heightInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->heightInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotHeightChanged( double ) ) ); + connect( m_ui->heightInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotHeightChanged( double ) ) ); slotReset(); } diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp index d8240c3eb..152001d1a 100644 --- a/kspread/kspread_propertyEditor.cpp +++ b/kspread/kspread_propertyEditor.cpp @@ -56,7 +56,7 @@ PropertyEditor::PropertyEditor( TQWidget *parent, const char *name, Sheet *page, setOkButton( KStdGuiItem::ok().text() ); setApplyButton( KStdGuiItem::apply().text() ); - connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotDone() ) ); + connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotDone() ) ); //m_objectProperties = new KPrObjectProperties( m_objects ); diff --git a/kspread/kspread_sheet.cpp b/kspread/kspread_sheet.cpp index 8a4cf50a4..2240c67d4 100644 --- a/kspread/kspread_sheet.cpp +++ b/kspread/kspread_sheet.cpp @@ -423,11 +423,11 @@ Sheet::Sheet (Map* map, d->dependencies = new KSpread::DependencyManager (this); // connect to named area slots - TQObject::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), - this, TQT_SLOT( slotAreaModified( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_addAreaName( const TQString & ) ), + this, TQ_SLOT( slotAreaModified( const TQString & ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), - this, TQT_SLOT( slotAreaModified( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_removeAreaName( const TQString & ) ), + this, TQ_SLOT( slotAreaModified( const TQString & ) ) ); } @@ -2989,11 +2989,11 @@ void Sheet::replace( const TQString &_find, const TQString &_replace, long optio // local slots. KReplace dialog( _find, _replace, options ); TQObject::connect( - &dialog, TQT_SIGNAL( highlight( const TQString &, int, int, const TQRect & ) ), - canvas, TQT_SLOT( highlight( const TQString &, int, int, const TQRect & ) ) ); + &dialog, TQ_SIGNAL( highlight( const TQString &, int, int, const TQRect & ) ), + canvas, TQ_SLOT( highlight( const TQString &, int, int, const TQRect & ) ) ); TQObject::connect( - &dialog, TQT_SIGNAL( replace( const TQString &, int, int,int, const TQRect & ) ), - canvas, TQT_SLOT( replace( const TQString &, int, int,int, const TQRect & ) ) ); + &dialog, TQ_SIGNAL( replace( const TQString &, int, int,int, const TQRect & ) ), + canvas, TQ_SLOT( replace( const TQString &, int, int,int, const TQRect & ) ) ); // Now do the replacing... if ( !doc()->undoLocked() ) diff --git a/kspread/kspread_toolbox.cpp b/kspread/kspread_toolbox.cpp index b868d9131..82373f893 100644 --- a/kspread/kspread_toolbox.cpp +++ b/kspread/kspread_toolbox.cpp @@ -131,14 +131,14 @@ KoTransformToolBox::KoTransformToolBox( KoDocumentChild* ch, TQWidget* parent, c setDocumentChild( ch ); - connect( m_rotation, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotRotationChanged( int ) ) ); - connect( m_scale, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotScalingChanged( int ) ) ); - connect( m_shearX, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotXShearingChanged( int ) ) ); - connect( m_shearY, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotYShearingChanged( int ) ) ); + connect( m_rotation, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotRotationChanged( int ) ) ); + connect( m_scale, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotScalingChanged( int ) ) ); + connect( m_shearX, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotXShearingChanged( int ) ) ); + connect( m_shearY, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotYShearingChanged( int ) ) ); } void KoTransformToolBox::setDocumentChild( KoDocumentChild* ch ) diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 91f5edce0..f74dc4208 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -468,534 +468,534 @@ void View::Private::initActions() // -- cell formatting actions -- actions->cellLayout = new TDEAction( i18n("Cell Format..."), "cell_layout", - TQt::CTRL+ TQt::ALT+ TQt::Key_F, view, TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); + TQt::CTRL+ TQt::ALT+ TQt::Key_F, view, TQ_SLOT( layoutDlg() ), ac, "cellLayout" ); actions->cellLayout->setToolTip( i18n("Set the cell formatting.") ); actions->actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - view, TQT_SLOT( extraProperties() ), ac, "extra_properties" ); + view, TQ_SLOT( extraProperties() ), ac, "extra_properties" ); actions->defaultFormat = new TDEAction( i18n("Default"), - 0, view, TQT_SLOT( defaultSelection() ), ac, "default" ); + 0, view, TQ_SLOT( defaultSelection() ), ac, "default" ); actions->defaultFormat->setToolTip( i18n("Resets to the default format.") ); actions->bold = new TDEToggleAction( i18n("Bold"), "format-text-bold", TQt::CTRL+TQt::Key_B, ac, "bold"); - TQObject::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( bold( bool ) ) ); + TQObject::connect( actions->bold, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( bold( bool ) ) ); actions->italic = new TDEToggleAction( i18n("Italic"), "format-text-italic", TQt::CTRL+TQt::Key_I, ac, "italic"); - TQObject::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( italic( bool ) ) ); + TQObject::connect( actions->italic, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( italic( bool ) ) ); actions->underline = new TDEToggleAction( i18n("Underline"), "format-text-underline", TQt::CTRL+TQt::Key_U, ac, "underline"); - TQObject::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( underline( bool ) ) ); + TQObject::connect( actions->underline, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( underline( bool ) ) ); actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", 0, ac, "strikeout"); - TQObject::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( strikeOut( bool ) ) ); + TQObject::connect( actions->strikeOut, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( strikeOut( bool ) ) ); actions->selectFont = new TDEFontAction( i18n("Select Font..."), 0, ac, "selectFont" ); - TQObject::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), - view, TQT_SLOT( fontSelected( const TQString& ) ) ); + TQObject::connect( actions->selectFont, TQ_SIGNAL( activated( const TQString& ) ), + view, TQ_SLOT( fontSelected( const TQString& ) ) ); actions->selectFontSize = new TDEFontSizeAction( i18n("Select Font Size"), 0, ac, "selectFontSize" ); - TQObject::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - view, TQT_SLOT( fontSizeSelected( int ) ) ); + TQObject::connect( actions->selectFontSize, TQ_SIGNAL( fontSizeChanged( int ) ), + view, TQ_SLOT( fontSizeSelected( int ) ) ); actions->fontSizeUp = new TDEAction( i18n("Increase Font Size"), "fontsizeup", - 0, view, TQT_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); + 0, view, TQ_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); actions->fontSizeDown = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", - 0, view, TQT_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); + 0, view, TQ_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); actions->textColor = new TTDESelectColorAction( i18n("Text Color"), - TTDESelectColorAction::TextColor, view, TQT_SLOT( changeTextColor() ), + TTDESelectColorAction::TextColor, view, TQ_SLOT( changeTextColor() ), ac, "textColor",true ); actions->textColor->setDefaultColor(TQColor()); actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", 0, ac, "left"); - TQObject::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignLeft( bool ) ) ); + TQObject::connect( actions->alignLeft, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignLeft( bool ) ) ); actions->alignLeft->setExclusiveGroup( "Align" ); actions->alignLeft->setToolTip(i18n("Left justify the cell contents.")); actions->alignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", 0, ac, "center"); - TQObject::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignCenter( bool ) ) ); + TQObject::connect( actions->alignCenter, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignCenter( bool ) ) ); actions->alignCenter->setExclusiveGroup( "Align" ); actions->alignCenter->setToolTip(i18n("Center the cell contents.")); actions->alignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", 0, ac, "right"); - TQObject::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignRight( bool ) ) ); + TQObject::connect( actions->alignRight, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignRight( bool ) ) ); actions->alignRight->setExclusiveGroup( "Align" ); actions->alignRight->setToolTip(i18n("Right justify the cell contents.")); actions->alignTop = new TDEToggleAction( i18n("Align Top"), "text_top", 0, ac, "top"); - TQObject::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignTop( bool ) ) ); + TQObject::connect( actions->alignTop, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignTop( bool ) ) ); actions->alignTop->setExclusiveGroup( "Pos" ); actions->alignTop->setToolTip(i18n("Align cell contents along the top of the cell.")); actions->alignMiddle = new TDEToggleAction( i18n("Align Middle"), "middle", 0, ac, "middle"); - TQObject::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignMiddle( bool ) ) ); + TQObject::connect( actions->alignMiddle, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignMiddle( bool ) ) ); actions->alignMiddle->setExclusiveGroup( "Pos" ); actions->alignMiddle->setToolTip(i18n("Align cell contents centered in the cell.")); actions->alignBottom = new TDEToggleAction( i18n("Align Bottom"), "text_bottom", 0, ac, "bottom"); - TQObject::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignBottom( bool ) ) ); + TQObject::connect( actions->alignBottom, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignBottom( bool ) ) ); actions->alignBottom->setExclusiveGroup( "Pos" ); actions->alignBottom->setToolTip(i18n("Align cell contents along the bottom of the cell.")); actions->wrapText = new TDEToggleAction( i18n("Wrap Text"), "multirow", 0, ac, "multiRow" ); - TQObject::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( wrapText( bool ) ) ); + TQObject::connect( actions->wrapText, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( wrapText( bool ) ) ); actions->wrapText->setToolTip(i18n("Make the cell text wrap onto multiple lines.")); actions->verticalText = new TDEToggleAction( i18n("Vertical Text"),"vertical_text" , 0 ,ac, "verticaltext" ); - TQObject::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( verticalText( bool ) ) ); + TQObject::connect( actions->verticalText, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( verticalText( bool ) ) ); actions->verticalText->setToolTip(i18n("Print cell contents vertically.")); actions->increaseIndent = new TDEAction( i18n("Increase Indent"), TQApplication::reverseLayout() ? "format_decreaseindent":"format_increaseindent", - 0, view, TQT_SLOT( increaseIndent() ), ac, "increaseindent" ); + 0, view, TQ_SLOT( increaseIndent() ), ac, "increaseindent" ); actions->increaseIndent->setToolTip(i18n("Increase the indentation.")); actions->decreaseIndent = new TDEAction( i18n("Decrease Indent"), TQApplication::reverseLayout() ? "format_increaseindent" : "format_decreaseindent", - 0, view, TQT_SLOT( decreaseIndent() ), ac, "decreaseindent"); + 0, view, TQ_SLOT( decreaseIndent() ), ac, "decreaseindent"); actions->decreaseIndent->setToolTip(i18n("Decrease the indentation.")); actions->changeAngle = new TDEAction( i18n("Change Angle..."), - 0, view, TQT_SLOT( changeAngle() ), ac, "changeangle" ); + 0, view, TQ_SLOT( changeAngle() ), ac, "changeangle" ); actions->changeAngle->setToolTip(i18n("Change the angle that cell contents are printed.")); actions->percent = new TDEToggleAction( i18n("Percent Format"), "percent", 0, ac, "percent"); - TQObject::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( percent( bool ) ) ); + TQObject::connect( actions->percent, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( percent( bool ) ) ); actions->percent->setToolTip(i18n("Set the cell formatting to look like a percentage.")); actions->precplus = new TDEAction( i18n("Increase Precision"), "prec_plus", - 0, view, TQT_SLOT( precisionPlus() ), ac, "precplus"); + 0, view, TQ_SLOT( precisionPlus() ), ac, "precplus"); actions->precplus->setToolTip(i18n("Increase the decimal precision shown onscreen.")); actions->precminus = new TDEAction( i18n("Decrease Precision"), "prec_minus", - 0, view, TQT_SLOT( precisionMinus() ), ac, "precminus"); + 0, view, TQ_SLOT( precisionMinus() ), ac, "precminus"); actions->precminus->setToolTip(i18n("Decrease the decimal precision shown onscreen.")); actions->money = new TDEToggleAction( i18n("Money Format"), "money", 0, ac, "money"); - TQObject::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( moneyFormat( bool ) ) ); + TQObject::connect( actions->money, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( moneyFormat( bool ) ) ); actions->money->setToolTip(i18n("Set the cell formatting to look like your local currency.")); actions->upper = new TDEAction( i18n("Upper Case"), "fontsizeup", - 0, view, TQT_SLOT( upper() ), ac, "upper" ); + 0, view, TQ_SLOT( upper() ), ac, "upper" ); actions->upper->setToolTip(i18n("Convert all letters to upper case.")); actions->lower = new TDEAction( i18n("Lower Case"), "fontsizedown", - 0, view, TQT_SLOT( lower() ), ac, "lower" ); + 0, view, TQ_SLOT( lower() ), ac, "lower" ); actions->lower->setToolTip(i18n("Convert all letters to lower case.")); actions->firstLetterUpper = new TDEAction( i18n("Convert First Letter to Upper Case"), "first_letter_upper", - 0, view, TQT_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); + 0, view, TQ_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); actions->firstLetterUpper->setToolTip(i18n("Capitalize the first letter.")); actions->bgColor = new TTDESelectColorAction( i18n("Background Color"), TTDESelectColorAction::FillColor, ac, "backgroundColor", true ); - TQObject::connect(actions->bgColor, TQT_SIGNAL( activated() ), - view, TQT_SLOT( changeBackgroundColor() ) ); + TQObject::connect(actions->bgColor, TQ_SIGNAL( activated() ), + view, TQ_SLOT( changeBackgroundColor() ) ); actions->bgColor->setDefaultColor(TQColor()); actions->bgColor->setToolTip(i18n("Set the background color.")); actions->borderLeft = new TDEAction( i18n("Border Left"), "border_left", - 0, view, TQT_SLOT( borderLeft() ), ac, "borderLeft" ); + 0, view, TQ_SLOT( borderLeft() ), ac, "borderLeft" ); actions->borderLeft->setToolTip(i18n("Set a left border to the selected area.")); actions->borderRight = new TDEAction( i18n("Border Right"), "border_right", - 0, view, TQT_SLOT( borderRight() ), ac, "borderRight" ); + 0, view, TQ_SLOT( borderRight() ), ac, "borderRight" ); actions->borderRight->setToolTip(i18n("Set a right border to the selected area.")); actions->borderTop = new TDEAction( i18n("Border Top"), "border_top", - 0, view, TQT_SLOT( borderTop() ), ac, "borderTop" ); + 0, view, TQ_SLOT( borderTop() ), ac, "borderTop" ); actions->borderTop->setToolTip(i18n("Set a top border to the selected area.")); actions->borderBottom = new TDEAction( i18n("Border Bottom"), "border_bottom", - 0, view, TQT_SLOT( borderBottom() ), ac, "borderBottom" ); + 0, view, TQ_SLOT( borderBottom() ), ac, "borderBottom" ); actions->borderBottom->setToolTip(i18n("Set a bottom border to the selected area.")); actions->borderAll = new TDEAction( i18n("All Borders"), "border_all", - 0, view, TQT_SLOT( borderAll() ), ac, "borderAll" ); + 0, view, TQ_SLOT( borderAll() ), ac, "borderAll" ); actions->borderAll->setToolTip(i18n("Set a border around all cells in the selected area.")); actions->borderRemove = new TDEAction( i18n("Remove Borders"), "border_remove", - 0, view, TQT_SLOT( borderRemove() ), ac, "borderRemove" ); + 0, view, TQ_SLOT( borderRemove() ), ac, "borderRemove" ); actions->borderRemove->setToolTip(i18n("Remove all borders in the selected area.")); actions->borderOutline = new TDEAction( i18n("Border Outline"), ("border_outline"), - 0, view, TQT_SLOT( borderOutline() ), ac, "borderOutline" ); + 0, view, TQ_SLOT( borderOutline() ), ac, "borderOutline" ); actions->borderOutline->setToolTip(i18n("Set a border to the outline of the selected area.")); actions->borderColor = new TTDESelectColorAction( i18n("Border Color"), TTDESelectColorAction::LineColor, ac, "borderColor" ); - TQObject::connect( actions->borderColor, TQT_SIGNAL( activated() ), - view, TQT_SLOT( changeBorderColor() ) ); + TQObject::connect( actions->borderColor, TQ_SIGNAL( activated() ), + view, TQ_SLOT( changeBorderColor() ) ); actions->borderColor->setToolTip( i18n( "Select a new border color." ) ); actions->selectStyle = new TDESelectAction( i18n( "St&yle" ), 0, ac, "stylemenu" ); actions->selectStyle->setToolTip( i18n( "Apply a predefined style to the selected cells." ) ); - TQObject::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), - view, TQT_SLOT( styleSelected( const TQString & ) ) ); + TQObject::connect( actions->selectStyle, TQ_SIGNAL( activated( const TQString & ) ), + view, TQ_SLOT( styleSelected( const TQString & ) ) ); actions->createStyle = new TDEAction( i18n( "Create Style From Cell..." ), - 0, view, TQT_SLOT( createStyleFromCell()), ac, "createStyle" ); + 0, view, TQ_SLOT( createStyleFromCell()), ac, "createStyle" ); actions->createStyle->setToolTip( i18n( "Create a new style based on the currently selected cell." ) ); // -- cell operation actions -- actions->editCell = new TDEAction( i18n("Modify Cell"),"cell_edit", - TQt::CTRL+TQt::Key_M, view, TQT_SLOT( editCell() ), ac, "editCell" ); + TQt::CTRL+TQt::Key_M, view, TQ_SLOT( editCell() ), ac, "editCell" ); actions->editCell->setToolTip(i18n("Edit the highlighted cell.")); actions->insertCell = new TDEAction( i18n("Insert Cells..."), "insertcell", - 0, view, TQT_SLOT( slotInsert() ), ac, "insertCell" ); + 0, view, TQ_SLOT( slotInsert() ), ac, "insertCell" ); actions->insertCell->setToolTip(i18n("Insert a blank cell into the spreadsheet.")); actions->removeCell = new TDEAction( i18n("Remove Cells..."), "removecell", - 0, view, TQT_SLOT( slotRemove() ), ac, "removeCell" ); + 0, view, TQ_SLOT( slotRemove() ), ac, "removeCell" ); actions->removeCell->setToolTip(i18n("Removes the current cell from the spreadsheet.")); actions->deleteCell = new TDEAction( i18n("Delete"), "deletecell", - 0, view, TQT_SLOT( deleteSelection() ), ac, "delete" ); + 0, view, TQ_SLOT( deleteSelection() ), ac, "delete" ); actions->deleteCell->setToolTip(i18n("Delete all contents and formatting of the current cell.")); actions->mergeCell = new TDEToolBarPopupAction( i18n("Merge Cells"),"mergecell", - 0, view, TQT_SLOT( mergeCell() ), ac, "mergecell" ); + 0, view, TQ_SLOT( mergeCell() ), ac, "mergecell" ); actions->mergeCell->setToolTip(i18n("Merge the selected region.")); actions->mergeCell->plug( actions->mergeCell->popupMenu() ); actions->mergeCellHorizontal = new TDEAction( i18n("Merge Cells Horizontally"),"mergecell-horizontal", - 0, view, TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); + 0, view, TQ_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); actions->mergeCellHorizontal->setToolTip(i18n("Merge the selected region horizontally.")); actions->mergeCellHorizontal->plug( actions->mergeCell->popupMenu() ); actions->mergeCellVertical = new TDEAction( i18n("Merge Cells Vertically"),"mergecell-vertical", - 0, view, TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); + 0, view, TQ_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); actions->mergeCellVertical->setToolTip(i18n("Merge the selected region vertically.")); actions->mergeCellVertical->plug( actions->mergeCell->popupMenu() ); actions->dissociateCell = new TDEAction( i18n("Dissociate Cells"),"dissociatecell", - 0, view, TQT_SLOT( dissociateCell() ), ac, "dissociatecell" ); + 0, view, TQ_SLOT( dissociateCell() ), ac, "dissociatecell" ); actions->dissociateCell->setToolTip(i18n("Unmerge the selected region.")); actions->clearText = new TDEAction( i18n("Text"), - 0, view, TQT_SLOT( clearTextSelection() ), ac, "cleartext" ); + 0, view, TQ_SLOT( clearTextSelection() ), ac, "cleartext" ); actions->clearText->setToolTip(i18n("Remove the contents of the current cell.")); actions->conditional = new TDEAction( i18n("Conditional Cell Attributes..."), - 0, view, TQT_SLOT( conditional() ), ac, "conditional" ); + 0, view, TQ_SLOT( conditional() ), ac, "conditional" ); actions->conditional->setToolTip(i18n("Set cell format based on certain conditions.")); actions->clearConditional = new TDEAction( i18n("Conditional Cell Attributes"), - 0, view, TQT_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); + 0, view, TQ_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); actions->clearConditional->setToolTip(i18n("Remove the conditional cell formatting.")); actions->validity = new TDEAction( i18n("Validity..."), - 0, view, TQT_SLOT( validity() ), ac, "validity" ); + 0, view, TQ_SLOT( validity() ), ac, "validity" ); actions->validity->setToolTip(i18n("Set tests to confirm cell data is valid.")); actions->clearValidity = new TDEAction( i18n("Validity"), - 0, view, TQT_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); + 0, view, TQ_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); actions->clearValidity->setToolTip(i18n("Remove the validity tests on this cell.")); actions->addModifyComment = new TDEAction( i18n("&Add/Modify Comment..."),"comment", - 0, view, TQT_SLOT( addModifyComment() ), ac, "addmodifycomment" ); + 0, view, TQ_SLOT( addModifyComment() ), ac, "addmodifycomment" ); actions->addModifyComment->setToolTip(i18n("Edit a comment for this cell.")); actions->removeComment = new TDEAction( i18n("&Remove Comment"),"removecomment", - 0, view, TQT_SLOT( removeComment() ), ac, "removecomment" ); + 0, view, TQ_SLOT( removeComment() ), ac, "removecomment" ); actions->removeComment->setToolTip(i18n("Remove this cell's comment.")); actions->clearComment = new TDEAction( i18n("Comment"), - 0, view, TQT_SLOT( clearCommentSelection() ), ac, "clearcomment" ); + 0, view, TQ_SLOT( clearCommentSelection() ), ac, "clearcomment" ); actions->clearComment->setToolTip(i18n("Remove this cell's comment.")); // -- column & row actions -- actions->resizeColumn = new TDEAction( i18n("Resize Column..."), "resizecol", - 0, view, TQT_SLOT( resizeColumn() ), ac, "resizeCol" ); + 0, view, TQ_SLOT( resizeColumn() ), ac, "resizeCol" ); actions->resizeColumn->setToolTip(i18n("Change the width of a column.")); actions->insertColumn = new TDEAction( i18n("Insert Columns"), "insert_table_col", - 0, view, TQT_SLOT( insertColumn() ), ac, "insertColumn" ); + 0, view, TQ_SLOT( insertColumn() ), ac, "insertColumn" ); actions->insertColumn->setToolTip(i18n("Inserts a new column into the spreadsheet.")); actions->deleteColumn = new TDEAction( i18n("Delete Columns"), "delete_table_col", - 0, view, TQT_SLOT( deleteColumn() ), ac, "deleteColumn" ); + 0, view, TQ_SLOT( deleteColumn() ), ac, "deleteColumn" ); actions->deleteColumn->setToolTip(i18n("Removes a column from the spreadsheet.")); actions->hideColumn = new TDEAction( i18n("Hide Columns"), "hide_table_column", - 0, view, TQT_SLOT( hideColumn() ), ac, "hideColumn" ); + 0, view, TQ_SLOT( hideColumn() ), ac, "hideColumn" ); actions->hideColumn->setToolTip(i18n("Hide the column from view.")); actions->showColumn = new TDEAction( i18n("Show Columns..."), "show_table_column", - 0, view, TQT_SLOT( showColumn() ), ac, "showColumn" ); + 0, view, TQ_SLOT( showColumn() ), ac, "showColumn" ); actions->showColumn->setToolTip(i18n("Show hidden columns.")); actions->equalizeColumn = new TDEAction( i18n("Equalize Column"), "adjustcol", - 0, view, TQT_SLOT( equalizeColumn() ), ac, "equalizeCol" ); + 0, view, TQ_SLOT( equalizeColumn() ), ac, "equalizeCol" ); actions->equalizeColumn->setToolTip(i18n("Resizes selected columns to be the same size.")); actions->showSelColumns = new TDEAction( i18n("Show Columns"), "show_sheet_column", - 0, view, TQT_SLOT( showSelColumns() ), ac, "showSelColumns" ); + 0, view, TQ_SLOT( showSelColumns() ), ac, "showSelColumns" ); actions->showSelColumns->setToolTip(i18n("Show hidden columns in the selection.")); actions->showSelColumns->setEnabled(false); actions->resizeRow = new TDEAction( i18n("Resize Row..."), "resizerow", - 0, view, TQT_SLOT( resizeRow() ), ac, "resizeRow" ); + 0, view, TQ_SLOT( resizeRow() ), ac, "resizeRow" ); actions->resizeRow->setToolTip(i18n("Change the height of a row.")); actions->insertRow = new TDEAction( i18n("Insert Rows"), "insert_table_row", - 0, view, TQT_SLOT( insertRow() ), ac, "insertRow" ); + 0, view, TQ_SLOT( insertRow() ), ac, "insertRow" ); actions->insertRow->setToolTip(i18n("Inserts a new row into the spreadsheet.")); actions->deleteRow = new TDEAction( i18n("Delete Rows"), "delete_table_row", - 0, view, TQT_SLOT( deleteRow() ), ac, "deleteRow" ); + 0, view, TQ_SLOT( deleteRow() ), ac, "deleteRow" ); actions->deleteRow->setToolTip(i18n("Removes a row from the spreadsheet.")); actions->hideRow = new TDEAction( i18n("Hide Rows"), "hide_table_row", - 0, view, TQT_SLOT( hideRow() ), ac, "hideRow" ); + 0, view, TQ_SLOT( hideRow() ), ac, "hideRow" ); actions->hideRow->setToolTip(i18n("Hide a row from view.")); actions->showRow = new TDEAction( i18n("Show Rows..."), "show_table_row", - 0, view, TQT_SLOT( showRow() ), ac, "showRow" ); + 0, view, TQ_SLOT( showRow() ), ac, "showRow" ); actions->showRow->setToolTip(i18n("Show hidden rows.")); actions->equalizeRow = new TDEAction( i18n("Equalize Row"), "adjustrow", - 0, view, TQT_SLOT( equalizeRow() ), ac, "equalizeRow" ); + 0, view, TQ_SLOT( equalizeRow() ), ac, "equalizeRow" ); actions->equalizeRow->setToolTip(i18n("Resizes selected rows to be the same size.")); actions->showSelRows = new TDEAction( i18n("Show Rows"), "show_table_row", - 0, view, TQT_SLOT( showSelRows() ), ac, "showSelRows" ); + 0, view, TQ_SLOT( showSelRows() ), ac, "showSelRows" ); actions->showSelRows->setEnabled(false); actions->showSelRows->setToolTip(i18n("Show hidden rows in the selection.")); actions->adjust = new TDEAction( i18n("Adjust Row && Column"), - 0, view, TQT_SLOT( adjust() ), ac, "adjust" ); + 0, view, TQ_SLOT( adjust() ), ac, "adjust" ); actions->adjust->setToolTip(i18n("Adjusts row/column size so that the contents will fit.")); // -- sheet/workbook actions -- actions->sheetProperties = new TDEAction( i18n("Sheet Properties"), - 0, view, TQT_SLOT( sheetProperties() ), ac, "sheetProperties" ); + 0, view, TQ_SLOT( sheetProperties() ), ac, "sheetProperties" ); actions->sheetProperties->setToolTip(i18n("Modify current sheet's properties.")); actions->insertSheet = new TDEAction( i18n("Insert Sheet"),"inserttable", - 0, view, TQT_SLOT( insertSheet() ), ac, "insertSheet" ); + 0, view, TQ_SLOT( insertSheet() ), ac, "insertSheet" ); actions->insertSheet->setToolTip(i18n("Insert a new sheet.")); // same action as insertSheet, but without 'insert' in the caption actions->menuInsertSheet = new TDEAction( i18n("&Sheet"),"inserttable", - 0, view, TQT_SLOT( insertSheet() ), ac, "menuInsertSheet" ); + 0, view, TQ_SLOT( insertSheet() ), ac, "menuInsertSheet" ); actions->menuInsertSheet->setToolTip(i18n("Insert a new sheet.")); actions->removeSheet = new TDEAction( i18n("Remove Sheet"), "delete_table", - 0, view, TQT_SLOT( removeSheet() ), ac, "removeSheet" ); + 0, view, TQ_SLOT( removeSheet() ), ac, "removeSheet" ); actions->removeSheet->setToolTip(i18n("Remove the active sheet.")); actions->renameSheet=new TDEAction( i18n("Rename Sheet..."), - 0, view, TQT_SLOT( slotRename() ), ac, "renameSheet" ); + 0, view, TQ_SLOT( slotRename() ), ac, "renameSheet" ); actions->renameSheet->setToolTip(i18n("Rename the active sheet.")); actions->showSheet = new TDEAction(i18n("Show Sheet..."), - 0, view, TQT_SLOT( showSheet()), ac, "showSheet" ); + 0, view, TQ_SLOT( showSheet()), ac, "showSheet" ); actions->showSheet->setToolTip(i18n("Show a hidden sheet.")); actions->hideSheet = new TDEAction(i18n("Hide Sheet"), - 0, view, TQT_SLOT( hideSheet() ), ac, "hideSheet" ); + 0, view, TQ_SLOT( hideSheet() ), ac, "hideSheet" ); actions->hideSheet->setToolTip(i18n("Hide the active sheet.")); actions->autoFormat = new TDEAction( i18n("AutoFormat..."), - 0, view, TQT_SLOT( sheetFormat() ), ac, "sheetFormat" ); + 0, view, TQ_SLOT( sheetFormat() ), ac, "sheetFormat" ); actions->autoFormat->setToolTip(i18n("Set the worksheet formatting.")); actions->areaName = new TDEAction( i18n("Area Name..."), - 0, view, TQT_SLOT( setAreaName() ), ac, "areaname" ); + 0, view, TQ_SLOT( setAreaName() ), ac, "areaname" ); actions->areaName->setToolTip(i18n("Set a name for a region of the spreadsheet.")); actions->showArea = new TDEAction( i18n("Show Area..."), - 0, view, TQT_SLOT( showAreaName() ), ac, "showArea" ); + 0, view, TQ_SLOT( showAreaName() ), ac, "showArea" ); actions->showArea->setToolTip(i18n("Display a named area.")); actions->insertFunction = new TDEAction( i18n("&Function..."), "funct", - 0, view, TQT_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); + 0, view, TQ_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); actions->insertFunction->setToolTip(i18n("Insert math expression.")); actions->insertSeries = new TDEAction( i18n("&Series..."),"series", - 0, view, TQT_SLOT( insertSeries() ), ac, "series"); + 0, view, TQ_SLOT( insertSeries() ), ac, "series"); actions->insertSeries ->setToolTip(i18n("Insert a series.")); actions->insertLink = new TDEAction( i18n("&Link..."), "insert_link", - 0, view, TQT_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); + 0, view, TQ_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); actions->insertLink->setToolTip(i18n("Insert an Internet hyperlink.")); actions->removeLink = new TDEAction( i18n("&Remove Link"), - 0, view, TQT_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); + 0, view, TQ_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); actions->removeLink->setToolTip(i18n("Remove a link.")); actions->insertSpecialChar = new TDEAction( i18n( "S&pecial Character..." ), "char", - view, TQT_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); + view, TQ_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); actions->insertSpecialChar->setToolTip( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); actions->insertPart = new KoPartSelectAction( i18n("&Object"), "frame_query", - view, TQT_SLOT( insertObject() ), ac, "insertPart"); + view, TQ_SLOT( insertObject() ), ac, "insertPart"); actions->insertPart->setToolTip(i18n("Insert an object from another program.")); actions->insertChartFrame = new TDEToggleAction( i18n("&Chart"), "insert_chart", - 0, view, TQT_SLOT( insertChart() ), ac, "insertChart" ); + 0, view, TQ_SLOT( insertChart() ), ac, "insertChart" ); actions->insertChartFrame->setToolTip(i18n("Insert a chart.")); actions->insertPicture = new TDEAction( i18n("&Picture"), - 0, view, TQT_SLOT( insertPicture() ), ac, "insertPicture" ); + 0, view, TQ_SLOT( insertPicture() ), ac, "insertPicture" ); actions->insertPicture->setToolTip(i18n("Insert a picture.")); #ifndef TQT_NO_SQL actions->insertFromDatabase = new TDEAction( i18n("From &Database..."), - 0, view, TQT_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); + 0, view, TQ_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); actions->insertFromDatabase->setToolTip(i18n("Insert data from a SQL database.")); #endif actions->insertFromTextfile = new TDEAction( i18n("From &Text File..."), - 0, view, TQT_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); + 0, view, TQ_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); actions->insertFromTextfile->setToolTip(i18n("Insert data from a text file to the current cursor position/selection.")); actions->insertFromClipboard = new TDEAction( i18n("From &Clipboard..."), - 0, view, TQT_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); + 0, view, TQ_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); actions->insertFromClipboard->setToolTip(i18n("Insert CSV data from the clipboard to the current cursor position/selection.")); // actions->transform = new TDEAction( i18n("Transform Object..."), "rotate", -// 0, view, TQT_SLOT( transformPart() ), ac, "transform" ); +// 0, view, TQ_SLOT( transformPart() ), ac, "transform" ); // actions->transform->setToolTip(i18n("Rotate the contents of the cell.")); // actions->transform->setEnabled( false ); actions->sort = new TDEAction( i18n("&Sort..."), - 0, view, TQT_SLOT( sort() ), ac, "sort" ); + 0, view, TQ_SLOT( sort() ), ac, "sort" ); actions->sort->setToolTip(i18n("Sort a group of cells.")); actions->sortDec = new TDEAction( i18n("Sort &Decreasing"), "sort_decrease", - 0, view, TQT_SLOT( sortDec() ), ac, "sortDec" ); + 0, view, TQ_SLOT( sortDec() ), ac, "sortDec" ); actions->sortDec->setToolTip(i18n("Sort a group of cells in decreasing (last to first) order.")); actions->sortInc = new TDEAction( i18n("Sort &Increasing"), "sort_incr", - 0, view, TQT_SLOT( sortInc() ), ac, "sortInc" ); + 0, view, TQ_SLOT( sortInc() ), ac, "sortInc" ); actions->sortInc->setToolTip(i18n("Sort a group of cells in ascending (first to last) order.")); actions->paperLayout = new TDEAction( i18n("Page Layout..."), - 0, view, TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); + 0, view, TQ_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout.")); actions->definePrintRange = new TDEAction( i18n("Define Print Range"), - 0, view, TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); + 0, view, TQ_SLOT( definePrintRange() ), ac, "definePrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); actions->resetPrintRange = new TDEAction( i18n("Reset Print Range"), - 0, view, TQT_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); + 0, view, TQ_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); actions->showPageBorders = new TDEToggleAction( i18n("Show Page Borders"), 0, ac, "showPageBorders"); actions->showPageBorders->setCheckedState(i18n("Hide Page Borders")); - TQObject::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( togglePageBorders( bool ) ) ); + TQObject::connect( actions->showPageBorders, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( togglePageBorders( bool ) ) ); actions->showPageBorders->setToolTip( i18n( "Show on the spreadsheet where the page borders will be." ) ); actions->recalcWorksheet = new TDEAction( i18n("Recalculate Sheet"), - TQt::SHIFT + TQt::Key_F9, view, TQT_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); + TQt::SHIFT + TQt::Key_F9, view, TQ_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); actions->recalcWorksheet->setToolTip(i18n("Recalculate the value of every cell in the current worksheet.")); actions->recalcWorkbook = new TDEAction( i18n("Recalculate Document"), - TQt::Key_F9, view, TQT_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); + TQt::Key_F9, view, TQ_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); actions->recalcWorkbook->setToolTip(i18n("Recalculate the value of every cell in all worksheets.")); actions->protectSheet = new TDEToggleAction( i18n( "Protect &Sheet..." ), 0, ac, "protectSheet" ); actions->protectSheet->setToolTip( i18n( "Protect the sheet from being modified." ) ); - TQObject::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( toggleProtectSheet( bool ) ) ); + TQObject::connect( actions->protectSheet, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( toggleProtectSheet( bool ) ) ); actions->protectDoc = new TDEToggleAction( i18n( "Protect &Document..." ), 0, ac, "protectDoc" ); actions->protectDoc->setToolTip( i18n( "Protect the document from being modified." ) ); - TQObject::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( toggleProtectDoc( bool ) ) ); + TQObject::connect( actions->protectDoc, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( toggleProtectDoc( bool ) ) ); // -- editing actions -- - actions->copy = KStdAction::copy( view, TQT_SLOT( copySelection() ), ac, "copy" ); + actions->copy = KStdAction::copy( view, TQ_SLOT( copySelection() ), ac, "copy" ); actions->copy->setToolTip(i18n("Copy the cell object to the clipboard.")); - actions->paste = KStdAction::paste( view, TQT_SLOT( paste() ), ac, "paste" ); + actions->paste = KStdAction::paste( view, TQ_SLOT( paste() ), ac, "paste" ); actions->paste->setToolTip(i18n("Paste the contents of the clipboard at the cursor.")); - actions->cut = KStdAction::cut( view, TQT_SLOT( cutSelection() ), ac, "cut" ); + actions->cut = KStdAction::cut( view, TQ_SLOT( cutSelection() ), ac, "cut" ); actions->cut->setToolTip(i18n("Move the cell object to the clipboard.")); actions->specialPaste = new TDEAction( i18n("Special Paste..."), "special_paste", - 0, view, TQT_SLOT( specialPaste() ), ac, "specialPaste" ); + 0, view, TQ_SLOT( specialPaste() ), ac, "specialPaste" ); actions->specialPaste->setToolTip(i18n("Paste the contents of the clipboard with special options.")); actions->insertCellCopy = new TDEAction( i18n("Paste with Insertion"), "insertcellcopy", - 0, view, TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); + 0, view, TQ_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); actions->insertCellCopy->setToolTip(i18n("Inserts a cell from the clipboard into the spreadsheet.")); - actions->find = KStdAction::find( view, TQT_SLOT(find()), ac ); - /*actions->findNext =*/ KStdAction::findNext( view, TQT_SLOT( findNext() ), ac ); - /*actions->findPrevious =*/ KStdAction::findPrev( view, TQT_SLOT( findPrevious() ), ac ); + actions->find = KStdAction::find( view, TQ_SLOT(find()), ac ); + /*actions->findNext =*/ KStdAction::findNext( view, TQ_SLOT( findNext() ), ac ); + /*actions->findPrevious =*/ KStdAction::findPrev( view, TQ_SLOT( findPrevious() ), ac ); - actions->replace = KStdAction::replace( view, TQT_SLOT(replace()), ac ); + actions->replace = KStdAction::replace( view, TQ_SLOT(replace()), ac ); actions->fillRight = new TDEAction( i18n( "&Right" ), 0, - 0, view, TQT_SLOT( fillRight() ), ac, "fillRight" ); + 0, view, TQ_SLOT( fillRight() ), ac, "fillRight" ); actions->fillLeft = new TDEAction( i18n( "&Left" ), 0, - 0, view, TQT_SLOT( fillLeft() ), ac, "fillLeft" ); + 0, view, TQ_SLOT( fillLeft() ), ac, "fillLeft" ); actions->fillDown = new TDEAction( i18n( "&Down" ), 0, - 0, view, TQT_SLOT( fillDown() ), ac, "fillDown" ); + 0, view, TQ_SLOT( fillDown() ), ac, "fillDown" ); actions->fillUp = new TDEAction( i18n( "&Up" ), 0, - 0, view, TQT_SLOT( fillUp() ), ac, "fillUp" ); + 0, view, TQ_SLOT( fillUp() ), ac, "fillUp" ); // -- misc actions -- actions->styleDialog = new TDEAction( i18n( "Style Manager" ), - 0, view, TQT_SLOT( styleDialog() ), ac, "styles" ); + 0, view, TQ_SLOT( styleDialog() ), ac, "styles" ); actions->styleDialog->setToolTip( i18n( "Edit and organize cell styles." ) ); actions->autoSum = new TDEAction( i18n("Autosum"), "black_sum", - 0, view, TQT_SLOT( autoSum() ), ac, "autoSum" ); + 0, view, TQ_SLOT( autoSum() ), ac, "autoSum" ); actions->autoSum->setToolTip(i18n("Insert the 'sum' function")); - actions->spellChecking = KStdAction::spelling( view, TQT_SLOT( extraSpelling() ), + actions->spellChecking = KStdAction::spelling( view, TQ_SLOT( extraSpelling() ), ac, "spelling" ); actions->spellChecking->setToolTip(i18n("Check the spelling.")); @@ -1013,60 +1013,60 @@ void View::Private::initActions() ((TDESelectAction*) actions->formulaSelection)->setItems( lst ); actions->formulaSelection->setComboWidth( 80 ); actions->formulaSelection->setCurrentItem(0); - TQObject::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), - view, TQT_SLOT( formulaSelection( const TQString& ) ) ); + TQObject::connect( actions->formulaSelection, TQ_SIGNAL( activated( const TQString& ) ), + view, TQ_SLOT( formulaSelection( const TQString& ) ) ); actions->viewZoom = new KoZoomAction( i18n( "Zoom" ), "viewmag", 0, ac, "view_zoom" ); - TQObject::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), - view, TQT_SLOT( viewZoom( const TQString & ) ) ); + TQObject::connect( actions->viewZoom, TQ_SIGNAL( zoomChanged( const TQString & ) ), + view, TQ_SLOT( viewZoom( const TQString & ) ) ); actions->consolidate = new TDEAction( i18n("&Consolidate..."), - 0, view, TQT_SLOT( consolidate() ), ac, "consolidate" ); + 0, view, TQ_SLOT( consolidate() ), ac, "consolidate" ); actions->consolidate->setToolTip(i18n("Create a region of summary data from a group of similar regions.")); actions->goalSeek = new TDEAction( i18n("&Goal Seek..."), - 0, view, TQT_SLOT( goalSeek() ), ac, "goalSeek" ); + 0, view, TQ_SLOT( goalSeek() ), ac, "goalSeek" ); actions->goalSeek->setToolTip( i18n("Repeating calculation to find a specific value.") ); actions->subTotals = new TDEAction( i18n("&Subtotals..."), - 0, view, TQT_SLOT( subtotals() ), ac, "subtotals" ); + 0, view, TQ_SLOT( subtotals() ), ac, "subtotals" ); actions->subTotals->setToolTip( i18n("Create different kind of subtotals to a list or database.") ); actions->textToColumns = new TDEAction( i18n("&Text to Columns..."), - 0, view, TQT_SLOT( textToColumns() ), ac, "textToColumns" ); + 0, view, TQ_SLOT( textToColumns() ), ac, "textToColumns" ); actions->textToColumns->setToolTip( i18n("Expand the content of cells to multiple columns.") ); actions->multipleOperations = new TDEAction( i18n("&Multiple Operations..."), - 0, view, TQT_SLOT( multipleOperations() ), ac, "multipleOperations" ); + 0, view, TQ_SLOT( multipleOperations() ), ac, "multipleOperations" ); actions->multipleOperations->setToolTip( i18n("Apply the same formula to various cells using different values for the parameter.") ); actions->createTemplate = new TDEAction( i18n( "&Create Template From Document..." ), - 0, view, TQT_SLOT( createTemplate() ), ac, "createTemplate" ); + 0, view, TQ_SLOT( createTemplate() ), ac, "createTemplate" ); actions->customList = new TDEAction( i18n("Custom Lists..."), - 0, view, TQT_SLOT( sortList() ), ac, "sortlist" ); + 0, view, TQ_SLOT( sortList() ), ac, "sortlist" ); actions->customList->setToolTip(i18n("Create custom lists for sorting or autofill.")); // -- navigation actions -- actions->gotoCell = new TDEAction( i18n("Goto Cell..."),"goto", - 0, view, TQT_SLOT( gotoCell() ), ac, "gotoCell" ); + 0, view, TQ_SLOT( gotoCell() ), ac, "gotoCell" ); actions->gotoCell->setToolTip(i18n("Move to a particular cell.")); actions->nextSheet = new TDEAction( i18n("Next Sheet"), "forward", - TQt::CTRL+TQt::Key_PageDown, view, TQT_SLOT( nextSheet() ), ac, "nextSheet"); + TQt::CTRL+TQt::Key_PageDown, view, TQ_SLOT( nextSheet() ), ac, "nextSheet"); actions->nextSheet->setToolTip(i18n("Move to the next sheet.")); actions->prevSheet = new TDEAction( i18n("Previous Sheet"), "back", - TQt::CTRL+TQt::Key_PageUp, view, TQT_SLOT( previousSheet() ), ac, "previousSheet"); + TQt::CTRL+TQt::Key_PageUp, view, TQ_SLOT( previousSheet() ), ac, "previousSheet"); actions->prevSheet->setToolTip(i18n("Move to the previous sheet.")); actions->firstSheet = new TDEAction( i18n("First Sheet"), "go-first", - 0, view, TQT_SLOT( firstSheet() ), ac, "firstSheet"); + 0, view, TQ_SLOT( firstSheet() ), ac, "firstSheet"); actions->firstSheet->setToolTip(i18n("Move to the first sheet.")); actions->lastSheet = new TDEAction( i18n("Last Sheet"), "go-last", - 0, view, TQT_SLOT( lastSheet() ), ac, "lastSheet"); + 0, view, TQ_SLOT( lastSheet() ), ac, "lastSheet"); actions->lastSheet->setToolTip(i18n("Move to the last sheet.")); // -- settings actions -- @@ -1074,78 +1074,78 @@ void View::Private::initActions() actions->showStatusBar = new TDEToggleAction( i18n("Show Status Bar"), 0, ac, "showStatusBar" ); actions->showStatusBar->setCheckedState(i18n("Hide Status Bar")); - TQObject::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( showStatusBar( bool ) ) ); + TQObject::connect( actions->showStatusBar, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( showStatusBar( bool ) ) ); actions->showStatusBar->setToolTip(i18n("Show the status bar.")); actions->showTabBar = new TDEToggleAction( i18n("Show Tab Bar"), 0, ac, "showTabBar" ); actions->showTabBar->setCheckedState(i18n("Hide Tab Bar")); - TQObject::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( showTabBar( bool ) ) ); + TQObject::connect( actions->showTabBar, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( showTabBar( bool ) ) ); actions->showTabBar->setToolTip(i18n("Show the tab bar.")); actions->showFormulaBar = new TDEToggleAction( i18n("Show Formula Bar"), 0, ac, "showFormulaBar" ); actions->showFormulaBar->setCheckedState(i18n("Hide Formula Bar")); - TQObject::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( showFormulaBar( bool ) ) ); + TQObject::connect( actions->showFormulaBar, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( showFormulaBar( bool ) ) ); actions->showFormulaBar->setToolTip(i18n("Show the formula bar.")); actions->preference = new TDEAction( i18n("Configure KSpread..."),"configure", - 0, view, TQT_SLOT( preference() ), ac, "preference" ); + 0, view, TQ_SLOT( preference() ), ac, "preference" ); actions->preference->setToolTip(i18n("Set various KSpread options.")); // -- running calculation actions -- actions->calcNone = new TDEToggleAction( i18n("None"), 0, ac, "menu_none"); - TQObject::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcNone, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcNone->setExclusiveGroup( "Calc" ); actions->calcNone->setToolTip(i18n("No calculation")); actions->calcSum = new TDEToggleAction( i18n("Sum"), 0, ac, "menu_sum"); - TQObject::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcSum, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcSum->setExclusiveGroup( "Calc" ); actions->calcSum->setToolTip(i18n("Calculate using sum.")); actions->calcMin = new TDEToggleAction( i18n("Min"), 0, ac, "menu_min"); - TQObject::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcMin, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcMin->setExclusiveGroup( "Calc" ); actions->calcMin->setToolTip(i18n("Calculate using minimum.")); actions->calcMax = new TDEToggleAction( i18n("Max"), 0, ac, "menu_max"); - TQObject::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcMax, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcMax->setExclusiveGroup( "Calc" ); actions->calcMax->setToolTip(i18n("Calculate using maximum.")); actions->calcAverage = new TDEToggleAction( i18n("Average"), 0, ac, "menu_average"); - TQObject::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcAverage, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcAverage->setExclusiveGroup( "Calc" ); actions->calcAverage->setToolTip(i18n("Calculate using average.")); actions->calcCount = new TDEToggleAction( i18n("Count"), 0, ac, "menu_count"); - TQObject::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcCount, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcCount->setExclusiveGroup( "Calc" ); actions->calcCount->setToolTip(i18n("Calculate using the count.")); actions->calcCountA = new TDEToggleAction( i18n("CountA"), 0, ac, "menu_counta"); - TQObject::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcCountA, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcCountA->setExclusiveGroup( "Calc" ); actions->calcCountA->setToolTip(i18n("Calculate using the countA.")); // -- special action, only for developers -- actions->internalTests = new TDEAction( i18n("Run Internal Tests..."), "internalTests", - TQt::CTRL+ TQt::SHIFT + TQt::Key_T, view, TQT_SLOT( runInternalTests() ), ac, "internalTests" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_T, view, TQ_SLOT( runInternalTests() ), ac, "internalTests" ); actions->inspector = new TDEAction( i18n("Run Inspector..."), "inspector", - TQt::CTRL+ TQt::SHIFT + TQt::Key_I, view, TQT_SLOT( runInspector() ), ac, "inspector" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_I, view, TQ_SLOT( runInspector() ), ac, "inspector" ); m_propertyEditor = 0; } @@ -1414,15 +1414,15 @@ KPSheetSelectPage::KPSheetSelectPage( TQWidget *parent ) gui->ListViewSelected->setSorting(-1); //connect buttons - connect(gui->ButtonSelectAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectAll())); - connect(gui->ButtonSelect,TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); - connect(gui->ButtonRemove,TQT_SIGNAL(clicked()),this,TQT_SLOT(remove())); - connect(gui->ButtonRemoveAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeAll())); + connect(gui->ButtonSelectAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectAll())); + connect(gui->ButtonSelect,TQ_SIGNAL(clicked()),this,TQ_SLOT(select())); + connect(gui->ButtonRemove,TQ_SIGNAL(clicked()),this,TQ_SLOT(remove())); + connect(gui->ButtonRemoveAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeAll())); - connect(gui->ButtonMoveTop,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveTop())); - connect(gui->ButtonMoveUp,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveUp())); - connect(gui->ButtonMoveDown,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveDown())); - connect(gui->ButtonMoveBottom,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveBottom())); + connect(gui->ButtonMoveTop,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveTop())); + connect(gui->ButtonMoveUp,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveUp())); + connect(gui->ButtonMoveDown,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveDown())); + connect(gui->ButtonMoveBottom,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveBottom())); } // KPSheetSelectPage::~KPSheetSelectPage() @@ -1750,9 +1750,9 @@ View::View( TQWidget *_parent, const char *_name, d->selection = new Selection( this ); d->choice = new Selection( this ); d->choice->setMultipleSelection(true); - connect(d->selection, TQT_SIGNAL(changed(const Region&)), this, TQT_SLOT(slotChangeSelection(const Region&))); - connect(d->choice, TQT_SIGNAL(changed(const Region&)), this, TQT_SLOT(slotChangeChoice(const Region&))); - connect(d->choice, TQT_SIGNAL(changed(const Region&)), this, TQT_SLOT(slotScrollChoice(const Region&))); + connect(d->selection, TQ_SIGNAL(changed(const Region&)), this, TQ_SLOT(slotChangeSelection(const Region&))); + connect(d->choice, TQ_SIGNAL(changed(const Region&)), this, TQ_SLOT(slotChangeChoice(const Region&))); + connect(d->choice, TQ_SIGNAL(changed(const Region&)), this, TQ_SLOT(slotScrollChoice(const Region&))); d->findOptions = 0; d->findLeftColumn = 0; @@ -1797,8 +1797,8 @@ View::View( TQWidget *_parent, const char *_name, // build the DCOP object dcopObject(); - connect( doc()->commandHistory(), TQT_SIGNAL( commandExecuted() ), - this, TQT_SLOT( commandExecuted() ) ); + connect( doc()->commandHistory(), TQ_SIGNAL( commandExecuted() ), + this, TQ_SLOT( commandExecuted() ) ); // GUI Initializations initView(); @@ -1808,33 +1808,33 @@ View::View( TQWidget *_parent, const char *_name, // Handler for moving and resizing embedded parts KoContainerHandler* h = new KoContainerHandler( this, d->canvas ); - connect( h, TQT_SIGNAL( popupMenu( KoChild*, const TQPoint& ) ), this, TQT_SLOT( popupChildMenu( KoChild*, const TQPoint& ) ) ); + connect( h, TQ_SIGNAL( popupMenu( KoChild*, const TQPoint& ) ), this, TQ_SLOT( popupChildMenu( KoChild*, const TQPoint& ) ) ); - connect( this, TQT_SIGNAL( childSelected( KoDocumentChild* ) ), - this, TQT_SLOT( slotChildSelected( KoDocumentChild* ) ) ); - connect( this, TQT_SIGNAL( childUnselected( KoDocumentChild* ) ), - this, TQT_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); + connect( this, TQ_SIGNAL( childSelected( KoDocumentChild* ) ), + this, TQ_SLOT( slotChildSelected( KoDocumentChild* ) ) ); + connect( this, TQ_SIGNAL( childUnselected( KoDocumentChild* ) ), + this, TQ_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); // If a selected part becomes active this is like it is deselected // just before. - connect( this, TQT_SIGNAL( childActivated( KoDocumentChild* ) ), - this, TQT_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); + connect( this, TQ_SIGNAL( childActivated( KoDocumentChild* ) ), + this, TQ_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); - connect( d->canvas, TQT_SIGNAL( objectSelectedChanged() ), - this, TQT_SLOT( objectSelectedChanged() ) ); + connect( d->canvas, TQ_SIGNAL( objectSelectedChanged() ), + this, TQ_SLOT( objectSelectedChanged() ) ); - TQObject::connect( doc()->map(), TQT_SIGNAL( sig_addSheet( Sheet* ) ), TQT_SLOT( slotAddSheet( Sheet* ) ) ); + TQObject::connect( doc()->map(), TQ_SIGNAL( sig_addSheet( Sheet* ) ), TQ_SLOT( slotAddSheet( Sheet* ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_refreshView( ) ), this, TQT_SLOT( slotRefreshView() ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_refreshView( ) ), this, TQ_SLOT( slotRefreshView() ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_refreshLocale() ), this, TQT_SLOT( refreshLocale())); + TQObject::connect( doc(), TQ_SIGNAL( sig_refreshLocale() ), this, TQ_SLOT( refreshLocale())); - TQObject::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotAddAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQ_SLOT( slotAddAreaName( const TQString & ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotRemoveAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQ_SLOT( slotRemoveAreaName( const TQString & ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( damagesFlushed( const TQValueList<Damage*>& ) ), - this, TQT_SLOT( handleDamages( const TQValueList<Damage*>& ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( damagesFlushed( const TQValueList<Damage*>& ) ), + this, TQ_SLOT( handleDamages( const TQValueList<Damage*>& ) ) ); //KoView::setZoom( doc()->zoomedResolutionY() /* KoView only supports one zoom */ ); // initial value //when kspread is embedded into konqueror apply a zoom=100 @@ -1855,9 +1855,9 @@ View::View( TQWidget *_parent, const char *_name, // This is the last operation for the "View loading" process. // The loading flag will be unset at its end. if ( !doc()->map()->sheetList().isEmpty() ) - TQTimer::singleShot(50, this, TQT_SLOT(initialPosition())); + TQTimer::singleShot(50, this, TQ_SLOT(initialPosition())); - connect (&d->statusBarOpTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(calcStatusBarOp())); + connect (&d->statusBarOpTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(calcStatusBarOp())); } View::~View() @@ -1869,7 +1869,7 @@ View::~View() delete (&*d->transformToolBox); /*if (d->calcLabel) { - disconnect(d->calcLabel,TQT_SIGNAL(pressed( int )),this,TQT_SLOT(statusBarClicked(int))); + disconnect(d->calcLabel,TQ_SIGNAL(pressed( int )),this,TQ_SLOT(statusBarClicked(int))); }*/ @@ -1946,7 +1946,7 @@ void View::initView() d->formulaButton = d->newIconButton( "funct", true, d->toolWidget ); d->formulaBarLayout->addWidget( d->formulaButton ); d->formulaBarLayout->addSpacing( 2 ); - connect( d->formulaButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertMathExpr() ) ); + connect( d->formulaButton, TQ_SIGNAL( clicked() ), TQ_SLOT( insertMathExpr() ) ); d->cancelButton = d->newIconButton( "cancel", true, d->toolWidget ); d->formulaBarLayout->addWidget( d->cancelButton ); @@ -1975,7 +1975,7 @@ void View::initView() TQWidget::setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( d->canvas ); - connect( this, TQT_SIGNAL( invalidated() ), d->canvas, TQT_SLOT( update() ) ); + connect( this, TQ_SIGNAL( invalidated() ), d->canvas, TQ_SLOT( update() ) ); TQWidget* bottomPart = new TQWidget( this ); d->tabScrollBarLayout = new TQHBoxLayout( bottomPart ); @@ -1989,13 +1989,13 @@ void View::initView() d->horzScrollBar->setLineStep(60); //just random guess based on what feels okay d->horzScrollBar->setPageStep(60); - TQObject::connect( d->tabBar, TQT_SIGNAL( tabChanged( const TQString& ) ), this, TQT_SLOT( changeSheet( const TQString& ) ) ); - TQObject::connect( d->tabBar, TQT_SIGNAL( tabMoved( unsigned, unsigned ) ), - this, TQT_SLOT( moveSheet( unsigned, unsigned ) ) ); - TQObject::connect( d->tabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ), - this, TQT_SLOT( popupTabBarMenu( const TQPoint& ) ) ); - TQObject::connect( d->tabBar, TQT_SIGNAL( doubleClicked() ), - this, TQT_SLOT( slotRename() ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( tabChanged( const TQString& ) ), this, TQ_SLOT( changeSheet( const TQString& ) ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( tabMoved( unsigned, unsigned ) ), + this, TQ_SLOT( moveSheet( unsigned, unsigned ) ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( contextMenu( const TQPoint& ) ), + this, TQ_SLOT( popupTabBarMenu( const TQPoint& ) ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( slotRename() ) ); d->viewLayout->setColStretch( 1, 10 ); d->viewLayout->setRowStretch( 2, 10 ); @@ -2011,11 +2011,11 @@ void View::initView() d->calcLabel = sb ? new KStatusBarLabel( TQString(), 0, sb ) : 0; addStatusBarItem( d->calcLabel, 0 ); if (d->calcLabel) - connect(d->calcLabel ,TQT_SIGNAL(itemPressed( int )),this,TQT_SLOT(statusBarClicked(int))); + connect(d->calcLabel ,TQ_SIGNAL(itemPressed( int )),this,TQ_SLOT(statusBarClicked(int))); // signal slot - TQObject::connect( d->vertScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollVert(int) ) ); - TQObject::connect( d->horzScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollHorz(int) ) ); + TQObject::connect( d->vertScrollBar, TQ_SIGNAL( valueChanged(int) ), d->canvas, TQ_SLOT( slotScrollVert(int) ) ); + TQObject::connect( d->horzScrollBar, TQ_SIGNAL( valueChanged(int) ), d->canvas, TQ_SLOT( slotScrollHorz(int) ) ); } @@ -2297,32 +2297,32 @@ void View::startKSpell() } d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), this, - TQT_SLOT( spellCheckerReady() ), + TQ_SLOT( spellCheckerReady() ), doc()->getKSpellConfig() ); d->spell.tdespell->setIgnoreUpperWords( doc()->dontCheckUpperWord() ); d->spell.tdespell->setIgnoreTitleCase( doc()->dontCheckTitleCase() ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellCheckerFinished() ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &, + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellCheckerFinished() ) ); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int) ), - this, TQT_SLOT( spellCheckerMisspelling( const TQString &, + this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &, + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int) ), - this, TQT_SLOT( spellCheckerCorrected( const TQString &, + this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ), - this, TQT_SLOT( spellCheckerDone( const TQString & ) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ), - this, TQT_SLOT( spellCheckerIgnoreAll( const TQString & ) ) ); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( done( const TQString & ) ), + this, TQ_SLOT( spellCheckerDone( const TQString & ) ) ); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( ignoreall (const TQString & ) ), + this, TQ_SLOT( spellCheckerIgnoreAll( const TQString & ) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQ_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); } @@ -3319,10 +3319,10 @@ void View::insertSpecialChar() if ( d->specialCharDlg == 0 ) { d->specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); - connect( d->specialCharDlg, TQT_SIGNAL( insertChar( TQChar, const TQString & ) ), - this, TQT_SLOT( slotSpecialChar( TQChar, const TQString & ) ) ); - connect( d->specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + connect( d->specialCharDlg, TQ_SIGNAL( insertChar( TQChar, const TQString & ) ), + this, TQ_SLOT( slotSpecialChar( TQChar, const TQString & ) ) ); + connect( d->specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); } d->specialCharDlg->show(); } @@ -3331,10 +3331,10 @@ void View::slotSpecialCharDlgClosed() { if ( d->specialCharDlg ) { - disconnect( d->specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - disconnect( d->specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + disconnect( d->specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + disconnect( d->specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); d->specialCharDlg->deleteLater(); d->specialCharDlg = 0L; } @@ -3726,31 +3726,31 @@ void View::addSheet( Sheet * _t ) insertSheet( _t ); // Connect some signals - TQObject::connect( _t, TQT_SIGNAL( sig_refreshView() ), TQT_SLOT( slotRefreshView() ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQObject::connect( _t->print(), TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet *, const Region& ) ), - TQT_SLOT( slotUpdateView( Sheet*, const Region& ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateView( EmbeddedObject* )), TQT_SLOT( slotUpdateView( EmbeddedObject* ) ) ); - - TQObject::connect( _t, TQT_SIGNAL( sig_updateHBorder( Sheet * ) ), - TQT_SLOT( slotUpdateHBorder( Sheet * ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateVBorder( Sheet * ) ), - TQT_SLOT( slotUpdateVBorder( Sheet * ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), - this, TQT_SLOT( slotSheetRenamed( Sheet*, const TQString& ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_SheetHidden( Sheet* ) ), - this, TQT_SLOT( slotSheetHidden( Sheet* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_SheetShown( Sheet* ) ), - this, TQT_SLOT( slotSheetShown( Sheet* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_SheetRemoved( Sheet* ) ), - this, TQT_SLOT( slotSheetRemoved( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_refreshView() ), TQ_SLOT( slotRefreshView() ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateView( Sheet* ) ), TQ_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t->print(), TQ_SIGNAL( sig_updateView( Sheet* ) ), TQ_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateView( Sheet *, const Region& ) ), + TQ_SLOT( slotUpdateView( Sheet*, const Region& ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateView( EmbeddedObject* )), TQ_SLOT( slotUpdateView( EmbeddedObject* ) ) ); + + TQObject::connect( _t, TQ_SIGNAL( sig_updateHBorder( Sheet * ) ), + TQ_SLOT( slotUpdateHBorder( Sheet * ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateVBorder( Sheet * ) ), + TQ_SLOT( slotUpdateVBorder( Sheet * ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), + this, TQ_SLOT( slotSheetRenamed( Sheet*, const TQString& ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_SheetHidden( Sheet* ) ), + this, TQ_SLOT( slotSheetHidden( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_SheetShown( Sheet* ) ), + this, TQ_SLOT( slotSheetShown( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_SheetRemoved( Sheet* ) ), + this, TQ_SLOT( slotSheetRemoved( Sheet* ) ) ); // ########### Why do these signals not send a pointer to the sheet? // This will lead to bugs. - TQObject::connect( _t, TQT_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), - TQT_SLOT( slotUpdateChildGeometry( EmbeddedKOfficeObject* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQT_SLOT( slotMaxColumn( int ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_maxRow( int ) ), d->canvas, TQT_SLOT( slotMaxRow( int ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), + TQ_SLOT( slotUpdateChildGeometry( EmbeddedKOfficeObject* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQ_SLOT( slotMaxColumn( int ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_maxRow( int ) ), d->canvas, TQ_SLOT( slotMaxRow( int ) ) ); if ( !d->loading ) updateBorderButton(); @@ -4487,10 +4487,10 @@ void View::initFindReplace() { KFind* findObj = d->find ? d->find : d->replace; Q_ASSERT( findObj ); - connect(findObj, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); - connect(findObj, TQT_SIGNAL( findNext() ), - this, TQT_SLOT( findNext() ) ); + connect(findObj, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); + connect(findObj, TQ_SIGNAL( findNext() ), + this, TQ_SLOT( findNext() ) ); bool bck = d->findOptions & KFindDialog::FindBackwards; Sheet* currentSheet = d->searchInSheets.currentSheet; @@ -4708,8 +4708,8 @@ void View::replace() d->searchInSheets.currentSheet = activeSheet(); d->searchInSheets.firstSheet = d->searchInSheets.currentSheet; initFindReplace(); - connect( d->replace, TQT_SIGNAL( replace( const TQString &, int, int, int ) ), - this, TQT_SLOT( slotReplace( const TQString &, int, int, int ) ) ); + connect( d->replace, TQ_SIGNAL( replace( const TQString &, int, int, int ) ), + this, TQ_SLOT( slotReplace( const TQString &, int, int, int ) ) ); if ( !doc()->undoLocked() ) { @@ -5600,7 +5600,7 @@ void View::popupChildMenu( KoChild* child, const TQPoint& /*global_pos*/ ) // // d->popupChild = new TQPopupMenu( this ); // -// d->popupChild->insertItem( i18n("Delete Embedded Document"), this, TQT_SLOT( slotPopupDeleteChild() ) ); +// d->popupChild->insertItem( i18n("Delete Embedded Document"), this, TQ_SLOT( slotPopupDeleteChild() ) ); // // d->popupChild->popup( global_pos ); @@ -5660,7 +5660,7 @@ void View::popupColumnMenu( const TQPoint & _point ) } d->actions->resizeColumn->plug( d->popupColumn ); - d->popupColumn->insertItem( i18n("Adjust Column"), this, TQT_SLOT(slotPopupAdjustColumn() ) ); + d->popupColumn->insertItem( i18n("Adjust Column"), this, TQ_SLOT(slotPopupAdjustColumn() ) ); d->popupColumn->insertSeparator(); d->actions->insertColumn->plug( d->popupColumn ); d->actions->deleteColumn->plug( d->popupColumn ); @@ -5709,7 +5709,7 @@ void View::popupColumnMenu( const TQPoint & _point ) } } - TQObject::connect( d->popupColumn, TQT_SIGNAL(activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupColumn, TQ_SIGNAL(activated( int ) ), this, TQ_SLOT( slotActivateTool( int ) ) ); d->popupColumn->popup( _point ); } @@ -5756,7 +5756,7 @@ void View::popupRowMenu( const TQPoint & _point ) } d->actions->resizeRow->plug( d->popupRow ); - d->popupRow->insertItem( i18n("Adjust Row"), this, TQT_SLOT( slotPopupAdjustRow() ) ); + d->popupRow->insertItem( i18n("Adjust Row"), this, TQ_SLOT( slotPopupAdjustRow() ) ); d->popupRow->insertSeparator(); d->actions->insertRow->plug( d->popupRow ); d->actions->deleteRow->plug( d->popupRow ); @@ -5804,7 +5804,7 @@ void View::popupRowMenu( const TQPoint & _point ) } } - TQObject::connect( d->popupRow, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupRow, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivateTool( int ) ) ); d->popupRow->popup( _point ); } @@ -5896,8 +5896,8 @@ void View::slotListChoosePopupMenu( ) } d->popupListChoose->popup( p2 ); - TQObject::connect( d->popupListChoose, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotItemSelected( int ) ) ); + TQObject::connect( d->popupListChoose, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotItemSelected( int ) ) ); } @@ -5995,7 +5995,7 @@ void View::openPopupMenu( const TQPoint & _point ) if (activeSheet()->testListChoose(selectionInfo())) { d->popupMenu->insertSeparator(); - d->popupMenu->insertItem( i18n("Selection List..."), this, TQT_SLOT( slotListChoosePopupMenu() ) ); + d->popupMenu->insertItem( i18n("Selection List..."), this, TQ_SLOT( slotListChoosePopupMenu() ) ); } } @@ -6032,7 +6032,7 @@ void View::openPopupMenu( const TQPoint & _point ) } } - TQObject::connect( d->popupMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivateTool( int ) ) ); } } @@ -6366,9 +6366,9 @@ void View::extraProperties() d->m_propertyEditor = new PropertyEditor( this, "KPrPropertyEditor", d->activeSheet, doc() ); d->m_propertyEditor->setCaption( i18n( "Properties" ) ); - connect( d->m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + connect( d->m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); d->m_propertyEditor->exec(); - disconnect( d->m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + disconnect( d->m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); delete d->m_propertyEditor; d->m_propertyEditor = 0; @@ -7315,7 +7315,7 @@ void View::guiActivateEvent( KParts::GUIActivateEvent *ev ) { /*if (d->calcLabel) { - disconnect(d->calcLabel,TQT_SIGNAL(pressed( int )),this,TQT_SLOT(statusBarClicked(int))); + disconnect(d->calcLabel,TQ_SIGNAL(pressed( int )),this,TQ_SLOT(statusBarClicked(int))); }*/ } } diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index 202da13e1..d7f4432f1 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -60,8 +60,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) grid1->addWidget(button1,0,1); button1->setColor( defst->forecolor ); - connect(button1 , TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( set_fore_color( const TQColor & ) ) ); + connect(button1 , TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( set_fore_color( const TQColor & ) ) ); label2 = new TQLabel(box); grid1->addWidget(label2,1,0); @@ -71,11 +71,11 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) grid1->addWidget(button2,1,1); button2->setColor( defst->backcolor ); - connect(button2 , TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( set_background_color( const TQColor & ) ) ); + connect(button2 , TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( set_background_color( const TQColor & ) ) ); - // connect(button2,TQT_SIGNAL(clicked()),this,TQT_SLOT(set_background_color())); + // connect(button2,TQ_SIGNAL(clicked()),this,TQ_SLOT(set_background_color())); label5 = new TQLabel(box); @@ -155,10 +155,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) grid2->addWidget(button3,0,1); button3->setText(i18n("Help")); - connect(button3,TQT_SIGNAL(clicked()),this,TQT_SLOT(help())); + connect(button3,TQ_SIGNAL(clicked()),this,TQ_SLOT(help())); lay1->addWidget(box); - connect(parent,TQT_SIGNAL(applyButtonPressed()),TQT_SLOT(okButton())); + connect(parent,TQ_SIGNAL(applyButtonPressed()),TQ_SLOT(okButton())); } void ConfigDlg::help() diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 55c16bf6b..92f665e71 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -53,8 +53,8 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char selection_timer = new TQTimer; status_timer = new TQTimer; - connect(status_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(clear_status_label())); - connect(selection_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(selection_timed_out())); + connect(status_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(clear_status_label())); + connect(selection_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(selection_timed_out())); readSettings(); @@ -63,7 +63,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char // Set the window caption/title - // connect(kapp,TQT_SIGNAL(tdedisplayPaletteChanged()),this,TQT_SLOT(set_colors())); + // connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors())); // setCaption( kapp->caption() ); // create help button @@ -75,7 +75,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char pb->setFont( TQFont("times",12,TQFont::Bold,FALSE) ); TQToolTip::add( pb, i18n("KCalc Setup/Help") ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(configclicked()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(configclicked()) ); // Create the display calc_display = new DLabel( this, "display" ); @@ -84,7 +84,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char calc_display->setFocus(); calc_display->setFocusPolicy( TQWidget::StrongFocus ); - connect(calc_display,TQT_SIGNAL(clicked()),this,TQT_SLOT(display_selected())); + connect(calc_display,TQ_SIGNAL(clicked()),this,TQ_SLOT(display_selected())); statusINVLabel = new TQLabel( this, "INV" ); TQ_CHECK_PTR( statusINVLabel ); @@ -113,19 +113,19 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char anglebutton[0]->setText( "&Deg" ) ; anglebutton[0]->setChecked( TRUE); accel->connectItem( accel->insertItem(Key_D + ALT), this , - TQT_SLOT(Deg_Selected()) ); + TQ_SLOT(Deg_Selected()) ); anglebutton[1] = new TQRadioButton( angle_group ); anglebutton[1]->setText( "&Rad" ); accel->connectItem( accel->insertItem(Key_R + ALT), this , - TQT_SLOT(Rad_Selected()) ); + TQ_SLOT(Rad_Selected()) ); anglebutton[2] = new TQRadioButton( angle_group ); anglebutton[2]->setText( "&Gra" ); accel->connectItem( accel->insertItem(Key_G + ALT), this , - TQT_SLOT(Gra_Selected()) ); + TQ_SLOT(Gra_Selected()) ); - connect( angle_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(angle_selected(int)) ); + connect( angle_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(angle_selected(int)) ); ////////////////////////////////////////////////////////////////////// @@ -141,25 +141,25 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char basebutton[0] = new TQRadioButton( base_group ); basebutton[0]->setText( "&Hex" ); accel->connectItem( accel->insertItem(Key_H + ALT), this , - TQT_SLOT(Hex_Selected()) ); + TQ_SLOT(Hex_Selected()) ); basebutton[1] = new TQRadioButton( base_group ); basebutton[1]->setText( "D&ec" ); basebutton[1]->setChecked(TRUE); accel->connectItem( accel->insertItem(Key_E + ALT), this , - TQT_SLOT(Dec_Selected()) ); + TQ_SLOT(Dec_Selected()) ); basebutton[2] = new TQRadioButton( base_group ); basebutton[2]->setText( "&Oct" ); accel->connectItem( accel->insertItem(Key_O + ALT), this , - TQT_SLOT(Oct_Selected()) ); + TQ_SLOT(Oct_Selected()) ); basebutton[3] = new TQRadioButton( base_group); basebutton[3]->setText( "&Bin" ); accel->connectItem( accel->insertItem(Key_B + ALT), this , - TQT_SLOT(Bin_Selected()) ); + TQ_SLOT(Bin_Selected()) ); - connect( base_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(base_selected(int)) ); + connect( base_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(base_selected(int)) ); //////////////////////////////////////////////////////////////////////// // @@ -172,203 +172,203 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char mLargePage = new TQWidget(this); pbhyp = new TQPushButton("Hyp", mSmallPage, "hypbutton" ); - connect( pbhyp, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbhyptoggled(bool))); + connect( pbhyp, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbhyptoggled(bool))); pbhyp->setToggleButton(TRUE); pbinv = new TQPushButton( "Inv", mSmallPage, "InverseButton" ); - connect( pbinv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbinvtoggled(bool))); + connect( pbinv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbinvtoggled(bool))); pbinv->setToggleButton(TRUE); pbA = new TQPushButton("A",mSmallPage, "Abutton" ); - connect( pbA, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbAtoggled(bool))); + connect( pbA, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbAtoggled(bool))); pbA->setToggleButton(TRUE); pbSin = new TQPushButton("Sin",mSmallPage, "Sinbutton" ); - connect( pbSin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbSintoggled(bool))); + connect( pbSin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbSintoggled(bool))); pbSin->setToggleButton(TRUE); pbplusminus = new TQPushButton( "+/-", mSmallPage, "plusminusbutton" ); - connect( pbplusminus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbplusminustoggled(bool))); + connect( pbplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplusminustoggled(bool))); pbplusminus->setToggleButton(TRUE); pbplusminus->setFont(buttonfont); pbB = new TQPushButton("B", mSmallPage, "Bbutton" ); - connect( pbB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbBtoggled(bool))); + connect( pbB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbBtoggled(bool))); pbB->setToggleButton(TRUE); pbCos = new TQPushButton("Cos",mSmallPage, "Cosbutton" ); pbCos->setText( "Cos" ); - connect( pbCos, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbCostoggled(bool))); + connect( pbCos, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCostoggled(bool))); pbCos->setToggleButton(TRUE); pbreci = new TQPushButton("1/x",mSmallPage, "recibutton" ); - connect( pbreci, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbrecitoggled(bool))); + connect( pbreci, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbrecitoggled(bool))); pbreci->setToggleButton(TRUE); pbC = new TQPushButton( "C", mSmallPage, "Cbutton" ); - connect( pbC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbCtoggled(bool))); + connect( pbC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCtoggled(bool))); pbC->setToggleButton(TRUE); pbTan = new TQPushButton("Tan" ,mSmallPage, "Tanbutton" ); - connect( pbTan, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbTantoggled(bool))); + connect( pbTan, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbTantoggled(bool))); pbTan->setToggleButton(TRUE); pbfactorial = new TQPushButton("x!",mSmallPage, "factorialbutton" ); - connect( pbfactorial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbfactorialtoggled(bool))); + connect( pbfactorial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbfactorialtoggled(bool))); pbfactorial->setToggleButton(TRUE); pbD = new TQPushButton("D",mSmallPage, "Dbutton" ); - connect( pbD, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbDtoggled(bool))); + connect( pbD, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbDtoggled(bool))); pbD->setToggleButton(TRUE); pblog = new TQPushButton("Log",mSmallPage, "logbutton" ); - connect( pblog, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pblogtoggled(bool))); + connect( pblog, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblogtoggled(bool))); pblog->setToggleButton(TRUE); pbsquare = new TQPushButton( "x^2", mSmallPage, "squarebutton" ); - connect( pbsquare, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbsquaretoggled(bool))); + connect( pbsquare, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbsquaretoggled(bool))); pbsquare->setToggleButton(TRUE); pbE = new TQPushButton("E",mSmallPage, "Ebutton" ); - connect( pbE, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbEtoggled(bool))); + connect( pbE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbEtoggled(bool))); pbE->setToggleButton(TRUE); pbln = new TQPushButton( "Ln", mSmallPage, "lnbutton" ); - connect( pbln, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pblntoggled(bool))); + connect( pbln, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblntoggled(bool))); pbln->setToggleButton(TRUE); pbpower = new TQPushButton("x^y",mSmallPage, "powerbutton" ); - connect( pbpower, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbpowertoggled(bool))); + connect( pbpower, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpowertoggled(bool))); pbpower->setToggleButton(TRUE); pbF = new TQPushButton("F",mSmallPage, "Fbutton" ); - connect( pbF, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbFtoggled(bool))); + connect( pbF, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbFtoggled(bool))); pbF->setToggleButton(TRUE); pbEE = new TQPushButton("EE",mLargePage, "EEbutton" ); pbEE->setToggleButton(TRUE); - connect( pbEE, TQT_SIGNAL(toggled(bool)), TQT_SLOT(EEtoggled(bool))); + connect( pbEE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(EEtoggled(bool))); pbMR = new TQPushButton("MR",mLargePage, "MRbutton" ); - connect( pbMR, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbMRtoggled(bool))); + connect( pbMR, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMRtoggled(bool))); pbMR->setToggleButton(TRUE); pbMR->setFont(buttonfont); pbMplusminus = new TQPushButton("M+-",mLargePage, "Mplusminusbutton" ); - connect( pbMplusminus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbMplusminustoggled(bool))); + connect( pbMplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMplusminustoggled(bool))); pbMplusminus->setToggleButton(TRUE); pbMC = new TQPushButton("MC",mLargePage, "MCbutton" ); - connect( pbMC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbMCtoggled(bool))); + connect( pbMC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMCtoggled(bool))); pbMC->setToggleButton(TRUE); pbClear = new TQPushButton("C",mLargePage, "Clearbutton" ); - connect( pbClear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbCleartoggled(bool))); + connect( pbClear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCleartoggled(bool))); pbClear->setToggleButton(TRUE); pbAC = new TQPushButton("AC", mLargePage, "ACbutton" ); - connect( pbAC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbACtoggled(bool))); + connect( pbAC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbACtoggled(bool))); pbAC->setToggleButton(TRUE); pb7 = new TQPushButton("7",mLargePage, "7button" ); - connect( pb7, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb7toggled(bool))); + connect( pb7, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb7toggled(bool))); pb7->setToggleButton(TRUE); pb8 = new TQPushButton("8",mLargePage, "8button" ); - connect( pb8, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb8toggled(bool))); + connect( pb8, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb8toggled(bool))); pb8->setToggleButton(TRUE); pb9 = new TQPushButton("9",mLargePage,"9button" ); - connect( pb9, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb9toggled(bool))); + connect( pb9, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb9toggled(bool))); pb9->setToggleButton(TRUE); pbparenopen = new TQPushButton("(",mLargePage, "parenopenbutton" ); - connect( pbparenopen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbparenopentoggled(bool))); + connect( pbparenopen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenopentoggled(bool))); pbparenopen->setToggleButton(TRUE); pbparenclose = new TQPushButton(")",mLargePage, "parenclosebutton" ); - connect( pbparenclose, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbparenclosetoggled(bool))); + connect( pbparenclose, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenclosetoggled(bool))); pbparenclose->setToggleButton(TRUE); pband = new TQPushButton("And",mLargePage, "andbutton" ); - connect( pband, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbandtoggled(bool))); + connect( pband, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbandtoggled(bool))); pband->setToggleButton(TRUE); pband->setFont(buttonfont); pb4 = new TQPushButton("4",mLargePage, "4button" ); - connect( pb4, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb4toggled(bool))); + connect( pb4, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb4toggled(bool))); pb4->setToggleButton(TRUE); pb5 = new TQPushButton("5",mLargePage, "5button" ); - connect( pb5, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb5toggled(bool))); + connect( pb5, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb5toggled(bool))); pb5->setToggleButton(TRUE); pb6 = new TQPushButton("6",mLargePage, "6button" ); - connect( pb6, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb6toggled(bool))); + connect( pb6, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb6toggled(bool))); pb6->setToggleButton(TRUE); pbX = new TQPushButton("X",mLargePage, "Multiplybutton" ); - connect( pbX, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbXtoggled(bool))); + connect( pbX, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbXtoggled(bool))); pbX->setToggleButton(TRUE); pbdivision = new TQPushButton("/",mLargePage, "divisionbutton" ); - connect( pbdivision, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbdivisiontoggled(bool))); + connect( pbdivision, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbdivisiontoggled(bool))); pbdivision->setToggleButton(TRUE); pbor = new TQPushButton("Or",mLargePage, "orbutton" ); - connect( pbor, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbortoggled(bool))); + connect( pbor, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbortoggled(bool))); pbor->setToggleButton(TRUE); pb1 = new TQPushButton("1",mLargePage, "1button" ); - connect( pb1, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb1toggled(bool))); + connect( pb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb1toggled(bool))); pb1->setToggleButton(TRUE); pb2 = new TQPushButton("2",mLargePage, "2button" ); - connect( pb2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb2toggled(bool))); + connect( pb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb2toggled(bool))); pb2->setToggleButton(TRUE); pb3 = new TQPushButton("3",mLargePage, "3button" ); - connect( pb3, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb3toggled(bool))); + connect( pb3, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb3toggled(bool))); pb3->setToggleButton(TRUE); pbplus = new TQPushButton("+",mLargePage, "plusbutton" ); - connect( pbplus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbplustoggled(bool))); + connect( pbplus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplustoggled(bool))); pbplus->setToggleButton(TRUE); pbminus = new TQPushButton("-",mLargePage, "minusbutton" ); - connect( pbminus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbminustoggled(bool))); + connect( pbminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbminustoggled(bool))); pbminus->setToggleButton(TRUE); pbshift = new TQPushButton("Lsh",mLargePage, "shiftbutton" ); - connect( pbshift, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbshifttoggled(bool))); + connect( pbshift, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbshifttoggled(bool))); pbshift->setToggleButton(TRUE); pbperiod = new TQPushButton(".",mLargePage, "periodbutton" ); - connect( pbperiod, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbperiodtoggled(bool))); + connect( pbperiod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbperiodtoggled(bool))); pbperiod->setToggleButton(TRUE); pb0 = new TQPushButton("0",mLargePage, "0button" ); - connect( pb0, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb0toggled(bool))); + connect( pb0, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb0toggled(bool))); pb0->setToggleButton(TRUE); pbequal = new TQPushButton("=",mLargePage, "equalbutton" ); - connect( pbequal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbequaltoggled(bool))); + connect( pbequal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbequaltoggled(bool))); pbequal->setToggleButton(TRUE); pbpercent = new TQPushButton("%",mLargePage, "percentbutton" ); - connect( pbpercent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbpercenttoggled(bool))); + connect( pbpercent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpercenttoggled(bool))); pbpercent->setToggleButton(TRUE); pbnegate = new TQPushButton("Cmp",mLargePage, "OneComplementbutton" ); - connect( pbnegate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbnegatetoggled(bool))); + connect( pbnegate, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbnegatetoggled(bool))); pbnegate->setToggleButton(TRUE); pbmod = new TQPushButton("Mod",mLargePage, "modbutton" ); - connect( pbmod, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbmodtoggled(bool))); + connect( pbmod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbmodtoggled(bool))); pbmod->setToggleButton(TRUE); TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 3, 0, diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp index 31e8ea781..b791f36a1 100644 --- a/kspread/plugins/calculator/main.cpp +++ b/kspread/plugins/calculator/main.cpp @@ -87,7 +87,7 @@ Calculator::Calculator( View* parent, const char* name ) parent->installEventFilter( this ); (void)new TDEAction( i18n("Calculator"), SmallIcon("kcalc", CalcFactory::global()), - 0, this, TQT_SLOT( showCalculator() ), actionCollection(), "kspreadcalc"); + 0, this, TQ_SLOT( showCalculator() ), actionCollection(), "kspreadcalc"); } void Calculator::showCalculator() diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp index 0311c9137..5b8607d95 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp @@ -48,11 +48,11 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name) this->m_startDateWidget->setDate(first_day_in_month); this->m_endDateWidget->setDate(last_day_in_month); - connect(this->m_selectStartDateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showStartDatePicker())); - connect(this->m_selectEndDateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showEndDatePicker())); + connect(this->m_selectStartDateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showStartDatePicker())); + connect(this->m_selectEndDateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showEndDatePicker())); - connect(this->m_insertButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); - connect(this->m_cancelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(this->m_insertButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); + connect(this->m_cancelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); } InsertCalendarDialog::~InsertCalendarDialog() @@ -73,7 +73,7 @@ bool InsertCalendarDialog::buildDatePickerFrame() if (!m_datePicker) return false; - connect(m_datePicker,TQT_SIGNAL(destroyed()),this,TQT_SLOT(datePickerDeleted())); + connect(m_datePicker,TQ_SIGNAL(destroyed()),this,TQ_SLOT(datePickerDeleted())); m_datePicker->setCloseButton(true); m_datePicker->move(this->x()+this->width(),this->y()); @@ -109,8 +109,8 @@ void InsertCalendarDialog::showStartDatePicker() { if (buildDatePickerFrame()) { - connect(m_datePicker,TQT_SIGNAL(dateSelected(TQDate)),this,TQT_SLOT(setStartDate(TQDate))); - connect(m_datePicker,TQT_SIGNAL(dateEntered(TQDate)),this,TQT_SLOT(setStartDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateSelected(TQDate)),this,TQ_SLOT(setStartDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateEntered(TQDate)),this,TQ_SLOT(setStartDate(TQDate))); m_datePicker->setDate(startDate()); } } @@ -119,8 +119,8 @@ void InsertCalendarDialog::showEndDatePicker() { if (buildDatePickerFrame()) { - connect(m_datePicker,TQT_SIGNAL(dateSelected(TQDate)),this,TQT_SLOT(setEndDate(TQDate))); - connect(m_datePicker,TQT_SIGNAL(dateEntered(TQDate)),this,TQT_SLOT(setEndDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateSelected(TQDate)),this,TQ_SLOT(setEndDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateEntered(TQDate)),this,TQ_SLOT(setEndDate(TQDate))); m_datePicker->setDate(endDate()); } } diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp index e2f9d954c..a38bd135e 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp @@ -74,7 +74,7 @@ PluginInsertCalendar::PluginInsertCalendar( TQObject *parent, const char *name, this->m_dialog = NULL; (void)new TDEAction( i18n("Insert Calendar..."), TDEShortcut::null(), - this, TQT_SLOT( slotShowDialog() ), actionCollection(), "kspreadinsertcalendar"); + this, TQ_SLOT( slotShowDialog() ), actionCollection(), "kspreadinsertcalendar"); } PluginInsertCalendar::~PluginInsertCalendar() @@ -106,8 +106,8 @@ void PluginInsertCalendar::slotShowDialog() Q_ASSERT(m_dialog); - connect(m_dialog,TQT_SIGNAL(insertCalendar(const TQDate&, const TQDate&)), - this,TQT_SLOT(slotInsertCalendar(const TQDate&, const TQDate&))); + connect(m_dialog,TQ_SIGNAL(insertCalendar(const TQDate&, const TQDate&)), + this,TQ_SLOT(slotInsertCalendar(const TQDate&, const TQDate&))); } //@todo if anyone knows a better way to get a background window to foreground, please change this... diff --git a/kspread/plugins/scripting/scripting.cpp b/kspread/plugins/scripting/scripting.cpp index 4bc3f1a65..2286ebdfc 100644 --- a/kspread/plugins/scripting/scripting.cpp +++ b/kspread/plugins/scripting/scripting.cpp @@ -58,13 +58,13 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) setXMLFile(locate("data","kspread/kpartplugins/scripting.rc"), true); - new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); - new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts"); TDEAction* scriptmenuaction = m_scriptguiclient->action("installedscripts"); actionCollection()->insert(scriptmenuaction); - connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQ_SLOT(executionFinished(const Kross::Api::ScriptAction*))); Kross::Api::Manager::scriptManager()->addTQObject(m_view->doc(), "KSpreadDocument"); Kross::Api::Manager::scriptManager()->addTQObject(m_view, "KSpreadView"); diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py index a72c5f6c7..70f0918f6 100755 --- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py +++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py @@ -81,7 +81,7 @@ class Dialog(tqt.TQDialog): filelabel = tqt.TQLabel("File:",filebox) self.fileedit = tqt.TQLineEdit(self.getDefaultFile(),filebox) btn = tqt.TQPushButton("...",filebox) - tqt.TQObject.connect(btn, tqt.SIGNAL("clicked()"),self.browseClicked) + tqt.TQObject.connect(btn, tqt.TQ_SIGNAL("clicked()"),self.browseClicked) filelabel.setBuddy(self.fileedit) filebox.setStretchFactor(self.fileedit,1) @@ -90,10 +90,10 @@ class Dialog(tqt.TQDialog): okbtn = tqt.TQPushButton(btnbox) okbtn.setText("Export") okbtn.setDefault(True) - tqt.TQObject.connect(okbtn,tqt.SIGNAL("clicked()"),self.startExport) + tqt.TQObject.connect(okbtn,tqt.TQ_SIGNAL("clicked()"),self.startExport) cancelbtn = tqt.TQPushButton(btnbox) cancelbtn.setText("Cancel") - tqt.TQObject.connect(cancelbtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close) box.setMinimumWidth(480) diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index 229598093..795c35eab 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -63,7 +63,7 @@ class FileWidget(Widget): self.edit = tqt.TQLineEdit(self) self.setStretchFactor(self.edit,1) btn = tqt.TQPushButton("...",self) - tqt.TQObject.connect(btn, tqt.SIGNAL("clicked()"), self.btnClicked) + tqt.TQObject.connect(btn, tqt.TQ_SIGNAL("clicked()"), self.btnClicked) def btnClicked(self): from TQt import tqt text = str( self.edit.text() ) @@ -607,7 +607,7 @@ class Samples: ' tqt.TQDialog.__init__(self, parent, "MyDialog", 1, tqt.TQt.WDestructiveClose)', ' self.setCaption("My Dialog")', ' btn = tqt.TQPushButton("Click me",self)', - ' tqt.TQObject.connect(btn, tqt.SIGNAL("clicked()"), self.buttonClicked)', + ' tqt.TQObject.connect(btn, tqt.TQ_SIGNAL("clicked()"), self.buttonClicked)', ' def buttonClicked(self):', ' from TQt import tqt', ' tqt.TQMessageBox.information(self, "The Caption", "This is the message string.")', @@ -800,10 +800,10 @@ class SampleDialog(tqt.TQDialog): btnbox.setSpacing(6) okbtn = tqt.TQPushButton(btnbox) okbtn.setText("Ok") - tqt.TQObject.connect(okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) cancelbtn = tqt.TQPushButton(btnbox) cancelbtn.setText("Cancel") - tqt.TQObject.connect(cancelbtn, tqt.SIGNAL("clicked()"), self.close) + tqt.TQObject.connect(cancelbtn, tqt.TQ_SIGNAL("clicked()"), self.close) self.setCaption(self.samplechild.name) box.setMinimumSize(tqt.TQSize(500,340)) @@ -851,7 +851,7 @@ class MainDialog(tqt.TQDialog): self.scripttext = tqt.TQMultiLineEdit(splitter) self.scripttext.setWordWrap( tqt.TQTextEdit.NoWrap ) self.scripttext.setTextFormat( tqt.TQt.PlainText ) - tqt.TQObject.connect(self.scripttext, tqt.SIGNAL("cursorPositionChanged(int,int)"),self.cursorPositionChanged) + tqt.TQObject.connect(self.scripttext, tqt.TQ_SIGNAL("cursorPositionChanged(int,int)"),self.cursorPositionChanged) self.console = tqt.TQTextBrowser(splitter) splitter.setResizeMode(self.console, tqt.TQSplitter.KeepSize) @@ -869,71 +869,71 @@ class MainDialog(tqt.TQDialog): menu.insertItem("&File", filemenu) newaction = tqt.TQAction("New", tqt.TQKeySequence("CTRL+N"), self) - tqt.TQObject.connect(newaction, tqt.SIGNAL("activated()"), self.newFile) + tqt.TQObject.connect(newaction, tqt.TQ_SIGNAL("activated()"), self.newFile) newaction.addTo(filemenu) openaction = tqt.TQAction("Open...", tqt.TQKeySequence("CTRL+O"), self) - tqt.TQObject.connect(openaction, tqt.SIGNAL("activated()"), self.openFileAs) + tqt.TQObject.connect(openaction, tqt.TQ_SIGNAL("activated()"), self.openFileAs) openaction.addTo(filemenu) saveaction = tqt.TQAction("Save", tqt.TQKeySequence("CTRL+S"), self) - tqt.TQObject.connect(saveaction, tqt.SIGNAL("activated()"), self.saveFile) + tqt.TQObject.connect(saveaction, tqt.TQ_SIGNAL("activated()"), self.saveFile) saveaction.addTo(filemenu) saveasaction = tqt.TQAction("Save as...", tqt.TQKeySequence("CTRL+A"), self) - tqt.TQObject.connect(saveasaction, tqt.SIGNAL("activated()"), self.saveFileAs) + tqt.TQObject.connect(saveasaction, tqt.TQ_SIGNAL("activated()"), self.saveFileAs) saveasaction.addTo(filemenu) filemenu.insertSeparator() quitaction = tqt.TQAction("Quit", tqt.TQKeySequence("CTRL+Q"), self) - tqt.TQObject.connect(quitaction, tqt.SIGNAL("activated()"), self.close) + tqt.TQObject.connect(quitaction, tqt.TQ_SIGNAL("activated()"), self.close) quitaction.addTo(filemenu) editmenu = tqt.TQPopupMenu(menu) menu.insertItem("&Edit", editmenu) undoaction = tqt.TQAction("Undo", tqt.TQKeySequence("CTRL+Z"), self) - tqt.TQObject.connect(undoaction, tqt.SIGNAL("activated()"), self.scripttext.undo) + tqt.TQObject.connect(undoaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.undo) undoaction.addTo(editmenu) redoaction = tqt.TQAction("Redo", tqt.TQKeySequence("CTRL+Shift+Z"), self) - tqt.TQObject.connect(redoaction, tqt.SIGNAL("activated()"), self.scripttext.redo) + tqt.TQObject.connect(redoaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.redo) redoaction.addTo(editmenu) editmenu.insertSeparator() cutaction = tqt.TQAction("Cut", tqt.TQKeySequence("CTRL+X"), self) - tqt.TQObject.connect(cutaction, tqt.SIGNAL("activated()"), self.scripttext.cut) + tqt.TQObject.connect(cutaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.cut) cutaction.addTo(editmenu) copyaction = tqt.TQAction("Copy", tqt.TQKeySequence("CTRL+C"), self) - tqt.TQObject.connect(copyaction, tqt.SIGNAL("activated()"), self.scripttext.copy) + tqt.TQObject.connect(copyaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.copy) copyaction.addTo(editmenu) pasteaction = tqt.TQAction("Paste", tqt.TQKeySequence("CTRL+V"), self) - tqt.TQObject.connect(pasteaction, tqt.SIGNAL("activated()"), self.scripttext.paste) + tqt.TQObject.connect(pasteaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.paste) pasteaction.addTo(editmenu) clearaction = tqt.TQAction("Clear", tqt.TQKeySequence("CTRL+Shift+X"), self) - tqt.TQObject.connect(clearaction, tqt.SIGNAL("activated()"), self.scripttext.clear) + tqt.TQObject.connect(clearaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.clear) clearaction.addTo(editmenu) editmenu.insertSeparator() selallaction = tqt.TQAction("Select All", 0, self) - tqt.TQObject.connect(selallaction, tqt.SIGNAL("activated()"), self.scripttext.selectAll) + tqt.TQObject.connect(selallaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.selectAll) selallaction.addTo(editmenu) scriptmenu = tqt.TQPopupMenu(menu) menu.insertItem("&Script", scriptmenu) compileaction = tqt.TQAction("Compile", tqt.TQKeySequence("F9"), self) - tqt.TQObject.connect(compileaction, tqt.SIGNAL("activated()"), self.compileScript) + tqt.TQObject.connect(compileaction, tqt.TQ_SIGNAL("activated()"), self.compileScript) compileaction.addTo(scriptmenu) executeaction = tqt.TQAction("Execute", tqt.TQKeySequence("F10"), self) - tqt.TQObject.connect(executeaction, tqt.SIGNAL("activated()"), self.executeScript) + tqt.TQObject.connect(executeaction, tqt.TQ_SIGNAL("activated()"), self.executeScript) executeaction.addTo(scriptmenu) self.samplemenu = tqt.TQPopupMenu(menu) @@ -944,7 +944,7 @@ class MainDialog(tqt.TQDialog): if samplename.startswith("_"): continue itemid += 1 menu = tqt.TQPopupMenu(self.samplemenu) - tqt.TQObject.connect(menu, tqt.SIGNAL("activated(int)"), self.sampleActivated) + tqt.TQObject.connect(menu, tqt.TQ_SIGNAL("activated(int)"), self.sampleActivated) self.samplemenu.insertItem(samplename, menu, -1, self.samplemenu.count() - 1) attr = getattr(Samples,samplename) for a in dir(attr): diff --git a/kspread/tests/testrunner.cpp b/kspread/tests/testrunner.cpp index d16dc1661..984353049 100644 --- a/kspread/tests/testrunner.cpp +++ b/kspread/tests/testrunner.cpp @@ -77,7 +77,7 @@ TestRunner::TestRunner(): layout->addMultiCellWidget( d->logView, 2, 2, 0, 3 ); d->logView->setTextFormat( TQt::LogText ); - TQObject::connect( d->runButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( runTest() ) ); + TQObject::connect( d->runButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( runTest() ) ); // add all tests here !! addTester( new ValueTester() ); diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index bd4d1bef3..68d3cdc52 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -48,8 +48,8 @@ KudesignerDoc::KudesignerDoc( TQWidget *parentWidget, const char *widgetName, TQ setTemplateType("kudesigner_template"); history = new KoCommandHistory( actionCollection() ); - // connect( history, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) ); - // connect( history, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); + // connect( history, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( slotDocumentRestored() ) ); + // connect( history, TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( slotCommandExecuted() ) ); docCanvas = new Kudesigner::Canvas( 100, 100 ); emit canvasChanged( docCanvas ); } diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index 83d150e11..d38e0da37 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -106,8 +106,8 @@ KudesignerView::KudesignerView( KudesignerDoc* part, TQWidget* parent, const cha if ( m_doc->plugin() ) { - // connect( m_propertyEditor, TQT_SIGNAL(createPluggedInEditor(TQWidget*&, Editor *, Property*, Box *)), - // m_doc->plugin(), TQT_SLOT(createPluggedInEditor(TQWidget*&, Editor *, Property*, Box *))); + // connect( m_propertyEditor, TQ_SIGNAL(createPluggedInEditor(TQWidget*&, Editor *, Property*, Box *)), + // m_doc->plugin(), TQ_SLOT(createPluggedInEditor(TQWidget*&, Editor *, Property*, Box *))); kdDebug() << "*************Property and plugin have been connected" << endl; } @@ -117,33 +117,33 @@ KudesignerView::KudesignerView( KudesignerDoc* part, TQWidget* parent, const cha m_structure->setDocument( m_doc->canvas() ); - connect( m_doc, TQT_SIGNAL( canvasChanged( Kudesigner::Canvas * ) ), - m_structure, TQT_SLOT( setDocument( Kudesigner::Canvas * ) ) ); - connect( m_doc->canvas(), TQT_SIGNAL( structureModified() ), - m_structure, TQT_SLOT( refresh() ) ); + connect( m_doc, TQ_SIGNAL( canvasChanged( Kudesigner::Canvas * ) ), + m_structure, TQ_SLOT( setDocument( Kudesigner::Canvas * ) ) ); + connect( m_doc->canvas(), TQ_SIGNAL( structureModified() ), + m_structure, TQ_SLOT( refresh() ) ); - connect( m_view, TQT_SIGNAL( selectionMade( Buffer* ) ), - this, TQT_SLOT( populateProperties( Buffer* ) ) ); + connect( m_view, TQ_SIGNAL( selectionMade( Buffer* ) ), + this, TQ_SLOT( populateProperties( Buffer* ) ) ); - connect( m_view, TQT_SIGNAL( selectionClear() ), - m_propertyEditor, TQT_SLOT( clear() ) ); + connect( m_view, TQ_SIGNAL( selectionClear() ), + m_propertyEditor, TQ_SLOT( clear() ) ); - connect( m_view, TQT_SIGNAL( changed() ), - m_doc, TQT_SLOT( setModified() ) ); + connect( m_view, TQ_SIGNAL( changed() ), + m_doc, TQ_SLOT( setModified() ) ); - connect( m_view, TQT_SIGNAL( selectionMade( Buffer* ) ), - m_structure, TQT_SLOT( selectionMade() ) ); - connect( m_view, TQT_SIGNAL( selectionClear() ), - m_structure, TQT_SLOT( selectionClear() ) ); + connect( m_view, TQ_SIGNAL( selectionMade( Buffer* ) ), + m_structure, TQ_SLOT( selectionMade() ) ); + connect( m_view, TQ_SIGNAL( selectionClear() ), + m_structure, TQ_SLOT( selectionClear() ) ); - connect( m_view, TQT_SIGNAL( selectedActionProcessed() ), this, TQT_SLOT( unselectItemAction() ) ); - connect( m_view, TQT_SIGNAL( modificationPerformed() ), part, TQT_SLOT( setModified() ) ); - connect( m_view, TQT_SIGNAL( itemPlaced( int, int, int, int ) ), this, TQT_SLOT( placeItem( int, int, int, int ) ) ); + connect( m_view, TQ_SIGNAL( selectedActionProcessed() ), this, TQ_SLOT( unselectItemAction() ) ); + connect( m_view, TQ_SIGNAL( modificationPerformed() ), part, TQ_SLOT( setModified() ) ); + connect( m_view, TQ_SIGNAL( itemPlaced( int, int, int, int ) ), this, TQ_SLOT( placeItem( int, int, int, int ) ) ); gridLabel = new TQLabel( i18n( "Grid size:" ), shell() ); gridBox = new TQSpinBox( 1, 100, 1, shell() ); gridBox->setValue( 10 ); - connect( gridBox, TQT_SIGNAL( valueChanged( int ) ), m_view, TQT_SLOT( setGridSize( int ) ) ); + connect( gridBox, TQ_SIGNAL( valueChanged( int ) ), m_view, TQ_SLOT( setGridSize( int ) ) ); initActions(); @@ -178,50 +178,50 @@ void KudesignerView::resizeEvent( TQResizeEvent* /*_ev*/ ) void KudesignerView::initActions() { - cutAction = KStdAction::cut( this, TQT_SLOT( cut() ), actionCollection() ); - copyAction = KStdAction::copy( this, TQT_SLOT( copy() ), actionCollection() ); - pasteAction = KStdAction::paste( this, TQT_SLOT( paste() ), actionCollection() ); - selectAllAction = KStdAction::selectAll( this, TQT_SLOT( selectAll() ), actionCollection() ); + cutAction = KStdAction::cut( this, TQ_SLOT( cut() ), actionCollection() ); + copyAction = KStdAction::copy( this, TQ_SLOT( copy() ), actionCollection() ); + pasteAction = KStdAction::paste( this, TQ_SLOT( paste() ), actionCollection() ); + selectAllAction = KStdAction::selectAll( this, TQ_SLOT( selectAll() ), actionCollection() ); deleteAction = new TDEAction( i18n( "Delete" ), "edit-delete", 0, this, - TQT_SLOT( deleteItems() ), actionCollection(), "edit_delete" ); + TQ_SLOT( deleteItems() ), actionCollection(), "edit_delete" ); cutAction->setEnabled( false ); copyAction->setEnabled( false ); pasteAction->setEnabled( false ); // deleteAction->setEnabled(false); sectionsReportHeader = new TDEAction( i18n( "Report Header" ), "irh", 0, this, - TQT_SLOT( slotAddReportHeader() ), actionCollection(), "rheader" ); + TQ_SLOT( slotAddReportHeader() ), actionCollection(), "rheader" ); sectionsReportFooter = new TDEAction( i18n( "Report Footer" ), "irf", 0, this, - TQT_SLOT( slotAddReportFooter() ), actionCollection(), "rfooter" ); + TQ_SLOT( slotAddReportFooter() ), actionCollection(), "rfooter" ); sectionsPageHeader = new TDEAction( i18n( "Page Header" ), "iph", 0, this, - TQT_SLOT( slotAddPageHeader() ), actionCollection(), "pheader" ); + TQ_SLOT( slotAddPageHeader() ), actionCollection(), "pheader" ); sectionsPageFooter = new TDEAction( i18n( "Page Footer" ), "ipf", 0, this, - TQT_SLOT( slotAddPageFooter() ), actionCollection(), "pfooter" ); + TQ_SLOT( slotAddPageFooter() ), actionCollection(), "pfooter" ); sectionsDetailHeader = new TDEAction( i18n( "Detail Header" ), "idh", 0, this, - TQT_SLOT( slotAddDetailHeader() ), actionCollection(), "dheader" ); + TQ_SLOT( slotAddDetailHeader() ), actionCollection(), "dheader" ); sectionsDetail = new TDEAction( i18n( "Detail" ), "id", 0, this, - TQT_SLOT( slotAddDetail() ), actionCollection(), "detail" ); + TQ_SLOT( slotAddDetail() ), actionCollection(), "detail" ); sectionsDetailFooter = new TDEAction( i18n( "Detail Footer" ), "idf", 0, this, - TQT_SLOT( slotAddDetailFooter() ), actionCollection(), "dfooter" ); + TQ_SLOT( slotAddDetailFooter() ), actionCollection(), "dfooter" ); itemsNothing = new TDERadioAction( i18n( "Clear Selection" ), "frame_edit", 0, this, - TQT_SLOT( slotAddItemNothing() ), actionCollection(), "nothing" ); + TQ_SLOT( slotAddItemNothing() ), actionCollection(), "nothing" ); itemsNothing->setExclusiveGroup( "itemsToolBar" ); itemsNothing->setChecked( true ); itemsLabel = new TDERadioAction( i18n( "Label" ), "frame_text", 0, this, - TQT_SLOT( slotAddItemLabel() ), actionCollection(), "label" ); + TQ_SLOT( slotAddItemLabel() ), actionCollection(), "label" ); itemsLabel->setExclusiveGroup( "itemsToolBar" ); itemsField = new TDERadioAction( i18n( "Field" ), "frame_field", 0, this, - TQT_SLOT( slotAddItemField() ), actionCollection(), "field" ); + TQ_SLOT( slotAddItemField() ), actionCollection(), "field" ); itemsField->setExclusiveGroup( "itemsToolBar" ); itemsSpecial = new TDERadioAction( i18n( "Special Field" ), "frame_query", 0, this, - TQT_SLOT( slotAddItemSpecial() ), actionCollection(), "special" ); + TQ_SLOT( slotAddItemSpecial() ), actionCollection(), "special" ); itemsSpecial->setExclusiveGroup( "itemsToolBar" ); itemsCalculated = new TDERadioAction( i18n( "Calculated Field" ), "frame_formula", 0, this, - TQT_SLOT( slotAddItemCalculated() ), actionCollection(), "calcfield" ); + TQ_SLOT( slotAddItemCalculated() ), actionCollection(), "calcfield" ); itemsCalculated->setExclusiveGroup( "itemsToolBar" ); itemsLine = new TDERadioAction( i18n( "Line" ), "frame_chart", 0, this, - TQT_SLOT( slotAddItemLine() ), actionCollection(), "line" ); + TQ_SLOT( slotAddItemLine() ), actionCollection(), "line" ); itemsLine->setExclusiveGroup( "itemsToolBar" ); gridActionLabel = new KWidgetAction( gridLabel, i18n( "Grid Label" ), 0, this, @@ -246,7 +246,7 @@ void KudesignerView::guiActivateEvent( KParts::GUIActivateEvent *ev ) void KudesignerView::populateProperties( Buffer *buf ) { - connect( buf, TQT_SIGNAL( propertyChanged() ), m_doc->canvas(), TQT_SLOT( changed() ) ); + connect( buf, TQ_SIGNAL( propertyChanged() ), m_doc->canvas(), TQ_SLOT( changed() ) ); m_propertyEditor->changeSet( buf ); } diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index 5c27be45d..c8ff3ea89 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -81,7 +81,7 @@ StructureWidget::StructureWidget( TQWidget* parent, const char* name ) setFullWidth( true ); addColumn( tr( "Report Structure" ) ); setSorting( -1 ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( selectItem( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( selectItem( TQListViewItem* ) ) ); } void StructureWidget::refresh() diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp index dc4af2627..ff7c249dc 100644 --- a/kugar/kudesigner_lib/view.cpp +++ b/kugar/kudesigner_lib/view.cpp @@ -104,7 +104,7 @@ View::View( Canvas *canvas, TQWidget *parent, const char *name, WFlags f ) : selectionRect = new SelectionRect( 0, 0, 0, 0, canvas ); - connect( m_canvas, TQT_SIGNAL( itemSelected() ), this, TQT_SLOT( selectItem() ) ); + connect( m_canvas, TQ_SIGNAL( itemSelected() ), this, TQ_SLOT( selectItem() ) ); } void View::deleteItem( TQCanvasItemList &l ) @@ -825,7 +825,7 @@ void View::setCanvas( Canvas *canvas ) TQCanvasView::setCanvas( ( TQCanvas* ) canvas ); m_canvas = canvas; selectionRect = new SelectionRect( 0, 0, 0, 0, m_canvas ); - connect( m_canvas, TQT_SIGNAL( itemSelected() ), this, TQT_SLOT( selectItem() ) ); + connect( m_canvas, TQ_SIGNAL( itemSelected() ), this, TQ_SLOT( selectItem() ) ); clearRequest(); } diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp index 3619d1551..bb8b1135d 100644 --- a/kugar/lib/mreportviewer.cpp +++ b/kugar/lib/mreportviewer.cpp @@ -38,11 +38,11 @@ void MReportViewer::init() scroller = new TQScrollView( this ); // Connect the rendering update signal and slot - connect( rptEngine, TQT_SIGNAL( signalRenderStatus( int ) ), - TQT_SLOT( slotRenderProgress( int ) ) ); + connect( rptEngine, TQ_SIGNAL( signalRenderStatus( int ) ), + TQ_SLOT( slotRenderProgress( int ) ) ); - connect( rptEngine, TQT_SIGNAL( preferedTemplate( const TQString & ) ), - TQT_SIGNAL( preferedTemplate( const TQString & ) ) ); + connect( rptEngine, TQ_SIGNAL( preferedTemplate( const TQString & ) ), + TQ_SIGNAL( preferedTemplate( const TQString & ) ) ); // Get the current color palette TQPalette p = palette(); @@ -324,7 +324,7 @@ void MReportViewer::printReport( KPrinter &printer ) i18n( "Cancel" ), totalSteps, this, "progress", true ); progress.setMinimumDuration( M_PROGRESS_DELAY ); - TQObject::connect( &progress, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( slotCancelPrinting() ) ); + TQObject::connect( &progress, TQ_SIGNAL( cancelled() ), this, TQ_SLOT( slotCancelPrinting() ) ); progress.setProgress( 0 ); tqApp->processEvents(); diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index e3fb36aab..98352e139 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -37,8 +37,8 @@ KugarPart::KugarPart( TQWidget *parentWidget, const char *widgetName, { setInstance( KugarFactory::global(), false ); m_reportEngine = new Kugar::MReportEngine(); - connect( m_reportEngine, TQT_SIGNAL( preferedTemplate( const TQString & ) ), - TQT_SLOT( slotPreferredTemplate( const TQString & ) ) ); + connect( m_reportEngine, TQ_SIGNAL( preferedTemplate( const TQString & ) ), + TQ_SLOT( slotPreferredTemplate( const TQString & ) ) ); } KugarPart::~KugarPart() diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index 6fa20b8b9..2f08cc3e0 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -46,10 +46,10 @@ KugarView::KugarView( KugarPart *part, TQWidget *parent, const char *name ) // Define the actions. - KStdAction::prior( view, TQT_SLOT( slotPrevPage() ), actionCollection(), "kuPrevPage" ); - KStdAction::next( view, TQT_SLOT( slotNextPage() ), actionCollection(), "kuNextPage" ); - KStdAction::firstPage( view, TQT_SLOT( slotFirstPage() ), actionCollection(), "kuFirstPage" ); - KStdAction::lastPage( view, TQT_SLOT( slotLastPage() ), actionCollection(), "kuLastPage" ); + KStdAction::prior( view, TQ_SLOT( slotPrevPage() ), actionCollection(), "kuPrevPage" ); + KStdAction::next( view, TQ_SLOT( slotNextPage() ), actionCollection(), "kuNextPage" ); + KStdAction::firstPage( view, TQ_SLOT( slotFirstPage() ), actionCollection(), "kuFirstPage" ); + KStdAction::lastPage( view, TQ_SLOT( slotLastPage() ), actionCollection(), "kuLastPage" ); setXMLFile( "kugarpart.rc" ); diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 3412b029a..e006903cd 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -111,8 +111,8 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW viewport()->setMouseTracking( TRUE ); m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); viewport()->setFocusProxy( this ); viewport()->setFocusPolicy( TQWidget::WheelFocus ); @@ -122,17 +122,17 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW installEventFilter( this ); KCursor::setAutoHideCursor( this, true, true ); - connect( this, TQT_SIGNAL(contentsMoving( int, int )), - this, TQT_SLOT(slotContentsMoving( int, int )) ); + connect( this, TQ_SIGNAL(contentsMoving( int, int )), + this, TQ_SLOT(slotContentsMoving( int, int )) ); - connect( m_doc, TQT_SIGNAL( newContentsSize() ), - this, TQT_SLOT( slotNewContentsSize() ) ); + connect( m_doc, TQ_SIGNAL( newContentsSize() ), + this, TQ_SLOT( slotNewContentsSize() ) ); - connect( m_doc, TQT_SIGNAL( mainTextHeightChanged() ), - this, TQT_SLOT( slotMainTextHeightChanged() ) ); + connect( m_doc, TQ_SIGNAL( mainTextHeightChanged() ), + this, TQ_SLOT( slotMainTextHeightChanged() ) ); - connect( m_doc, TQT_SIGNAL( sig_terminateEditing( KWFrameSet * ) ), - this, TQT_SLOT( terminateEditing( KWFrameSet * ) ) ); + connect( m_doc, TQ_SIGNAL( sig_terminateEditing( KWFrameSet * ) ), + this, TQ_SLOT( terminateEditing( KWFrameSet * ) ) ); slotNewContentsSize(); @@ -162,10 +162,10 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW } m_doc->deleteInitialEditingInfo(); - connect(frameViewManager(), TQT_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); - connect(frameViewManager(), TQT_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + connect(frameViewManager(), TQ_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + connect(frameViewManager(), TQ_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); } KWCanvas::~KWCanvas() @@ -175,10 +175,10 @@ KWCanvas::~KWCanvas() m_currentFrameSetEdit = 0; delete m_viewMode; m_viewMode = 0; - disconnect(frameViewManager(), TQT_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); - disconnect(frameViewManager(), TQT_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + disconnect(frameViewManager(), TQ_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + disconnect(frameViewManager(), TQ_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); delete m_frameViewManager; m_frameViewManager = 0; } @@ -1631,7 +1631,7 @@ void KWCanvas::slotContentsMoving( int cx, int cy ) // so that it will reposition any active embedded object. // This needs to be delayed since contents moving is emitted -before- moving, // and from resizeEvent it's too early too. - TQTimer::singleShot( 0, this, TQT_SIGNAL( viewTransformationsChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL( viewTransformationsChanged() ) ); } void KWCanvas::slotMainTextHeightChanged() diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 093c59416..efee2e575 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -117,9 +117,9 @@ KWConfig::KWConfig( KWView* parent ) } else m_ttsPage = 0; m_doc = parent->kWordDocument(); - connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); + connect(this, TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotApply())); - connect( m_interfacePage, TQT_SIGNAL( unitChanged( int ) ), TQT_SLOT( unitChanged( int ) ) ); + connect( m_interfacePage, TQ_SIGNAL( unitChanged( int ) ), TQ_SLOT( unitChanged( int ) ) ); unitChanged( parent->kWordDocument()->unit() ); } @@ -275,7 +275,7 @@ ConfigureInterfacePage::ConfigureInterfacePage( KWView *view, TQVBox *box, char m_unitCombo = new TQComboBox( hbUnit ); m_unitCombo->insertStringList( KoUnit::listOfUnitName() ); - connect(m_unitCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(unitChanged(int))); + connect(m_unitCombo, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(unitChanged(int))); unitLabel->setBuddy( m_unitCombo ); TQString unitHelp = i18n("Select the unit type used every time a distance or width/height " "is displayed or entered. This one setting is for the whole of KWord: all dialogs, the rulers etc. " @@ -731,7 +731,7 @@ ConfigureDefaultDocPage::ConfigureDefaultDocPage( KWView *view, TQVBox *box, cha fontName->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); TQPushButton *chooseButton = new TQPushButton(i18n("Choose..."), fontContainer); - connect(chooseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNewDefaultFont())); + connect(chooseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectNewDefaultFont())); fontLayout->addWidget(fontTitle, 0, 0); fontLayout->addWidget(fontName, 0, 1); @@ -957,9 +957,9 @@ ConfigurePathPage::ConfigurePathPage( KWView *view, TQVBox *box, char *name ) (void) new TQListViewItem( m_pPathView, i18n("Backup Path"),doc->backupPath() ); m_modifyPath = new TQPushButton( i18n("Modify Path..."), gbPathGroup); - connect( m_modifyPath, TQT_SIGNAL( clicked ()), this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), this, TQT_SLOT( slotSelectionChanged(TQListViewItem * ))); + connect( m_modifyPath, TQ_SIGNAL( clicked ()), this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), this, TQ_SLOT( slotSelectionChanged(TQListViewItem * ))); slotSelectionChanged(m_pPathView->currentItem()); } @@ -1076,9 +1076,9 @@ ConfigureTTSPage::ConfigureTTSPage( KWView *view, TQVBox *box, char *name ) m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); } void ConfigureTTSPage::slotDefault() diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp index 7f17f55f2..e5f1f3325 100644 --- a/kword/KWCreateBookmarkDia.cpp +++ b/kword/KWCreateBookmarkDia.cpp @@ -53,7 +53,7 @@ void KWCreateBookmarkDia::init() KWCreateBookmarkDiaBase *dia = new KWCreateBookmarkDiaBase( this ); m_bookmarkName = dia->m_bookmarkName; enableButtonOK( false ); - connect( m_bookmarkName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &))); + connect( m_bookmarkName, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(nameChanged( const TQString &))); setMainWidget( dia ); m_bookmarkName->setFocus(); } @@ -93,18 +93,18 @@ KWSelectBookmarkDia::KWSelectBookmarkDia( const TQStringList & _list, KWDocument grid->addMultiCellWidget(m_bookmarkList, 0, 4, 0, 0); m_bookmarkList->insertStringList(_list); - connect(m_bookmarkList, TQT_SIGNAL( selectionChanged ()), this, TQT_SLOT(slotSelectionChanged())); - connect(m_bookmarkList, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQT_SLOT(slotOk())); - connect(m_bookmarkList, TQT_SIGNAL(returnPressed ( TQListBoxItem * )), this, TQT_SLOT(slotOk())); + connect(m_bookmarkList, TQ_SIGNAL( selectionChanged ()), this, TQ_SLOT(slotSelectionChanged())); + connect(m_bookmarkList, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQ_SLOT(slotOk())); + connect(m_bookmarkList, TQ_SIGNAL(returnPressed ( TQListBoxItem * )), this, TQ_SLOT(slotOk())); m_pbRename = new TQPushButton( i18n("Rename Bookmark"), page ); grid->addWidget( m_pbRename, 0, 1); - connect( m_pbRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRenameBookmark())); + connect( m_pbRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRenameBookmark())); m_pbDelete = new TQPushButton( i18n("Delete Bookmark"), page ); grid->addWidget( m_pbDelete, 1, 1); - connect( m_pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteBookmark())); + connect( m_pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteBookmark())); m_bookmarkList->setFocus(); slotSelectionChanged(); diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index f6595c00c..55ebd6731 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -1059,14 +1059,14 @@ KWDocStructTree::KWDocStructTree(TQWidget* parent, KWDocument* doc, KWGUI* gui) addColumn( i18n( "Document Structure" ) ); setFullWidth( true ); - connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotDoubleClicked(TQListViewItem*)) ); - connect( this, TQT_SIGNAL( returnPressed(TQListViewItem*) ), - this, TQT_SLOT( slotReturnPressed(TQListViewItem* )) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&,int)), - this, TQT_SLOT( slotRightButtonClicked(TQListViewItem *, const TQPoint&, int))); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotDoubleClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL( returnPressed(TQListViewItem*) ), + this, TQ_SLOT( slotReturnPressed(TQListViewItem* )) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&,int)), + this, TQ_SLOT( slotRightButtonClicked(TQListViewItem *, const TQPoint&, int))); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } KWDocStructTree::~KWDocStructTree() @@ -1202,7 +1202,7 @@ KWDocStruct::KWDocStruct(TQWidget* parent, KWDocument* doc, KWGUI* gui) m_tree->setAlternateBackground( TDEGlobalSettings::alternateBackgroundColor() ); TDEListViewSearchLine* searchLine = new TDEListViewSearchLine( searchBar, m_tree ); searchBar->setStretchableWidget( searchLine ); - connect( eraseButton, TQT_SIGNAL( clicked() ), searchLine, TQT_SLOT( clear() ) ); + connect( eraseButton, TQ_SIGNAL( clicked() ), searchLine, TQ_SLOT( clear() ) ); m_layout->addWidget(searchBar); m_layout->addWidget(m_tree); diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 5a6e886ea..c6469aceb 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -220,8 +220,8 @@ KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* pa m_layoutViewMode = 0; m_commandHistory = new KWCommandHistory( this ); - 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() ) ); //styleMask = U_FONT_FAMILY_ALL_SIZE | U_COLOR | U_BORDER | U_INDENT | // U_NUMBERING | U_ALIGN | U_TABS | U_SMART; @@ -1936,10 +1936,10 @@ void KWDocument::endOfLoading() // called by both oasis and oldxml // Connect to notifications from main text-frameset if ( frameset ) { - connect( frameset->textObject(), TQT_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), - TQT_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); - connect( frameset, TQT_SIGNAL( mainTextHeightChanged() ), - TQT_SIGNAL( mainTextHeightChanged() ) ); + connect( frameset->textObject(), TQ_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), + TQ_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); + connect( frameset, TQ_SIGNAL( mainTextHeightChanged() ), + TQ_SIGNAL( mainTextHeightChanged() ) ); } // Note that more stuff will happen in completeLoading @@ -2439,7 +2439,7 @@ bool KWDocument::completeLoading( KoStore *store ) emit newContentsSize(); repaintAllViews( true ); // in case any view exists already reactivateBgSpellChecking(); - connect( documentInfo(), TQT_SIGNAL( sigDocumentInfoModifed()),this,TQT_SLOT(slotDocumentInfoModifed() ) ); + connect( documentInfo(), TQ_SIGNAL( sigDocumentInfoModifed()),this,TQ_SLOT(slotDocumentInfoModifed() ) ); //desactivate bgspellchecking //attributes isReadWrite is not placed at the beginning ! @@ -3730,8 +3730,8 @@ void KWDocument::removeView( KoView *view ) void KWDocument::addShell( KoMainWindow *shell ) { - connect( shell, TQT_SIGNAL( documentSaved() ), m_commandHistory, TQT_SLOT( documentSaved() ) ); - connect( shell, TQT_SIGNAL( saveDialogShown() ), this, TQT_SLOT( saveDialogShown() ) ); + connect( shell, TQ_SIGNAL( documentSaved() ), m_commandHistory, TQ_SLOT( documentSaved() ) ); + connect( shell, TQ_SIGNAL( saveDialogShown() ), this, TQ_SLOT( saveDialogShown() ) ); KoDocument::addShell( shell ); } @@ -3895,7 +3895,7 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e void KWDocument::delayedRepaintAllViews() { if (!m_repaintAllViewsPending) { - TQTimer::singleShot( 0, this, TQT_SLOT( slotRepaintAllViews() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRepaintAllViews() ) ); m_repaintAllViewsPending=true; } } @@ -3910,7 +3910,7 @@ void KWDocument::delayedRecalcFrames( int fromPage ) { if ( m_recalcFramesPending == -1 || fromPage < m_recalcFramesPending ) { m_recalcFramesPending = fromPage; - TQTimer::singleShot( 0, this, TQT_SLOT( slotRecalcFrames() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRecalcFrames() ) ); } } @@ -4333,7 +4333,7 @@ void KWDocument::frameChanged( KWFrame * frame ) { if(! m_framesChangedHandler) { m_framesChangedHandler = new FramesChangedHandler(this); - TQTimer::singleShot( 0, this, TQT_SLOT( updateFramesChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateFramesChanged() ) ); } m_framesChangedHandler->addFrame(frame); } diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index eaa7982ef..1517516cf 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -103,16 +103,16 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch else initGroupList(); - connect(m_groupList,TQT_SIGNAL(selectionChanged()), this,TQT_SLOT(slotGroupSelected())); - connect(m_ExpressionsList,TQT_SIGNAL(selectionChanged()), this,TQT_SLOT(slotExpressionSelected())); + connect(m_groupList,TQ_SIGNAL(selectionChanged()), this,TQ_SLOT(slotGroupSelected())); + connect(m_ExpressionsList,TQ_SIGNAL(selectionChanged()), this,TQ_SLOT(slotExpressionSelected())); if(m_groupList->count() > 0) m_groupList->setSelected(0, true); - connect(m_groupLineEdit,TQT_SIGNAL(textChanged(const TQString&)), this,TQT_SLOT(slotUpdateGroupName(const TQString&))); - connect(m_expressionLineEdit,TQT_SIGNAL(textChanged(const TQString&)), this,TQT_SLOT(slotUpdateExpression(const TQString&))); - connect(m_addExpression, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotAddExpression() )); - connect(m_delExpression, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotRemoveExpression() )); - connect(m_addGroup, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotAddGroup())); - connect(m_delGroup, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotRemoveGroup() )); + connect(m_groupLineEdit,TQ_SIGNAL(textChanged(const TQString&)), this,TQ_SLOT(slotUpdateGroupName(const TQString&))); + connect(m_expressionLineEdit,TQ_SIGNAL(textChanged(const TQString&)), this,TQ_SLOT(slotUpdateExpression(const TQString&))); + connect(m_addExpression, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotAddExpression() )); + connect(m_delExpression, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotRemoveExpression() )); + connect(m_addGroup, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotAddGroup())); + connect(m_delGroup, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotRemoveGroup() )); updateWidget(); setFocus(); diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 9214038ac..ae22cf3fb 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -60,8 +60,8 @@ KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering m_rbManual->setChecked( true ); m_footLine = new TQLineEdit( grp); m_footLine->setText( _manualString ); - connect( m_footLine, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT(footLineChanged( const TQString & ))); - connect( grp, TQT_SIGNAL( clicked ( int ) ), this, TQT_SLOT(footNoteTypeChanged())); + connect( m_footLine, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT(footLineChanged( const TQString & ))); + connect( grp, TQ_SIGNAL( clicked ( int ) ), this, TQ_SLOT(footNoteTypeChanged())); grid->addWidget( m_footLine, 2, 1); @@ -79,7 +79,7 @@ KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering footNoteTypeChanged(); setButtonText( KDialogBase::User1, i18n("C&onfigure...") ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotConfigurate())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotConfigurate())); } void KWFootNoteDia::footNoteTypeChanged() diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp index 98f27cfa6..d3aabc0c4 100644 --- a/kword/KWFormulaFrameSet.cpp +++ b/kword/KWFormulaFrameSet.cpp @@ -92,10 +92,10 @@ void KWFormulaFrameSet::init() // there is no need to move the KFormulaContainer anymore, it remains at (0,0). formula->moveTo( 0, 0 ); - connect( formula, TQT_SIGNAL( formulaChanged( double, double ) ), - this, TQT_SLOT( slotFormulaChanged( double, double ) ) ); - connect( formula, TQT_SIGNAL( errorMsg( const TQString& ) ), - this, TQT_SLOT( slotErrorMessage( const TQString& ) ) ); + connect( formula, TQ_SIGNAL( formulaChanged( double, double ) ), + this, TQ_SLOT( slotFormulaChanged( double, double ) ) ); + connect( formula, TQ_SIGNAL( errorMsg( const TQString& ) ), + this, TQ_SLOT( slotErrorMessage( const TQString& ) ) ); /* if ( isFloating() ) { @@ -293,10 +293,10 @@ void KWFormulaFrameSet::paste( TQDomNode& formulaElem ) if (!formulaElem.isNull()) { if (formula == 0) { formula = m_doc->formulaDocument()->createFormula( -1, false ); - connect(formula, TQT_SIGNAL(formulaChanged(double, double)), - this, TQT_SLOT(slotFormulaChanged(double, double))); - connect( formula, TQT_SIGNAL( errorMsg( const TQString& ) ), - this, TQT_SLOT( slotErrorMessage( const TQString& ) ) ); + connect(formula, TQ_SIGNAL(formulaChanged(double, double)), + this, TQ_SLOT(slotFormulaChanged(double, double))); + connect( formula, TQ_SIGNAL( errorMsg( const TQString& ) ), + this, TQ_SLOT( slotErrorMessage( const TQString& ) ) ); } m_doc->formulaDocument()->setCreationStrategy( "Oasis" ); if ( !formula->loadMathML( formulaElem.firstChild().toElement() ) ) { @@ -362,10 +362,10 @@ KWFormulaFrameSetEdit::KWFormulaFrameSetEdit(KWFormulaFrameSet* fs, KWCanvas* ca { formulaView = new KFormula::View( fs->getFormula() ); - connect( formulaView, TQT_SIGNAL( cursorChanged( bool, bool ) ), - this, TQT_SLOT( cursorChanged( bool, bool ) ) ); - connect( fs->getFormula(), TQT_SIGNAL( leaveFormula( Container*, FormulaCursor*, int ) ), - this, TQT_SLOT( slotLeaveFormula( Container*, FormulaCursor*, int ) ) ); + connect( formulaView, TQ_SIGNAL( cursorChanged( bool, bool ) ), + this, TQ_SLOT( cursorChanged( bool, bool ) ) ); + connect( fs->getFormula(), TQ_SIGNAL( leaveFormula( Container*, FormulaCursor*, int ) ), + this, TQ_SLOT( slotLeaveFormula( Container*, FormulaCursor*, int ) ) ); fs->m_edit = this; diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index a74fc3e35..d141935b3 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -332,8 +332,8 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options if(m_frameType==FT_PICTURE) { m_cbAspectRatio = new TQCheckBox (i18n("Retain original aspect ratio"),m_tab1); - connect( m_cbAspectRatio, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotKeepRatioToggled(bool))); + connect( m_cbAspectRatio, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotKeepRatioToggled(bool))); bool show=true; bool on=true; if(m_frame) { @@ -450,7 +450,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options "This is what happens for the \"main text frameset\", but this option makes it possible " "to choose the same behavior for other framesets, for instance in magazine layouts.")); if ( m_rResizeFrame ) - connect( m_reconnect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOn() ) ); + connect( m_reconnect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setFrameBehaviorInputOn() ) ); m_onpGrid->addRowSpacing( 0, KDialog::marginHint() + 5 ); m_onpGrid->addWidget( m_reconnect, 1, 0 ); @@ -458,7 +458,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options TQWhatsThis::add(m_noFollowup, i18n("<b>Do not create a followup frame:</b><br/>" "When a new page is created, no frame will be created for this frameset.")); if ( m_rResizeFrame ) - connect( m_noFollowup, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOn() ) ); + connect( m_noFollowup, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setFrameBehaviorInputOn() ) ); m_onpGrid->addWidget( m_noFollowup, 2, 0 ); m_copyRadio= new TQRadioButton (i18n ("Place a copy of this frame"), m_onNewPage); @@ -469,7 +469,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options "makes it possible to choose the same behavior for other framesets, for " "instance a company logo and/or title that should appear exactly the same on every page.")); if ( m_rResizeFrame ) - connect( m_copyRadio, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOff() ) ); + connect( m_copyRadio, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setFrameBehaviorInputOff() ) ); m_onpGrid->addWidget( m_copyRadio, 3, 0); enableOnNewPageOptions(); @@ -556,7 +556,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_cbProtectContent = new TQCheckBox( i18n("Protect content"), m_tab1); TQWhatsThis::add(m_cbProtectContent, i18n("<b>Protect content:</b><br/>" "Disallow changes to be made to the contents of the frame(s).")); - connect( m_cbProtectContent, TQT_SIGNAL(toggled ( bool ) ), this, TQT_SLOT(slotProtectContentChanged( bool ))); + connect( m_cbProtectContent, TQ_SIGNAL(toggled ( bool ) ), this, TQ_SLOT(slotProtectContentChanged( bool ))); row++; m_grid1->addMultiCellWidget(m_cbProtectContent,row,row, 0, 1); if( m_frameType != FT_TEXT || m_frame!=0 && m_frame->frameSet()==0) { @@ -778,7 +778,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround enableRunAround(); // Changing the type of runaround needs to enable/disable the runaround-side options - connect( m_runGroup, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( enableRunAround() ) ); + connect( m_runGroup, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( enableRunAround() ) ); } void KWFrameDia::setupTab3(){ // TAB Frameset @@ -801,7 +801,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset m_rExistingFrameset->setText( i18n("Select existing frameset to connect frame to:") ); tabLayout->addWidget( m_rExistingFrameset ); myGroup->insert(m_rExistingFrameset,1); - connect (m_rExistingFrameset, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(ensureValidFramesetSelected())); + connect (m_rExistingFrameset, TQ_SIGNAL( toggled(bool)), this, TQ_SLOT(ensureValidFramesetSelected())); TQHBoxLayout *layout2 = new TQHBoxLayout( 0, 0, 6); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); @@ -812,8 +812,8 @@ void KWFrameDia::setupTab3(){ // TAB Frameset m_lFrameSList->addColumn( i18n("Frameset Name") ); m_lFrameSList->setAllColumnsShowFocus( true ); m_lFrameSList->header()->setMovingEnabled( false ); - connect( m_lFrameSList, TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(selectExistingFrameset ()) ); - connect (m_lFrameSList, TQT_SIGNAL( selectionChanged()), this, TQT_SLOT(ensureValidFramesetSelected())); + connect( m_lFrameSList, TQ_SIGNAL(selectionChanged ()),this,TQ_SLOT(selectExistingFrameset ()) ); + connect (m_lFrameSList, TQ_SIGNAL( selectionChanged()), this, TQ_SLOT(ensureValidFramesetSelected())); layout2->addWidget( m_lFrameSList ); tabLayout->addLayout( layout2 ); @@ -881,14 +881,14 @@ void KWFrameDia::setupTab3(){ // TAB Frameset } m_eFrameSetName->setText( m_oldFrameSetName ); - connect( m_lFrameSList, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( connectListSelected( TQListViewItem * ) ) ); - connect(m_eFrameSetName, TQT_SIGNAL(textChanged ( const TQString & ) ), - this,TQT_SLOT(textNameFrameChanged ( const TQString & ) ) ); - connect(m_eFrameSetName, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textNameFrameChanged ( const TQString & ) )); - connect( m_rNewFrameset, TQT_SIGNAL(toggled (bool)), - this,TQT_SLOT(selectNewFrameset (bool)) ); + connect( m_lFrameSList, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( connectListSelected( TQListViewItem * ) ) ); + connect(m_eFrameSetName, TQ_SIGNAL(textChanged ( const TQString & ) ), + this,TQ_SLOT(textNameFrameChanged ( const TQString & ) ) ); + connect(m_eFrameSetName, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textNameFrameChanged ( const TQString & ) )); + connect( m_rNewFrameset, TQ_SIGNAL(toggled (bool)), + this,TQ_SLOT(selectNewFrameset (bool)) ); } void KWFrameDia::selectExistingFrameset() { @@ -929,14 +929,14 @@ void KWFrameDia::setupTab4() { // TAB Geometry m_floating = new TQCheckBox( i18n("Frame is inline"), m_tab4 ); - connect( m_floating, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotFloatingToggled(bool) ) ); + connect( m_floating, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotFloatingToggled(bool) ) ); int row = 0; grid4->addMultiCellWidget( m_floating, row, row, 0, 1 ); row++; m_protectSize = new TQCheckBox( i18n("Protect size and position"), m_tab4); grid4->addMultiCellWidget( m_protectSize, row, row, 0, 1 ); - connect( m_protectSize, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotProtectSizeToggled(bool) ) ); + connect( m_protectSize, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotProtectSizeToggled(bool) ) ); /* ideally the following properties could be given to any floating frame: Position: (y) @@ -984,8 +984,8 @@ void KWFrameDia::setupTab4() { // TAB Geometry m_sw = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); m_sw->resize( m_sw->sizeHint() ); - connect( m_sw, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotUpdateHeightForWidth(double)) ); + connect( m_sw, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotUpdateHeightForWidth(double)) ); pGrid->addWidget( m_sw, 2, 1 ); @@ -994,8 +994,8 @@ void KWFrameDia::setupTab4() { // TAB Geometry pGrid->addWidget( m_lh, 2, 2 ); m_sh = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - connect( m_sh, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotUpdateWidthForHeight(double)) ); + connect( m_sh, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotUpdateWidthForHeight(double)) ); m_sh->resize( m_sh->sizeHint() ); @@ -1176,8 +1176,8 @@ void KWFrameDia::setupTab5() { // Tab Background fill/color m_brushColor = new KColorButton( TQt::white, KWDocument::defaultBgColor(0), m_tab5 ); grid5->addWidget(m_brushColor,row++,0); -// connect( m_brushColor, TQT_SIGNAL( changed( const TQColor & ) ), -// this, TQT_SLOT( updateBrushPreview() ) ); +// connect( m_brushColor, TQ_SIGNAL( changed( const TQColor & ) ), +// this, TQ_SLOT( updateBrushPreview() ) ); // ########################### @@ -1213,14 +1213,14 @@ void KWFrameDia::setupTab5() { // Tab Background fill/color brushStyle->insertItem( i18n( "Diagonal Lines ( / )" ) ); brushStyle->insertItem( i18n( "Diagonal Lines ( \\ )" ) ); brushStyle->insertItem( i18n( "Diagonal Crossing Lines" ) ); - connect( brushStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateBrushPreview() ) ); + connect( brushStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateBrushPreview() ) ); updateBrushPreview(); #endif - connect( m_transparentCB, TQT_SIGNAL( toggled( bool ) ), labelBgColor, TQT_SLOT( setDisabled( bool ) ) ); - connect( m_transparentCB, TQT_SIGNAL( toggled( bool ) ), m_brushColor, TQT_SLOT( setDisabled( bool ) ) ); + connect( m_transparentCB, TQ_SIGNAL( toggled( bool ) ), labelBgColor, TQ_SLOT( setDisabled( bool ) ) ); + connect( m_transparentCB, TQ_SIGNAL( toggled( bool ) ), m_brushColor, TQ_SLOT( setDisabled( bool ) ) ); initBrush(); TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding); @@ -1281,10 +1281,10 @@ void KWFrameDia::setupTab6() // Border style m_bBottom->setToggleButton( true ); grid->addWidget( bb, 6, 0 ); - connect( m_bLeft, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdLeftToggled( bool ) ) ); - connect( m_bRight, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdRightToggled( bool ) ) ); - connect( m_bTop, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdTopToggled( bool ) ) ); - connect( m_bBottom, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdBottomToggled( bool ) ) ); + connect( m_bLeft, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdLeftToggled( bool ) ) ); + connect( m_bRight, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdRightToggled( bool ) ) ); + connect( m_bTop, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdTopToggled( bool ) ) ); + connect( m_bBottom, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdBottomToggled( bool ) ) ); initBorderSettings(); @@ -1296,8 +1296,8 @@ void KWFrameDia::setupTab6() // Border style TQVBoxLayout *lay1 = new TQVBoxLayout( grp->layout() ); lay1->addWidget(m_prev3); - connect( m_prev3, TQT_SIGNAL( choosearea(TQMouseEvent * ) ), - this, TQT_SLOT( slotPressEvent(TQMouseEvent *) ) ); + connect( m_prev3, TQ_SIGNAL( choosearea(TQMouseEvent * ) ), + this, TQ_SLOT( slotPressEvent(TQMouseEvent *) ) ); // update the bordet preview widget m_prev3->setLeftBorder( m_leftBorder ); @@ -2433,10 +2433,10 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addWidget( m_inputBottom, 3, 3 ); mGrid->setRowSpacing( 0, KDialog::spacingHint() + 5 ); - connect( m_inputLeft, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); - connect( m_inputRight, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); - connect( m_inputTop, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); - connect( m_inputBottom, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); + connect( m_inputLeft, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); + connect( m_inputRight, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); + connect( m_inputTop, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); + connect( m_inputBottom, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); } // Called right after the ctor, so m_synchronize can't be checked diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp index 8db6227ac..25931240e 100644 --- a/kword/KWFrameLayout.cpp +++ b/kword/KWFrameLayout.cpp @@ -495,7 +495,7 @@ void KWFrameLayout::layout( KWFrameSet* mainTextFrameSet, int numColumns, //m_doc->invalidate(); // ### This means the layout will be done during painting. Not good. // What about mainTextFrameSet->invalidate() or even layout()? - //TQTimer::singleShot( 0, m_doc, TQT_SLOT( invalidate() ) ); + //TQTimer::singleShot( 0, m_doc, TQ_SLOT( invalidate() ) ); // Invalidate main textframeset only, and from top of page only. // Otherwise loading a long document (with headers/footers) takes ages, diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index d612be05f..d07382381 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -52,8 +52,8 @@ KWFrameSet::KWFrameSet( KWDocument *doc ) // Send our "repaintChanged" signals to the document. setName("KWFrameSet"); if(m_doc) { - connect( this, TQT_SIGNAL( repaintChanged( KWFrameSet * ) ), - doc, TQT_SLOT( slotRepaintChanged( KWFrameSet * ) ) ); + connect( this, TQ_SIGNAL( repaintChanged( KWFrameSet * ) ), + doc, TQ_SLOT( slotRepaintChanged( KWFrameSet * ) ) ); m_pageManager = doc->pageManager(); } m_frames.setAutoDelete( true ); diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index dddfbac93..d94865c4f 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -158,7 +158,7 @@ KWFrameStyleManager::KWFrameStyleManager( TQWidget *_parent, KWDocument *_doc, switchStyle(); setInitialSize( TQSize( 600, 370 ) ); setButtonText( KDialogBase::User1, i18n("Import From File...") ); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(importFromFile())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(importFromFile())); } KWFrameStyleManager::~KWFrameStyleManager() @@ -198,32 +198,32 @@ void KWFrameStyleManager::setupWidget() m_moveUpButton = new TQPushButton( frame1, "moveUpButton" ); m_moveUpButton->setIconSet( SmallIconSet( "go-up" ) ); - connect( m_moveUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUpStyle() ) ); + connect( m_moveUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveUpStyle() ) ); frame1Layout->addWidget( m_moveUpButton, 1, 1 ); m_moveDownButton = new TQPushButton( frame1, "moveDownButton" ); m_moveDownButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( m_moveDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDownStyle() ) ); + connect( m_moveDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveDownStyle() ) ); frame1Layout->addWidget( m_moveDownButton, 1, 0 ); m_deleteButton = new TQPushButton( frame1, "deleteButton" ); m_deleteButton->setText( i18n( "&Delete" ) ); - connect( m_deleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteStyle() ) ); + connect( m_deleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteStyle() ) ); frame1Layout->addWidget( m_deleteButton, 2, 1 ); m_newButton = new TQPushButton( frame1, "newButton" ); m_newButton->setText( i18n( "New" ) ); - connect( m_newButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addStyle() ) ); + connect( m_newButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addStyle() ) ); frame1Layout->addWidget( m_newButton, 2, 0 ); m_tabs = new TQTabWidget( frame1 ); frame1Layout->addMultiCellWidget( m_tabs, 0, 2, 2, 2 ); - connect( m_stylesList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( switchStyle() ) ); - connect( m_tabs, TQT_SIGNAL( currentChanged ( TQWidget * ) ), this, TQT_SLOT( switchTabs() ) ); + connect( m_stylesList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( switchStyle() ) ); + connect( m_tabs, TQ_SIGNAL( currentChanged ( TQWidget * ) ), this, TQ_SLOT( switchTabs() ) ); } void KWFrameStyleManager::addGeneralTab() @@ -248,7 +248,7 @@ void KWFrameStyleManager::addGeneralTab() m_nameString = new TQLineEdit( tab ); m_nameString->resize(m_nameString->sizeHint() ); - connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); + connect( m_nameString, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); @@ -584,8 +584,8 @@ KWFrameStyleBackgroundTab::KWFrameStyleBackgroundTab( TQWidget * parent ) brushColor = new KColorButton( TQt::white, bgwidget ); grid->addWidget(brushColor,row++,0); - connect( brushColor, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( updateBrushConfiguration( const TQColor & ) ) ); + connect( brushColor, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( updateBrushConfiguration( const TQColor & ) ) ); TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding); grid->addItem( spacer,row,0 ); diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp index a00705847..96b6cc5d8 100644 --- a/kword/KWFrameViewManager.cpp +++ b/kword/KWFrameViewManager.cpp @@ -43,8 +43,8 @@ KWFrameViewManager::KWFrameViewManager(KWDocument *doc) { ++frameSets; } m_blockEvents = false; - connect(doc, TQT_SIGNAL( sigFrameSetAdded(KWFrameSet*)), TQT_SLOT( slotFrameSetAdded(KWFrameSet*))); - connect(doc, TQT_SIGNAL( sigFrameSetRemoved(KWFrameSet*)), TQT_SLOT( slotFrameSetRemoved(KWFrameSet*))); + connect(doc, TQ_SIGNAL( sigFrameSetAdded(KWFrameSet*)), TQ_SLOT( slotFrameSetAdded(KWFrameSet*))); + connect(doc, TQ_SIGNAL( sigFrameSetRemoved(KWFrameSet*)), TQ_SLOT( slotFrameSetRemoved(KWFrameSet*))); recalculateFrameCache(); } @@ -66,9 +66,9 @@ void KWFrameViewManager::removeKWFramesListener(KWFramesListener *listener) { void KWFrameViewManager::slotFrameSetAdded(KWFrameSet *fs) { if(! m_blockEvents) m_frameEvents.append(new FrameEvent(FrameEvent::FrameSetAdded, fs)); - connect(fs, TQT_SIGNAL( sigFrameAdded(KWFrame*)), TQT_SLOT( slotFrameAdded(KWFrame *))); - connect(fs, TQT_SIGNAL( sigFrameRemoved(KWFrame*)), TQT_SLOT( slotFrameRemoved(KWFrame *))); - connect(fs, TQT_SIGNAL( sigNameChanged(KWFrameSet*)), TQT_SLOT( slotFrameSetRenamed(KWFrameSet *))); + connect(fs, TQ_SIGNAL( sigFrameAdded(KWFrame*)), TQ_SLOT( slotFrameAdded(KWFrame *))); + connect(fs, TQ_SIGNAL( sigFrameRemoved(KWFrame*)), TQ_SLOT( slotFrameRemoved(KWFrame *))); + connect(fs, TQ_SIGNAL( sigNameChanged(KWFrameSet*)), TQ_SLOT( slotFrameSetRenamed(KWFrameSet *))); TQPtrListIterator<KWFrame> frames = fs->frameIterator(); while(frames.current()) { KWFrame *f = frames.current(); @@ -80,9 +80,9 @@ void KWFrameViewManager::slotFrameSetAdded(KWFrameSet *fs) { void KWFrameViewManager::slotFrameSetRemoved(KWFrameSet *fs) { if(! m_blockEvents) m_frameEvents.append(new FrameEvent(FrameEvent::FrameSetRemoved, fs)); - disconnect(fs, TQT_SIGNAL( sigFrameAdded(KWFrame*)), this, TQT_SLOT( slotFrameAdded(KWFrame *))); - disconnect(fs, TQT_SIGNAL( sigFrameRemoved(KWFrame*)), this, TQT_SLOT( slotFrameRemoved(KWFrame *))); - disconnect(fs, TQT_SIGNAL( sigNameChanged(KWFrameSet*)), this, TQT_SLOT( slotFrameSetRenamed(KWFrameSet *))); + disconnect(fs, TQ_SIGNAL( sigFrameAdded(KWFrame*)), this, TQ_SLOT( slotFrameAdded(KWFrame *))); + disconnect(fs, TQ_SIGNAL( sigFrameRemoved(KWFrame*)), this, TQ_SLOT( slotFrameRemoved(KWFrame *))); + disconnect(fs, TQ_SIGNAL( sigNameChanged(KWFrameSet*)), this, TQ_SLOT( slotFrameSetRenamed(KWFrameSet *))); TQPtrListIterator<KWFrame> frames = fs->frameIterator(); while(frames.current()) { KWFrame *f = frames.current(); @@ -145,7 +145,7 @@ void KWFrameViewManager::requestFireEvents() { if(m_queueRequested && !m_blockEvents) return; m_queueRequested = true; - TQTimer::singleShot ( 0, this, TQT_SLOT(fireEvents()) ); + TQTimer::singleShot ( 0, this, TQ_SLOT(fireEvents()) ); } void KWFrameViewManager::fireEvents() { diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 55b8219ee..002b0bf0c 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -94,7 +94,7 @@ KWInsertPicDia::KWInsertPicDia( TQWidget *parent, bool _inline, bool _keepRatio, TQPushButton *pbImage = new TQPushButton( i18n( "Choose &Picture..." ), page ); grid->addWidget( pbImage, 0, 0 ); - connect( pbImage, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChooseImage() ) ); + connect( pbImage, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChooseImage() ) ); m_cbInline = new TQCheckBox( i18n( "Insert picture inline" ), page ); grid->addWidget( m_cbInline, 1, 0 ); @@ -138,7 +138,7 @@ void KWInsertPicDia::slotChooseImage() { kdDebug() << "KWInsertPicDia::slotChooseImage cancelled by user." << endl; // Close, but delayed, otherwise it won't work (we only return from the ctor) - TQTimer::singleShot( 0, this, TQT_SLOT( cancel() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( cancel() ) ); return; } enableButtonOK ( m_preview->setPicture( m_picture ) ); diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index b43e81c56..7de86eb95 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -351,8 +351,8 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( TDETrader::OfferLi } descriptionLabel->show(); - connect( chooser, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( pluginChanged( int ) ) ); + connect( chooser, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( pluginChanged( int ) ) ); layout->addWidget( label ); layout->addWidget( chooser ); @@ -425,11 +425,11 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat enableDisableEdit(); - connect(edit,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditClicked())); - connect(create,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotCreateClicked())); - connect(open,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotOpenClicked())); - connect(preview,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPreviewClicked())); - connect(document,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotDocumentClicked())); + connect(edit,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditClicked())); + connect(create,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotCreateClicked())); + connect(open,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotOpenClicked())); + connect(preview,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPreviewClicked())); + connect(document,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotDocumentClicked())); } void KWMailMergeConfigDialog::enableDisableEdit() @@ -528,10 +528,10 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW names->insertItem( m_db->version() ?it.data():it.key(), -1 ); setInitialSize( TQSize( 350, 400 ) ); - connect( names, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( names, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotOk() ) ); + connect( names, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( names, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotOk() ) ); setFocus(); enableButtonOK( names->currentItem() != -1 ); diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index dcb3b197a..282c723ea 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -123,7 +123,7 @@ int KWMailMergeLabelAction::plug( TQWidget *widget, int index ) addContainer( tb, id ); - connect( tb, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( tb, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp index 255f084ed..50063362d 100644 --- a/kword/KWPartFrameSet.cpp +++ b/kword/KWPartFrameSet.cpp @@ -76,8 +76,8 @@ void KWPartFrameSet::setChild( KWDocumentChild* child ) assert( !m_child ); m_child = child; m_child->setPartFrameSet( this ); - TQObject::connect( m_child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotChildChanged() ) ); + TQObject::connect( m_child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotChildChanged() ) ); } KWPartFrameSet::~KWPartFrameSet() @@ -271,8 +271,8 @@ KWPartFrameSetEdit::KWPartFrameSetEdit( KWPartFrameSet * fs, KWCanvas * canvas ) kdDebug(32001) << "KWPartFrameSetEdit::KWPartFrameSetEdit " << endl; m_dcop=0L; fs->startEditing(); - TQObject::connect( m_canvas->gui()->getView(), TQT_SIGNAL( activated( bool ) ), - this, TQT_SLOT( slotChildActivated( bool ) ) ); + TQObject::connect( m_canvas->gui()->getView(), TQ_SIGNAL( activated( bool ) ), + this, TQ_SLOT( slotChildActivated( bool ) ) ); } KWPartFrameSetEdit::~KWPartFrameSetEdit() diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp index c4f5ce015..81be575c2 100644 --- a/kword/KWResizeTableDia.cpp +++ b/kword/KWResizeTableDia.cpp @@ -52,7 +52,7 @@ void KWResizeTableDia::setupTab1(int resizeColumn) { rc = new TQLabel( i18n( "Width:" ), page ); m_position= new KoUnitDoubleSpinBox( page, 0.01, m_table->anchorFrameset()->isFloating() ? m_table->anchorFrameset()->frame(0)->width(): 9999, 1, 0.0, m_doc->unit(), m_doc->unit() ); slotValueChanged( m_value->value()); - connect( m_value, TQT_SIGNAL( valueChanged ( int )), this, TQT_SLOT( slotValueChanged( int ))); + connect( m_value, TQ_SIGNAL( valueChanged ( int )), this, TQ_SLOT( slotValueChanged( int ))); } bool KWResizeTableDia::doResize() diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp index fd141c293..dd41bf4ca 100644 --- a/kword/KWSplitCellDia.cpp +++ b/kword/KWSplitCellDia.cpp @@ -78,8 +78,8 @@ KWSplitCellDia::KWSplitCellDia( TQWidget* parent, const char* name, unsigned int grid->activate(); enableButtonOK( !(m_rows==1 && m_cols==1) ); - connect( nRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( rowsChanged( int ) ) ); - connect( nCols, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( colsChanged( int ) ) ); + connect( nRows, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( rowsChanged( int ) ) ); + connect( nCols, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( colsChanged( int ) ) ); setFocus(); } diff --git a/kword/KWStartupWidget.cpp b/kword/KWStartupWidget.cpp index 0499a4273..014efd277 100644 --- a/kword/KWStartupWidget.cpp +++ b/kword/KWStartupWidget.cpp @@ -43,16 +43,16 @@ KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColu m_columnsWidget = new KoPageLayoutColumns(m_columnsTab, m_columns, m_doc->unit(), m_layout); lay->addWidget(m_columnsWidget); - connect (m_columnsWidget, TQT_SIGNAL( propertyChange(KoColumns&)), - this, TQT_SLOT (columnsUpdated( KoColumns&))); + connect (m_columnsWidget, TQ_SIGNAL( propertyChange(KoColumns&)), + this, TQ_SLOT (columnsUpdated( KoColumns&))); - connect (m_sizeWidget, TQT_SIGNAL( propertyChange(KoPageLayout&)), - this, TQT_SLOT (sizeUpdated( KoPageLayout&))); + connect (m_sizeWidget, TQ_SIGNAL( propertyChange(KoPageLayout&)), + this, TQ_SLOT (sizeUpdated( KoPageLayout&))); - connect (m_createButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT (buttonClicked()) ); + connect (m_createButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT (buttonClicked()) ); - connect (m_WpStyleCheckbox, TQT_SIGNAL(toggled(bool)), m_sizeWidget, TQT_SLOT(setEnableBorders(bool))); - connect (m_WpStyleCheckbox, TQT_SIGNAL(toggled(bool)), m_columnsWidget, TQT_SLOT(setEnableColumns(bool))); + connect (m_WpStyleCheckbox, TQ_SIGNAL(toggled(bool)), m_sizeWidget, TQ_SLOT(setEnableBorders(bool))); + connect (m_WpStyleCheckbox, TQ_SIGNAL(toggled(bool)), m_columnsWidget, TQ_SLOT(setEnableColumns(bool))); } void KWStartupWidget::sizeUpdated(KoPageLayout &layout) { diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp index 82b15bf10..3fd139bc6 100644 --- a/kword/KWStatisticsDialog.cpp +++ b/kword/KWStatisticsDialog.cpp @@ -280,7 +280,7 @@ void KWStatisticsDialog::addBox( TQFrame *page, TQLabel **resultLabel, bool calc TQVBoxLayout *noteLayout = new TQVBoxLayout( w, KDialog::marginHint(), 0 ); TQCheckBox *calcWithFootNote = new TQCheckBox( i18n("&Include text from foot- and endnotes"), w); noteLayout->addWidget( calcWithFootNote ); - connect( calcWithFootNote, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( slotRefreshValue(bool))); + connect( calcWithFootNote, TQ_SIGNAL(toggled ( bool )), this, TQ_SLOT( slotRefreshValue(bool))); } diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp index 6c68c32e6..06cf3860d 100644 --- a/kword/KWTableDia.cpp +++ b/kword/KWTableDia.cpp @@ -154,7 +154,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool cbIsFloating->setChecked( floating ); grid->addMultiCellWidget( cbIsFloating, 9, 9, 0, 2 ); - connect( cbIsFloating, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotInlineTable( bool ) ) ); + connect( cbIsFloating, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( slotInlineTable( bool ) ) ); #endif } else @@ -163,7 +163,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool cbReapplyTemplate1 = new TQCheckBox( i18n("Reapply template to table"), tab1 ); grid->addMultiCellWidget( cbReapplyTemplate1, 9, 9, 0, 2); - connect( cbReapplyTemplate1, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotSetReapply( bool ) ) ); + connect( cbReapplyTemplate1, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( slotSetReapply( bool ) ) ); } grid->addRowSpacing( 0, lRows->height() ); @@ -214,8 +214,8 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool grid->activate(); - connect( nRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( rowsChanged( int ) ) ); - connect( nCols, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( colsChanged( int ) ) ); + connect( nRows, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( rowsChanged( int ) ) ); + connect( nCols, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( colsChanged( int ) ) ); } void KWTableDia::setupTab2(const TQString & _templateName, int format ) @@ -235,7 +235,7 @@ void KWTableDia::setupTab2(const TQString & _templateName, int format ) grid->setRowStretch( 0, 1); grid->setRowStretch( 1, 0); - connect( cbReapplyTemplate2, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotSetReapply( bool ) ) ); + connect( cbReapplyTemplate2, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( slotSetReapply( bool ) ) ); } grid->activate(); } diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index 64e9ba135..9e083eec0 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -201,7 +201,7 @@ KWTableStyleManager::KWTableStyleManager( TQWidget *_parent, KWDocument *_doc ) switchStyle(); setInitialSize( TQSize( 450, 450 ) ); setButtonText( KDialogBase::User1, i18n("Import From File...") ); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(importFromFile())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(importFromFile())); } @@ -239,24 +239,24 @@ void KWTableStyleManager::setupWidget() m_moveUpButton = new TQPushButton( frame1, "moveUpButton" ); m_moveUpButton->setIconSet( SmallIconSet( "go-up" ) ); - connect( m_moveUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUpStyle() ) ); + connect( m_moveUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveUpStyle() ) ); frame1Layout->addWidget( m_moveUpButton, 1, 1 ); m_moveDownButton = new TQPushButton( frame1, "moveDownButton" ); m_moveDownButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( m_moveDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDownStyle() ) ); + connect( m_moveDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveDownStyle() ) ); frame1Layout->addWidget( m_moveDownButton, 1, 0 ); m_deleteButton = new TQPushButton( frame1, "deleteButton" ); m_deleteButton->setText( i18n( "&Delete" ) ); - connect( m_deleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteStyle() ) ); + connect( m_deleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteStyle() ) ); frame1Layout->addWidget( m_deleteButton, 2, 1 ); m_newButton = new TQPushButton( frame1, "newButton" ); m_newButton->setText( i18n( "New" ) ); - connect( m_newButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addStyle() ) ); + connect( m_newButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addStyle() ) ); frame1Layout->addWidget( m_newButton, 2, 0 ); @@ -266,7 +266,7 @@ void KWTableStyleManager::setupWidget() frame1Layout->addMultiCellWidget( main, 0, 2, 2, 2 ); - connect( m_stylesList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( switchStyle() ) ); + connect( m_stylesList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( switchStyle() ) ); } void KWTableStyleManager::setupMain() @@ -281,7 +281,7 @@ void KWTableStyleManager::setupMain() m_nameString = new TQLineEdit( main ); m_nameString->resize(m_nameString->sizeHint() ); - connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); + connect( m_nameString, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( renameStyle(const TQString &) ) ); mainLayout->addWidget( m_nameString, 0, 1 ); @@ -309,16 +309,16 @@ void KWTableStyleManager::setupMain() m_style = new TQComboBox( adjustBox ); updateAllStyleCombos(); - connect( m_frameStyle, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( selectFrameStyle(int) ) ); - connect( m_style, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( selectStyle(int) ) ); + connect( m_frameStyle, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( selectFrameStyle(int) ) ); + connect( m_style, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( selectStyle(int) ) ); m_changeFrameStyleButton = new TQPushButton( adjustBox ); m_changeFrameStyleButton->setText( i18n( "Change..." ) ); - connect( m_changeFrameStyleButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeFrameStyle() ) ); + connect( m_changeFrameStyleButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeFrameStyle() ) ); m_changeStyleButton = new TQPushButton( adjustBox ); m_changeStyleButton->setText( i18n( "Change..." ) ); - connect( m_changeStyleButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeStyle() ) ); + connect( m_changeStyleButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeStyle() ) ); adjustLayout->addWidget( frameStyleLabel, 0, 0 ); adjustLayout->addWidget( styleLabel, 1, 0 ); diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index cff93a813..0a5f9e892 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -589,13 +589,13 @@ KWTableTemplateSelector::KWTableTemplateSelector( KWDocument *_doc, TQWidget *_p grid->setColStretch( 1, 1 ); grid->activate(); - connect( cbFirstRow, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbFirstRowChanged( bool ) ) ); - connect( cbFirstCol, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbFirstColChanged( bool ) ) ); - connect( cbLastRow, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbLastRowChanged( bool ) ) ); - connect( cbLastCol, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbLastColChanged( bool ) ) ); - connect( cbBody, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbBodyChanged( bool ) ) ); + connect( cbFirstRow, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbFirstRowChanged( bool ) ) ); + connect( cbFirstCol, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbFirstColChanged( bool ) ) ); + connect( cbLastRow, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbLastRowChanged( bool ) ) ); + connect( cbLastCol, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbLastColChanged( bool ) ) ); + connect( cbBody, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbBodyChanged( bool ) ) ); - connect( lbTemplates, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( changeTableTemplate() ) ); + connect( lbTemplates, TQ_SIGNAL( selectionChanged () ), this, TQ_SLOT( changeTableTemplate() ) ); TQListBoxItem * item = lbTemplates->findItem( _tableTemplate ); int index = 0; if ( item ) diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 195ecd5d7..d0fbff38c 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -156,25 +156,25 @@ void KWTextFrameSet::init() m_textobj = new KoTextObject( textdoc, m_doc->styleCollection()->findStyle( "Standard" ), this, (m_name+"-textobj").utf8() ); m_doc->backSpeller()->registerNewTextObject( m_textobj ); - connect( m_textobj, TQT_SIGNAL( availableHeightNeeded() ), - TQT_SLOT( slotAvailableHeightNeeded() ) ); - connect( m_textobj, TQT_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), - TQT_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); - //connect( m_textobj, TQT_SIGNAL( formattingFirstParag() ), - // TQT_SLOT( slotFormattingFirstParag() ) ); - //connect( m_textobj, TQT_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), - // TQT_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); - connect( m_textobj, TQT_SIGNAL( newCommand( KCommand * ) ), - TQT_SLOT( slotNewCommand( KCommand * ) ) ); - connect( m_textobj, TQT_SIGNAL( repaintChanged( KoTextObject* ) ), - TQT_SLOT( slotRepaintChanged() ) ); - connect( m_textobj, TQT_SIGNAL( paragraphDeleted( KoTextParag*) ), - TQT_SLOT( slotParagraphDeleted(KoTextParag*) )); - - connect( m_textobj, TQT_SIGNAL( paragraphCreated( KoTextParag*) ), - TQT_SLOT( slotParagraphCreated(KoTextParag*) )); - connect( m_textobj, TQT_SIGNAL( paragraphModified( KoTextParag*, int, int, int) ), - TQT_SLOT( slotParagraphModified(KoTextParag*, int, int, int) )); + connect( m_textobj, TQ_SIGNAL( availableHeightNeeded() ), + TQ_SLOT( slotAvailableHeightNeeded() ) ); + connect( m_textobj, TQ_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), + TQ_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); + //connect( m_textobj, TQ_SIGNAL( formattingFirstParag() ), + // TQ_SLOT( slotFormattingFirstParag() ) ); + //connect( m_textobj, TQ_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), + // TQ_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); + connect( m_textobj, TQ_SIGNAL( newCommand( KCommand * ) ), + TQ_SLOT( slotNewCommand( KCommand * ) ) ); + connect( m_textobj, TQ_SIGNAL( repaintChanged( KoTextObject* ) ), + TQ_SLOT( slotRepaintChanged() ) ); + connect( m_textobj, TQ_SIGNAL( paragraphDeleted( KoTextParag*) ), + TQ_SLOT( slotParagraphDeleted(KoTextParag*) )); + + connect( m_textobj, TQ_SIGNAL( paragraphCreated( KoTextParag*) ), + TQ_SLOT( slotParagraphCreated(KoTextParag*) )); + connect( m_textobj, TQ_SIGNAL( paragraphModified( KoTextParag*, int, int, int) ), + TQ_SLOT( slotParagraphModified(KoTextParag*, int, int, int) )); } void KWTextFrameSet::slotParagraphModified(KoTextParag* _parag, int /*KoTextParag::ParagModifyType*/ _type, int start, int length) @@ -3099,11 +3099,11 @@ KWTextFrameSetEdit::KWTextFrameSetEdit( KWTextFrameSet * fs, KWCanvas * canvas ) //kdDebug(32001) << "KWTextFrameSetEdit::KWTextFrameSetEdit " << fs->name() << endl; KoTextView::setReadWrite( fs->kWordDocument()->isReadWrite() ); KoTextObject* textobj = fs->textObject(); - connect( textobj, TQT_SIGNAL( selectionChanged(bool) ), canvas, TQT_SIGNAL( selectionChanged(bool) ) ); - connect( fs, TQT_SIGNAL( frameDeleted(KWFrame *) ), this, TQT_SLOT( slotFrameDeleted(KWFrame *) ) ); - connect( textView(), TQT_SIGNAL( cut() ), TQT_SLOT( cut() ) ); - connect( textView(), TQT_SIGNAL( copy() ), TQT_SLOT( copy() ) ); - connect( textView(), TQT_SIGNAL( paste() ), TQT_SLOT( paste() ) ); + connect( textobj, TQ_SIGNAL( selectionChanged(bool) ), canvas, TQ_SIGNAL( selectionChanged(bool) ) ); + connect( fs, TQ_SIGNAL( frameDeleted(KWFrame *) ), this, TQ_SLOT( slotFrameDeleted(KWFrame *) ) ); + connect( textView(), TQ_SIGNAL( cut() ), TQ_SLOT( cut() ) ); + connect( textView(), TQ_SIGNAL( copy() ), TQ_SLOT( copy() ) ); + connect( textView(), TQ_SIGNAL( paste() ), TQ_SLOT( paste() ) ); updateUI( true, true ); if( canvas->gui() && canvas->gui()->getHorzRuler()) @@ -3133,7 +3133,7 @@ KoTextViewIface* KWTextFrameSetEdit::dcopObject() void KWTextFrameSetEdit::terminate(bool removeSelection) { - disconnect( textView()->textObject(), TQT_SIGNAL( selectionChanged(bool) ), m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); + disconnect( textView()->textObject(), TQ_SIGNAL( selectionChanged(bool) ), m_canvas, TQ_SIGNAL( selectionChanged(bool) ) ); textView()->terminate(removeSelection); } diff --git a/kword/KWView.cpp b/kword/KWView.cpp index fdf776dc2..278ea451b 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -267,8 +267,8 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW setXMLFile( "kword.rc" ); - TQObject::connect( this, TQT_SIGNAL( embeddImage( const TQString & ) ), - this, TQT_SLOT( slotEmbedImage( const TQString & ) ) ); + TQObject::connect( this, TQ_SIGNAL( embeddImage( const TQString & ) ), + this, TQ_SLOT( slotEmbedImage( const TQString & ) ) ); setKeyCompression( TRUE ); setAcceptDrops( TRUE ); @@ -312,52 +312,52 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW addStatusBarItem( m_sbUnitLabel, 0 ); } - connect( m_doc, TQT_SIGNAL( modified( bool ) ), - this, TQT_SLOT( documentModified( bool )) ); + connect( m_doc, TQ_SIGNAL( modified( bool ) ), + this, TQ_SLOT( documentModified( bool )) ); - connect( m_doc, TQT_SIGNAL( numPagesChanged() ), - this, TQT_SLOT( numPagesChanged()) ); + connect( m_doc, TQ_SIGNAL( numPagesChanged() ), + this, TQ_SLOT( numPagesChanged()) ); - connect( m_doc, TQT_SIGNAL( pageLayoutChanged( const KoPageLayout& ) ), - this, TQT_SLOT( slotPageLayoutChanged( const KoPageLayout& )) ); + connect( m_doc, TQ_SIGNAL( pageLayoutChanged( const KoPageLayout& ) ), + this, TQ_SLOT( slotPageLayoutChanged( const KoPageLayout& )) ); - connect( m_doc, TQT_SIGNAL( docStructureChanged(int) ), - this, TQT_SLOT( docStructChanged(int)) ); + connect( m_doc, TQ_SIGNAL( docStructureChanged(int) ), + this, TQ_SLOT( docStructChanged(int)) ); - connect( m_doc, TQT_SIGNAL( unitChanged(KoUnit::Unit) ), - this, TQT_SLOT( slotUnitChanged(KoUnit::Unit) ) ); + connect( m_doc, TQ_SIGNAL( unitChanged(KoUnit::Unit) ), + this, TQ_SLOT( slotUnitChanged(KoUnit::Unit) ) ); - connect( m_doc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), - this, TQT_SLOT( refreshCustomMenu())); + connect( m_doc, TQ_SIGNAL( sig_refreshMenuCustomVariable()), + this, TQ_SLOT( refreshCustomMenu())); - connect( m_doc, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotDocumentLoadingCompleted() ) ); + connect( m_doc, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotDocumentLoadingCompleted() ) ); - connect( frameViewManager(), TQT_SIGNAL(sigFrameSelectionChanged()), - this, TQT_SLOT( frameSelectedChanged())); + connect( frameViewManager(), TQ_SIGNAL(sigFrameSelectionChanged()), + this, TQ_SLOT( frameSelectedChanged())); - connect( frameViewManager(), TQT_SIGNAL(sigFrameSetRenamed()), - this, TQT_SLOT( updateFrameStatusBarItem())); + connect( frameViewManager(), TQ_SIGNAL(sigFrameSetRenamed()), + this, TQ_SLOT( updateFrameStatusBarItem())); - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardDataChanged() ) ); - connect( m_gui->canvasWidget(), TQT_SIGNAL(currentFrameSetEditChanged()), - this, TQT_SLOT(slotFrameSetEditChanged()) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL(currentFrameSetEditChanged()), + this, TQ_SLOT(slotFrameSetEditChanged()) ); - connect( m_gui->canvasWidget(), TQT_SIGNAL( currentMouseModeChanged(int) ), - this, TQT_SLOT( showMouseMode(int) ) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL( currentMouseModeChanged(int) ), + this, TQ_SLOT( showMouseMode(int) ) ); - connect( m_gui->canvasWidget(), TQT_SIGNAL( overwriteModeChanged( bool ) ), - this, TQT_SLOT( changeOverwriteMode( bool ) ) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL( overwriteModeChanged( bool ) ), + this, TQ_SLOT( changeOverwriteMode( bool ) ) ); // Cut and copy are directly connected to the selectionChanged signal if ( m_doc->isReadWrite() ) { - connect( m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - this, TQT_SLOT(slotChangeCutState(bool )) ); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - this, TQT_SLOT(slotChangeCaseState(bool ))); + connect( m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + this, TQ_SLOT(slotChangeCutState(bool )) ); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + this, TQ_SLOT(slotChangeCaseState(bool ))); } else { @@ -365,28 +365,28 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW m_actionChangeCase->setEnabled( false ); } - connect( m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionEditCopy, TQT_SLOT(setEnabled(bool)) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionEditCopy, TQ_SLOT(setEnabled(bool)) ); - //connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - // m_actionCreateStyleFromSelection, TQT_SLOT(setEnabled(bool))); + //connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + // m_actionCreateStyleFromSelection, TQ_SLOT(setEnabled(bool))); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionConvertToTextBox, TQT_SLOT(setEnabled(bool))); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionAddPersonalExpression, TQT_SLOT(setEnabled(bool ))); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionSortText, TQT_SLOT(setEnabled(bool ))); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionConvertToTextBox, TQ_SLOT(setEnabled(bool))); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionAddPersonalExpression, TQ_SLOT(setEnabled(bool ))); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionSortText, TQ_SLOT(setEnabled(bool ))); - connect( m_gui->canvasWidget(), TQT_SIGNAL(docStructChanged(int)), - this, TQT_SLOT(docStructChanged(int))); + connect( m_gui->canvasWidget(), TQ_SIGNAL(docStructChanged(int)), + this, TQ_SLOT(docStructChanged(int))); - connect( m_gui->canvasWidget(), TQT_SIGNAL(updateRuler()), - this, TQT_SLOT(slotUpdateRuler())); + connect( m_gui->canvasWidget(), TQ_SIGNAL(updateRuler()), + this, TQ_SLOT(slotUpdateRuler())); if ( shell() ) { - connect( shell(), TQT_SIGNAL( documentSaved()), m_doc,TQT_SLOT(slotDocumentInfoModifed() ) ); + connect( shell(), TQ_SIGNAL( documentSaved()), m_doc,TQ_SLOT(slotDocumentInfoModifed() ) ); changeNbOfRecentFiles( m_doc->maxRecentFiles() ); } @@ -405,8 +405,8 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW // Determine initial scroll position // We do this delayed, so that the GUI has been fully constructed // (and e.g. the statusbar can repaint). - TQTimer::singleShot( 0, this, TQT_SLOT( slotSetInitialPosition() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotSetInitialPosition() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } KWView::~KWView() @@ -563,72 +563,72 @@ void KWView::setupActions() // -------------- File menu m_actionExtraCreateTemplate = new TDEAction( i18n( "&Create Template From Document..." ), 0, - this, TQT_SLOT( extraCreateTemplate() ), + this, TQ_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); m_actionExtraCreateTemplate->setToolTip( i18n( "Save this document and use it later as a template" ) ); m_actionExtraCreateTemplate->setWhatsThis( i18n( "You can save this document as a template.<br><br>You can use this new template as a starting point for another document." ) ); - m_actionFileStatistics = new TDEAction( i18n( "Statistics" ), 0, this, TQT_SLOT( fileStatistics() ), actionCollection(), "file_statistics" ); + m_actionFileStatistics = new TDEAction( i18n( "Statistics" ), 0, this, TQ_SLOT( fileStatistics() ), actionCollection(), "file_statistics" ); m_actionFileStatistics->setToolTip( i18n( "Sentence, word and letter counts for this document" ) ); m_actionFileStatistics->setWhatsThis( i18n( "Information on the number of letters, words, syllables and sentences for this document.<p>Evaluates readability using the Flesch reading score." ) ); // -------------- Edit actions - m_actionEditCut = KStdAction::cut( this, TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - m_actionEditCopy = KStdAction::copy( this, TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - m_actionEditPaste = KStdAction::paste( this, TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - m_actionEditFind = KStdAction::find( this, TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); - m_actionEditFindNext = KStdAction::findNext( this, TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - m_actionEditFindPrevious = KStdAction::findPrev( this, TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - m_actionEditReplace = KStdAction::replace( this, TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); - m_actionEditSelectAll = KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - new TDEAction( i18n( "Select All Frames" ), 0, this, TQT_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); + m_actionEditCut = KStdAction::cut( this, TQ_SLOT( editCut() ), actionCollection(), "edit_cut" ); + m_actionEditCopy = KStdAction::copy( this, TQ_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + m_actionEditPaste = KStdAction::paste( this, TQ_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + m_actionEditFind = KStdAction::find( this, TQ_SLOT( editFind() ), actionCollection(), "edit_find" ); + m_actionEditFindNext = KStdAction::findNext( this, TQ_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); + m_actionEditFindPrevious = KStdAction::findPrev( this, TQ_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); + m_actionEditReplace = KStdAction::replace( this, TQ_SLOT( editReplace() ), actionCollection(), "edit_replace" ); + m_actionEditSelectAll = KStdAction::selectAll( this, TQ_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); + new TDEAction( i18n( "Select All Frames" ), 0, this, TQ_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); m_actionEditSelectCurrentFrame = new TDEAction( i18n( "Select Frame" ), 0, - 0, this, TQT_SLOT( editSelectCurrentFrame() ), + 0, this, TQ_SLOT( editSelectCurrentFrame() ), actionCollection(), "edit_selectcurrentframe" ); - m_actionSpellCheck = KStdAction::spelling( this, TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + m_actionSpellCheck = KStdAction::spelling( this, TQ_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); m_actionDeletePage = new TDEAction( i18n( "Delete Page" ), "delslide", 0, - this, TQT_SLOT( deletePage() ), + this, TQ_SLOT( deletePage() ), actionCollection(), "delete_page" ); kdDebug() << m_doc->pageCount() << " " << (m_doc->processingType() == KWDocument::DTP) << endl; (void) new TDEAction( i18n( "Configure Mai&l Merge..." ), "configure",0, - this, TQT_SLOT( editMailMergeDataBase() ), + this, TQ_SLOT( editMailMergeDataBase() ), actionCollection(), "edit_sldatabase" ); (void) new KWMailMergeLabelAction( i18n("Drag Mail Merge Variable"), 0, - this, TQT_SLOT(editMailMergeDataBase()), actionCollection(), "mailmerge_draglabel" ); + this, TQ_SLOT(editMailMergeDataBase()), actionCollection(), "mailmerge_draglabel" ); -// (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,this, TQT_SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser"); +// (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,this, TQ_SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser"); // -------------- Frame menu m_actionEditDelFrame = new TDEAction( i18n( "&Delete Frame" ), 0, - this, TQT_SLOT( editDeleteFrame() ), + this, TQ_SLOT( editDeleteFrame() ), actionCollection(), "edit_delframe" ); m_actionEditDelFrame->setToolTip( i18n( "Delete the currently selected frame(s)." ) ); m_actionEditDelFrame->setWhatsThis( i18n( "Delete the currently selected frame(s)." ) ); - m_actionCreateLinkedFrame = new TDEAction( i18n( "Create Linked Copy" ), 0, this, TQT_SLOT( createLinkedFrame() ), actionCollection(), "create_linked_frame" ); + m_actionCreateLinkedFrame = new TDEAction( i18n( "Create Linked Copy" ), 0, this, TQ_SLOT( createLinkedFrame() ), actionCollection(), "create_linked_frame" ); m_actionCreateLinkedFrame->setToolTip( i18n( "Create a copy of the current frame, always showing the same contents" ) ); m_actionCreateLinkedFrame->setWhatsThis( i18n("Create a copy of the current frame, that remains linked to it. This means they always show the same contents: modifying the contents in such a frame will update all its linked copies.") ); m_actionRaiseFrame = new TDEAction( i18n( "Ra&ise Frame" ), "raise", - TQt::CTRL +TQt::SHIFT+ TQt::Key_R, this, TQT_SLOT( raiseFrame() ), + TQt::CTRL +TQt::SHIFT+ TQt::Key_R, this, TQ_SLOT( raiseFrame() ), actionCollection(), "raiseframe" ); m_actionRaiseFrame->setToolTip( i18n( "Raise the currently selected frame so that it appears above all the other frames" ) ); m_actionRaiseFrame->setWhatsThis( i18n( "Raise the currently selected frame so that it appears above all the other frames. This is only useful if frames overlap each other. If multiple frames are selected they are all raised in turn." ) ); m_actionLowerFrame = new TDEAction( i18n( "&Lower Frame" ), "lower", - TQt::CTRL +TQt::SHIFT+ TQt::Key_L, this, TQT_SLOT( lowerFrame() ), + TQt::CTRL +TQt::SHIFT+ TQt::Key_L, this, TQ_SLOT( lowerFrame() ), actionCollection(), "lowerframe" ); m_actionLowerFrame->setToolTip( i18n( "Lower the currently selected frame so that it disappears under any frame that overlaps it" ) ); m_actionLowerFrame->setWhatsThis( i18n( "Lower the currently selected frame so that it disappears under any frame that overlaps it. If multiple frames are selected they are all lowered in turn." ) ); m_actionBringToFront= new TDEAction( i18n( "Bring to Front" ), "bring_forward", - 0, this, TQT_SLOT( bringToFront() ), + 0, this, TQ_SLOT( bringToFront() ), actionCollection(), "bring_tofront_frame" ); m_actionSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", - 0, this, TQT_SLOT( sendToBack() ), + 0, this, TQ_SLOT( sendToBack() ), actionCollection(), "send_toback_frame" ); @@ -637,14 +637,14 @@ void KWView::setupActions() if ( !m_doc->isEmbedded() ) { m_actionViewTextMode = new TDEToggleAction( i18n( "Text Mode" ), 0, - this, TQT_SLOT( viewTextMode() ), + this, TQ_SLOT( viewTextMode() ), actionCollection(), "view_textmode" ); m_actionViewTextMode->setToolTip( i18n( "Only show the text of the document." ) ); m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or layout. KWord will display only the text for editing." ) ); m_actionViewTextMode->setExclusiveGroup( "viewmodes" ); m_actionViewPageMode = new TDEToggleAction( i18n( "&Page Mode" ), 0, - this, TQT_SLOT( viewPageMode() ), + this, TQ_SLOT( viewPageMode() ), actionCollection(), "view_pagemode" ); m_actionViewPageMode->setWhatsThis( i18n( "Switch to page mode.<br><br> Page mode is designed to make editing your text easy.<br><br>This function is most frequently used to return to text editing after switching to preview mode." ) ); m_actionViewPageMode->setToolTip( i18n( "Switch to page editing mode." ) ); @@ -652,7 +652,7 @@ void KWView::setupActions() m_actionViewPageMode->setExclusiveGroup( "viewmodes" ); m_actionViewPageMode->setChecked( true ); m_actionViewPreviewMode = new TDEToggleAction( i18n( "Pre&view Mode" ), 0, - this, TQT_SLOT( viewPreviewMode() ), + this, TQ_SLOT( viewPreviewMode() ), actionCollection(), "view_previewmode" ); m_actionViewPreviewMode->setWhatsThis( i18n( "Zoom out from your document to get a look at several pages of your document.<br><br>The number of pages per line can be customized." ) ); m_actionViewPreviewMode->setToolTip( i18n( "Zoom out to a multiple page view." ) ); @@ -667,26 +667,26 @@ void KWView::setupActions() } m_actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, - this, TQT_SLOT( slotViewFormattingChars() ), + this, TQ_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); m_actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); m_actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.<br><br>When this is enabled, KWord shows you tabs, spaces, carriage returns and other non-printing characters." ) ); m_actionViewFrameBorders = new TDEToggleAction( i18n( "Frame &Borders" ), 0, - this, TQT_SLOT( slotViewFrameBorders() ), + this, TQ_SLOT( slotViewFrameBorders() ), actionCollection(), "view_frameborders" ); m_actionViewFrameBorders->setToolTip( i18n( "Turns the border display on and off." ) ); m_actionViewFrameBorders->setWhatsThis( i18n( "Turns the border display on and off.<br><br>The borders are never printed. This option is useful to see how the document will appear on the printed page." ) ); m_actionViewHeader = new TDEToggleAction( i18n( "Enable Document &Headers" ), 0, - this, TQT_SLOT( viewHeader() ), + this, TQ_SLOT( viewHeader() ), actionCollection(), "format_header" ); m_actionViewHeader->setCheckedState(i18n("Disable Document &Headers")); m_actionViewHeader->setToolTip( i18n( "Shows and hides header display." ) ); m_actionViewHeader->setWhatsThis( i18n( "Selecting this option toggles the display of headers in KWord.<br><br>Headers are special frames at the top of each page which can contain page numbers or other information." ) ); m_actionViewFooter = new TDEToggleAction( i18n( "Enable Document Foo&ters" ), 0, - this, TQT_SLOT( viewFooter() ), + this, TQ_SLOT( viewFooter() ), actionCollection(), "format_footer" ); m_actionViewFooter->setCheckedState(i18n("Disable Document Foo&ters")); m_actionViewFooter->setToolTip( i18n( "Shows and hides footer display." ) ); @@ -695,21 +695,21 @@ void KWView::setupActions() m_actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); - connect( m_actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( viewZoom( const TQString & ) ) ); + connect( m_actionViewZoom, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( viewZoom( const TQString & ) ) ); m_actionViewZoom->setEditable(true); changeZoomMenu( ); // -------------- Insert menu m_actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", TQt::ALT + TQt::SHIFT + TQt::Key_C, - this, TQT_SLOT( insertSpecialChar() ), + this, TQ_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); m_actionInsertSpecialChar->setToolTip( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); m_actionInsertSpecialChar->setWhatsThis( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); m_actionInsertFrameBreak = new TDEAction( TQString(), TQt::CTRL + TQt::Key_Return, - this, TQT_SLOT( insertFrameBreak() ), + this, TQ_SLOT( insertFrameBreak() ), actionCollection(), "insert_framebreak" ); if ( m_doc->processingType() == KWDocument::WP ) { m_actionInsertFrameBreak->setText( i18n( "Page Break" ) ); @@ -722,45 +722,45 @@ void KWView::setupActions() } /*actionInsertPage =*/ new TDEAction( m_doc->processingType() == KWDocument::WP ? i18n( "Page" ) : i18n( "Page..." ), "page", 0, - this, TQT_SLOT( insertPage() ), + this, TQ_SLOT( insertPage() ), actionCollection(), "insert_page" ); m_actionInsertLink = new TDEAction( i18n( "Link..." ), 0, - this, TQT_SLOT( insertLink() ), + this, TQ_SLOT( insertLink() ), actionCollection(), "insert_link" ); m_actionInsertLink->setToolTip( i18n( "Insert a Web address, email address or hyperlink to a file." ) ); m_actionInsertLink->setWhatsThis( i18n( "Insert a Web address, email address or hyperlink to a file." ) ); m_actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, - this, TQT_SLOT( insertComment() ), + this, TQ_SLOT( insertComment() ), actionCollection(), "insert_comment" ); m_actionInsertComment->setToolTip( i18n( "Insert a comment about the selected text." ) ); m_actionInsertComment->setWhatsThis( i18n( "Insert a comment about the selected text. These comments are not designed to appear on the final page." ) ); m_actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, - this, TQT_SLOT(editComment()), + this, TQ_SLOT(editComment()), actionCollection(), "edit_comment"); m_actionEditComment->setToolTip( i18n( "Change the content of a comment." ) ); m_actionEditComment->setWhatsThis( i18n( "Change the content of a comment." ) ); m_actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, - this, TQT_SLOT(removeComment()), + this, TQ_SLOT(removeComment()), actionCollection(), "remove_comment"); m_actionRemoveComment->setToolTip( i18n( "Remove the selected document comment." ) ); m_actionRemoveComment->setWhatsThis( i18n( "Remove the selected document comment." ) ); m_actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, - this, TQT_SLOT(copyTextOfComment()), + this, TQ_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); m_actionInsertFootEndNote = new TDEAction( i18n( "&Footnote/Endnote..." ), 0, - this, TQT_SLOT( insertFootNote() ), + this, TQ_SLOT( insertFootNote() ), actionCollection(), "insert_footendnote" ); m_actionInsertFootEndNote->setToolTip( i18n( "Insert a footnote referencing the selected text." ) ); m_actionInsertFootEndNote->setWhatsThis( i18n( "Insert a footnote referencing the selected text." ) ); m_actionInsertContents = new TDEAction( i18n( "Table of &Contents" ), 0, - this, TQT_SLOT( insertContents() ), + this, TQ_SLOT( insertContents() ), actionCollection(), "insert_contents" ); m_actionInsertContents->setToolTip( i18n( "Insert table of contents at the current cursor position." ) ); m_actionInsertContents->setWhatsThis( i18n( "Insert table of contents at the current cursor position." ) ); @@ -786,7 +786,7 @@ void KWView::setupActions() actionInsertVariable->popupMenu()->insertSeparator(); m_actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, - this, TQT_SLOT( refreshAllVariable() ), + this, TQ_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); m_actionRefreshAllVariable->setToolTip( i18n( "Update all variables to current values." ) ); m_actionRefreshAllVariable->setWhatsThis( i18n( "Update all variables in the document to current values.<br><br>This will update page numbers, dates or any other variables that need updating." ) ); @@ -798,90 +798,90 @@ void KWView::setupActions() loadexpressionActions( m_actionInsertExpression); m_actionToolsCreateText = new TDEToggleAction( i18n( "Te&xt Frame" ), "frame_text", TQt::Key_F10 /*same as kpr*/, - this, TQT_SLOT( toolsCreateText() ), + this, TQ_SLOT( toolsCreateText() ), actionCollection(), "tools_createtext" ); m_actionToolsCreateText->setToolTip( i18n( "Create a new text frame." ) ); m_actionToolsCreateText->setWhatsThis( i18n( "Create a new text frame." ) ); m_actionToolsCreateText->setExclusiveGroup( "tools" ); m_actionInsertFormula = new TDEAction( i18n( "For&mula" ), "frame_formula", TQt::Key_F4, - this, TQT_SLOT( insertFormula() ), + this, TQ_SLOT( insertFormula() ), actionCollection(), "tools_formula" ); m_actionInsertFormula->setToolTip( i18n( "Insert a formula into a new frame." ) ); m_actionInsertFormula->setWhatsThis( i18n( "Insert a formula into a new frame." ) ); m_actionInsertTable = new TDEAction( i18n( "&Table..." ), "inline_table", TQt::Key_F5, - this, TQT_SLOT( insertTable() ), + this, TQ_SLOT( insertTable() ), actionCollection(), "insert_table" ); m_actionInsertTable->setToolTip( i18n( "Create a table." ) ); m_actionInsertTable->setWhatsThis( i18n( "Create a table.<br><br>The table can either exist in a frame of its own or inline." ) ); m_actionToolsCreatePix = new TDEToggleAction( i18n( "P&icture..." ), "frame_image", // or inline_image ? TQt::SHIFT + TQt::Key_F5 /*same as kpr*/, - this, TQT_SLOT( insertPicture() ), + this, TQ_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); m_actionToolsCreatePix->setToolTip( i18n( "Create a new frame for a picture." ) ); m_actionToolsCreatePix->setWhatsThis( i18n( "Create a new frame for a picture or diagram." ) ); m_actionToolsCreatePix->setExclusiveGroup( "tools" ); m_actionToolsCreatePart = new KoPartSelectAction( i18n( "&Object Frame" ), "frame_query", - this, TQT_SLOT( toolsPart() ), + this, TQ_SLOT( toolsPart() ), actionCollection(), "tools_part" ); m_actionToolsCreatePart->setToolTip( i18n( "Insert an object into a new frame." ) ); m_actionToolsCreatePart->setWhatsThis( i18n( "Insert an object into a new frame." ) ); m_actionInsertFile = new TDEAction( i18n( "Fi&le..." ), 0, - this, TQT_SLOT( insertFile() ), + this, TQ_SLOT( insertFile() ), actionCollection(), "insert_file" ); // ------------------------- Format menu m_actionFormatFont = new TDEAction( i18n( "&Font..." ), TQt::ALT + TQt::CTRL + TQt::Key_F, - this, TQT_SLOT( formatFont() ), + this, TQ_SLOT( formatFont() ), actionCollection(), "format_font" ); m_actionFormatFont->setToolTip( i18n( "Change character size, font, boldface, italics etc." ) ); m_actionFormatFont->setWhatsThis( i18n( "Change the attributes of the currently selected characters." ) ); m_actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), TQt::ALT + TQt::CTRL + TQt::Key_P, - this, TQT_SLOT( formatParagraph() ), + this, TQ_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); m_actionFormatParag->setToolTip( i18n( "Change paragraph margins, text flow, borders, bullets, numbering etc." ) ); m_actionFormatParag->setWhatsThis( i18n( "Change paragraph margins, text flow, borders, bullets, numbering etc.<p>Select text in multiple paragraphs to change the formatting of all selected paragraphs.<p>If no text is selected, the paragraph where the cursor is located will be changed." ) ); m_actionFormatFrameSet = new TDEAction( i18n( "F&rame/Frameset Properties" ), 0, - this, TQT_SLOT( formatFrameSet() ), + this, TQ_SLOT( formatFrameSet() ), actionCollection(), "format_frameset" ); m_actionFormatFrameSet->setToolTip( i18n( "Alter frameset properties." ) ); m_actionFormatFrameSet->setWhatsThis( i18n( "Alter frameset properties.<p>Currently you can change the frame background." ) ); m_actionFormatPage = new TDEAction( i18n( "Page &Layout..." ), 0, - this, TQT_SLOT( formatPage() ), + this, TQ_SLOT( formatPage() ), actionCollection(), "format_page" ); m_actionFormatPage->setToolTip( i18n( "Change properties of entire page." ) ); m_actionFormatPage->setWhatsThis( i18n( "Change properties of the entire page.<p>Currently you can change paper size, paper orientation, header and footer sizes, and column settings." ) ); m_actionFormatFrameStylist = new TDEAction( i18n( "&Frame Style Manager" ), 0 /*shortcut?*/, - this, TQT_SLOT( extraFrameStylist() ), + this, TQ_SLOT( extraFrameStylist() ), actionCollection(), "frame_stylist" ); m_actionFormatFrameStylist->setToolTip( i18n( "Change attributes of framestyles." ) ); m_actionFormatFrameStylist->setWhatsThis( i18n( "Change background and borders of framestyles.<p>Multiple framestyles can be changed using the dialog box." ) ); m_actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), TQt::ALT + TQt::CTRL + TQt::Key_S, - this, TQT_SLOT( extraStylist() ), + this, TQ_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); m_actionFormatStylist->setToolTip( i18n( "Change attributes of styles." ) ); m_actionFormatStylist->setWhatsThis( i18n( "Change font and paragraph attributes of styles.<p>Multiple styles can be changed using the dialog box." ) ); m_actionFormatFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "format_fontsize" ); - connect( m_actionFormatFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - this, TQT_SLOT( textSizeSelected( int ) ) ); + connect( m_actionFormatFontSize, TQ_SIGNAL( fontSizeChanged( int ) ), + this, TQ_SLOT( textSizeSelected( int ) ) ); - m_actionFontSizeIncrease = new TDEAction( i18n("Increase Font Size"), "fontsizeup", TQt::CTRL + TQt::Key_Greater, this, TQT_SLOT( increaseFontSize() ), actionCollection(), "increase_fontsize" ); - m_actionFontSizeDecrease = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", TQt::CTRL + TQt::Key_Less, this, TQT_SLOT( decreaseFontSize() ), actionCollection(), "decrease_fontsize" ); + m_actionFontSizeIncrease = new TDEAction( i18n("Increase Font Size"), "fontsizeup", TQt::CTRL + TQt::Key_Greater, this, TQ_SLOT( increaseFontSize() ), actionCollection(), "increase_fontsize" ); + m_actionFontSizeDecrease = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", TQt::CTRL + TQt::Key_Less, this, TQ_SLOT( decreaseFontSize() ), actionCollection(), "decrease_fontsize" ); #ifdef KFONTACTION_HAS_CRITERIA_ARG m_actionFormatFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, @@ -891,8 +891,8 @@ void KWView::setupActions() m_actionFormatFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "format_fontfamily" ); #endif - connect( m_actionFormatFontFamily, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( textFontSelected( const TQString & ) ) ); + connect( m_actionFormatFontFamily, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( textFontSelected( const TQString & ) ) ); m_actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, actionCollection(), "format_stylemenu" ); @@ -900,12 +900,12 @@ void KWView::setupActions() actionCollection(), "format_style" ); // In fact, binding a key to this action will simply re-apply the current style. Why not. //m_actionFormatStyle->setShortcutConfigurable( false ); - connect( m_actionFormatStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( textStyleSelected( int ) ) ); + connect( m_actionFormatStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( textStyleSelected( int ) ) ); updateStyleList(); m_actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, - this, TQT_SLOT( textDefaultFormat() ), + this, TQ_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); m_actionFormatDefault->setToolTip( i18n( "Change font and paragraph attributes to their default values." ) ); m_actionFormatDefault->setWhatsThis( i18n( "Change font and paragraph attributes to their default values." ) ); @@ -913,76 +913,76 @@ void KWView::setupActions() // ----------------------- More format actions, for the toolbar only m_actionFormatBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", TQt::CTRL + TQt::Key_B, - this, TQT_SLOT( textBold() ), + this, TQ_SLOT( textBold() ), actionCollection(), "format_bold" ); m_actionFormatItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", TQt::CTRL + TQt::Key_I, - this, TQT_SLOT( textItalic() ), + this, TQ_SLOT( textItalic() ), actionCollection(), "format_italic" ); m_actionFormatUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", TQt::CTRL + TQt::Key_U, - this, TQT_SLOT( textUnderline() ), + this, TQ_SLOT( textUnderline() ), actionCollection(), "format_underline" ); m_actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 , - this, TQT_SLOT( textStrikeOut() ), + this, TQ_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); m_actionFormatAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", TQt::CTRL + TQt::Key_L, - this, TQT_SLOT( textAlignLeft() ), + this, TQ_SLOT( textAlignLeft() ), actionCollection(), "format_alignleft" ); m_actionFormatAlignLeft->setExclusiveGroup( "align" ); m_actionFormatAlignLeft->setChecked( TRUE ); m_actionFormatAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", TQt::CTRL + TQt::ALT + TQt::Key_C, - this, TQT_SLOT( textAlignCenter() ), + this, TQ_SLOT( textAlignCenter() ), actionCollection(), "format_aligncenter" ); m_actionFormatAlignCenter->setExclusiveGroup( "align" ); m_actionFormatAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", TQt::CTRL + TQt::ALT + TQt::Key_R, - this, TQT_SLOT( textAlignRight() ), + this, TQ_SLOT( textAlignRight() ), actionCollection(), "format_alignright" ); m_actionFormatAlignRight->setExclusiveGroup( "align" ); m_actionFormatAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", TQt::CTRL + TQt::Key_J, - this, TQT_SLOT( textAlignBlock() ), + this, TQ_SLOT( textAlignBlock() ), actionCollection(), "format_alignblock" ); m_actionFormatAlignBlock->setExclusiveGroup( "align" ); m_actionFormatSpacingSingle = new TDEToggleAction( i18n( "Line Spacing &1" ), "spacesimple", TQt::CTRL + TQt::Key_1, - this, TQT_SLOT( textSpacingSingle() ), + this, TQ_SLOT( textSpacingSingle() ), actionCollection(), "format_spacingsingle" ); m_actionFormatSpacingSingle->setExclusiveGroup( "spacing" ); m_actionFormatSpacingOneAndHalf = new TDEToggleAction( i18n( "Line Spacing 1.&5" ), "spacedouble", TQt::CTRL + TQt::Key_5, - this, TQT_SLOT( textSpacingOneAndHalf() ), + this, TQ_SLOT( textSpacingOneAndHalf() ), actionCollection(), "format_spacing15" ); m_actionFormatSpacingOneAndHalf->setExclusiveGroup( "spacing" ); m_actionFormatSpacingDouble = new TDEToggleAction( i18n( "Line Spacing &2" ), "spacetriple", TQt::CTRL + TQt::Key_2, - this, TQT_SLOT( textSpacingDouble() ), + this, TQ_SLOT( textSpacingDouble() ), actionCollection(), "format_spacingdouble" ); m_actionFormatSpacingDouble->setExclusiveGroup( "spacing" ); m_actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - this, TQT_SLOT( textSuperScript() ), + this, TQ_SLOT( textSuperScript() ), actionCollection(), "format_super" ); //m_actionFormatSuper->setExclusiveGroup( "valign" ); m_actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - this, TQT_SLOT( textSubScript() ), + this, TQ_SLOT( textSubScript() ), actionCollection(), "format_sub" ); //m_actionFormatSub->setExclusiveGroup( "valign" ); m_actionFormatIncreaseIndent= new TDEAction( i18n( "Increase Indent" ), TQApplication::reverseLayout() ? "format_decreaseindent" : "format_increaseindent", 0, - this, TQT_SLOT( textIncreaseIndent() ), + this, TQ_SLOT( textIncreaseIndent() ), actionCollection(), "format_increaseindent" ); m_actionFormatDecreaseIndent= new TDEAction( i18n( "Decrease Indent" ), TQApplication::reverseLayout() ? "format_increaseindent" :"format_decreaseindent", 0, - this, TQT_SLOT( textDecreaseIndent() ), + this, TQ_SLOT( textDecreaseIndent() ), actionCollection(), "format_decreaseindent" ); m_actionFormatColor = new TTDESelectColorAction( i18n( "Text Color..." ), TTDESelectColorAction::TextColor, - this, TQT_SLOT( textColor() ), + this, TQ_SLOT( textColor() ), actionCollection(), "format_color", true ); m_actionFormatColor->setDefaultColor(TQColor()); //actionFormatList = new TDEToggleAction( i18n( "List" ), "enumList", 0, - // this, TQT_SLOT( textList() ), + // this, TQ_SLOT( textList() ), // actionCollection(), "format_list" ); //actionFormatList->setExclusiveGroup( "style" ); @@ -999,7 +999,7 @@ void KWView::setupActions() // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu TDEToggleAction* act = new TDEToggleAction( styleIt.current()->name(), /*TODO icon,*/ - 0, this, TQT_SLOT( slotCounterStyleSelected() ), + 0, this, TQ_SLOT( slotCounterStyleSelected() ), actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise @@ -1018,19 +1018,19 @@ void KWView::setupActions() actionCollection(), "frame_stylemenu" ); m_actionFrameStyle = new TDESelectAction( i18n( "Framest&yle" ), 0, actionCollection(), "frame_style" ); - connect( m_actionFrameStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( frameStyleSelected( int ) ) ); + connect( m_actionFrameStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( frameStyleSelected( int ) ) ); updateFrameStyleList(); m_actionBorderOutline = new TDEToggleAction( i18n( "Border Outline" ), "borderoutline", - 0, this, TQT_SLOT( borderOutline() ), actionCollection(), "border_outline" ); + 0, this, TQ_SLOT( borderOutline() ), actionCollection(), "border_outline" ); m_actionBorderLeft = new TDEToggleAction( i18n( "Border Left" ), "borderleft", - 0, this, TQT_SLOT( borderLeft() ), actionCollection(), "border_left" ); + 0, this, TQ_SLOT( borderLeft() ), actionCollection(), "border_left" ); m_actionBorderRight = new TDEToggleAction( i18n( "Border Right" ), "borderright", - 0, this, TQT_SLOT( borderRight() ), actionCollection(), "border_right" ); + 0, this, TQ_SLOT( borderRight() ), actionCollection(), "border_right" ); m_actionBorderTop = new TDEToggleAction( i18n( "Border Top" ), "bordertop", - 0, this, TQT_SLOT( borderTop() ), actionCollection(), "border_top" ); + 0, this, TQ_SLOT( borderTop() ), actionCollection(), "border_top" ); m_actionBorderBottom = new TDEToggleAction( i18n( "Border Bottom" ), "borderbottom", - 0, this, TQT_SLOT( borderBottom() ), actionCollection(), "border_bottom" ); + 0, this, TQ_SLOT( borderBottom() ), actionCollection(), "border_bottom" ); m_actionBorderStyle = new TDESelectAction( i18n( "Border Style" ), 0, actionCollection(), "border_style" ); @@ -1058,55 +1058,55 @@ void KWView::setupActions() m_actionBackgroundColor->setToolTip( i18n( "Change background color for currently selected text." ) ); m_actionBackgroundColor->setWhatsThis( i18n( "Change background color for currently selected text." ) ); - connect(m_actionBackgroundColor,TQT_SIGNAL(activated()),TQT_SLOT(backgroundColor() )); + connect(m_actionBackgroundColor,TQ_SIGNAL(activated()),TQ_SLOT(backgroundColor() )); m_actionBackgroundColor->setDefaultColor(TQColor()); // ---------------------- Table menu m_actionTablePropertiesMenu = new TDEAction( i18n( "&Properties" ), 0, - this, TQT_SLOT( tableProperties() ), + this, TQ_SLOT( tableProperties() ), actionCollection(), "table_propertiesmenu" ); m_actionTablePropertiesMenu->setToolTip( i18n( "Adjust properties of the current table." ) ); m_actionTablePropertiesMenu->setWhatsThis( i18n( "Adjust properties of the current table." ) ); m_actionTableInsertRow = new TDEAction( i18n( "&Insert Row..." ), "insert_table_row", 0, - this, TQT_SLOT( tableInsertRow() ), + this, TQ_SLOT( tableInsertRow() ), actionCollection(), "table_insrow" ); m_actionTableInsertRow->setToolTip( i18n( "Insert one or more rows at cursor location." ) ); m_actionTableInsertRow->setWhatsThis( i18n( "Insert one or more rows at current cursor location." ) ); m_actionTableInsertCol = new TDEAction( i18n( "I&nsert Column..." ), "insert_table_col", 0, - this, TQT_SLOT( tableInsertCol() ), + this, TQ_SLOT( tableInsertCol() ), actionCollection(), "table_inscol" ); m_actionTableInsertCol->setToolTip( i18n( "Insert one or more columns into the current table." ) ); m_actionTableInsertCol->setWhatsThis( i18n( "Insert one or more columns into the current table." ) ); m_actionTableDelRow = new TDEAction( 0, "delete_table_row", 0, - this, TQT_SLOT( tableDeleteRow() ), + this, TQ_SLOT( tableDeleteRow() ), actionCollection(), "table_delrow" ); m_actionTableDelRow->setToolTip( i18n( "Delete selected rows from the current table." ) ); m_actionTableDelRow->setWhatsThis( i18n( "Delete selected rows from the current table." ) ); m_actionTableDelCol = new TDEAction( 0, "delete_table_col", 0, - this, TQT_SLOT( tableDeleteCol() ), + this, TQ_SLOT( tableDeleteCol() ), actionCollection(), "table_delcol" ); m_actionTableDelCol->setToolTip( i18n( "Delete selected columns from the current table." ) ); m_actionTableDelCol->setWhatsThis( i18n( "Delete selected columns from the current table." ) ); m_actionTableResizeCol = new TDEAction( i18n( "Resize Column..." ), 0, - this, TQT_SLOT( tableResizeCol() ), + this, TQ_SLOT( tableResizeCol() ), actionCollection(), "table_resizecol" ); m_actionTableResizeCol->setToolTip( i18n( "Change the width of the currently selected column." ) ); m_actionTableResizeCol->setWhatsThis( i18n( "Change the width of the currently selected column." ) ); m_actionTableJoinCells = new TDEAction( i18n( "&Join Cells" ), 0, - this, TQT_SLOT( tableJoinCells() ), + this, TQ_SLOT( tableJoinCells() ), actionCollection(), "table_joincells" ); m_actionTableJoinCells->setToolTip( i18n( "Join two or more cells into one large cell." ) ); m_actionTableJoinCells->setWhatsThis( i18n( "Join two or more cells into one large cell.<p>This is a good way to create titles and labels within a table." ) ); m_actionTableSplitCells= new TDEAction( i18n( "&Split Cell..." ), 0, - this, TQT_SLOT( tableSplitCells() ), + this, TQ_SLOT( tableSplitCells() ), actionCollection(), "table_splitcells" ); m_actionTableSplitCells->setToolTip( i18n( "Split one cell into two or more cells." ) ); m_actionTableSplitCells->setWhatsThis( i18n( "Split one cell into two or more cells.<p>Cells can be split horizontally, vertically or both directions at once." ) ); @@ -1114,26 +1114,26 @@ void KWView::setupActions() m_actionTableProtectCells= new TDEToggleAction( i18n( "Protect Cells" ), 0, 0, 0, actionCollection(), "table_protectcells" ); m_actionTableProtectCells->setToolTip( i18n( "Prevent changes to content of selected cells." ) ); - connect (m_actionTableProtectCells, TQT_SIGNAL( toggled(bool) ), this, - TQT_SLOT( tableProtectCells(bool) )); + connect (m_actionTableProtectCells, TQ_SIGNAL( toggled(bool) ), this, + TQ_SLOT( tableProtectCells(bool) )); m_actionTableProtectCells->setWhatsThis( i18n( "Toggles cell protection on and off.<br><br>When cell protection is on, the user can not alter the content or formatting of the text within the cell." ) ); m_actionTableUngroup = new TDEAction( i18n( "&Ungroup Table" ), 0, - this, TQT_SLOT( tableUngroupTable() ), + this, TQ_SLOT( tableUngroupTable() ), actionCollection(), "table_ungroup" ); m_actionTableUngroup->setToolTip( i18n( "Break a table into individual frames." ) ); m_actionTableUngroup->setWhatsThis( i18n( "Break a table into individual frames<p>Each frame can be moved independently around the page." ) ); m_actionTableDelete = new TDEAction( i18n( "Delete &Table" ), 0, - this, TQT_SLOT( tableDelete() ), + this, TQ_SLOT( tableDelete() ), actionCollection(), "table_delete" ); m_actionTableDelete->setToolTip( i18n( "Delete the entire table." ) ); m_actionTableDelete->setWhatsThis( i18n( "Deletes all cells and the content within the cells of the currently selected table." ) ); m_actionTableStylist = new TDEAction( i18n( "T&able Style Manager" ), 0, - this, TQT_SLOT( tableStylist() ), + this, TQ_SLOT( tableStylist() ), actionCollection(), "table_stylist" ); m_actionTableStylist->setToolTip( i18n( "Change attributes of tablestyles." ) ); m_actionTableStylist->setWhatsThis( i18n( "Change textstyle and framestyle of the tablestyles.<p>Multiple tablestyles can be changed using the dialog box." ) ); @@ -1142,19 +1142,19 @@ void KWView::setupActions() actionCollection(), "table_stylemenu" ); m_actionTableStyle = new TDESelectAction( i18n( "Table&style" ), 0, actionCollection(), "table_style" ); - connect( m_actionTableStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( tableStyleSelected( int ) ) ); + connect( m_actionTableStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( tableStyleSelected( int ) ) ); updateTableStyleList(); m_actionConvertTableToText = new TDEAction( i18n( "Convert Table to Text" ), 0, - this, TQT_SLOT( convertTableToText() ), + this, TQ_SLOT( convertTableToText() ), actionCollection(), "convert_table_to_text" ); m_actionSortText= new TDEAction( i18n( "Sort Text..." ), 0, - this, TQT_SLOT( sortText() ), + this, TQ_SLOT( sortText() ), actionCollection(), "sort_text" ); m_actionAddPersonalExpression= new TDEAction( i18n( "Add Expression" ), 0, - this, TQT_SLOT( addPersonalExpression() ), + this, TQ_SLOT( addPersonalExpression() ), actionCollection(), "add_personal_expression" ); @@ -1162,89 +1162,89 @@ void KWView::setupActions() m_actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, - this, TQT_SLOT( slotAllowAutoFormat() ), + this, TQ_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); m_actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); m_actionAllowAutoFormat->setToolTip( i18n( "Toggle autocorrection on and off." ) ); m_actionAllowAutoFormat->setWhatsThis( i18n( "Toggle autocorrection on and off." ) ); m_actionAutoFormat = new TDEAction( i18n( "Configure &Autocorrection..." ), 0, - this, TQT_SLOT( extraAutoFormat() ), + this, TQ_SLOT( extraAutoFormat() ), actionCollection(), "configure_autocorrection" ); m_actionAutoFormat->setToolTip( i18n( "Change autocorrection options." ) ); m_actionAutoFormat->setWhatsThis( i18n( "Change autocorrection options including:<p> <UL><LI><P>exceptions to autocorrection</P> <LI><P>add/remove autocorrection replacement text</P> <LI><P>and basic autocorrection options</P>." ) ); m_actionEditCustomVarsEdit = new TDEAction( i18n( "Custom &Variables..." ), 0, - this, TQT_SLOT( editCustomVars() ), // TODO: new dialog w add etc. + this, TQ_SLOT( editCustomVars() ), // TODO: new dialog w add etc. actionCollection(), "custom_vars" ); m_actionEditPersonnalExpr=new TDEAction( i18n( "Edit &Personal Expressions..." ), 0, - this, TQT_SLOT( editPersonalExpr() ), + this, TQ_SLOT( editPersonalExpr() ), actionCollection(), "personal_expr" ); m_actionEditPersonnalExpr->setToolTip( i18n( "Add or change one or more personal expressions." ) ); m_actionEditPersonnalExpr->setWhatsThis( i18n( "Add or change one or more personal expressions.<p>Personal expressions are a way to quickly insert commonly used phrases or text into your document." ) ); m_actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, - this, TQT_SLOT( changeCaseOfText() ), + this, TQ_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); m_actionChangeCase->setToolTip( i18n( "Alter the capitalization of selected text." ) ); m_actionChangeCase->setWhatsThis( i18n( "Alter the capitalization of selected text to one of five pre-defined patterns.<p>You can also switch all letters from upper case to lower case and from lower case to upper case in one move." ) ); //------------------------ Settings menu - m_actionConfigure = KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection(), "configure" ); + m_actionConfigure = KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection(), "configure" ); //------------------------ Menu frameSet TDEAction *actionChangePicture=new TDEAction( i18n( "Change Picture..." ),"frame_image",0, - this, TQT_SLOT( changePicture() ), + this, TQ_SLOT( changePicture() ), actionCollection(), "change_picture" ); actionChangePicture->setToolTip( i18n( "Change the picture in the currently selected frame." ) ); actionChangePicture->setWhatsThis( i18n( "You can specify a different picture in the current frame.<br><br>KWord automatically resizes the new picture to fit within the old frame." ) ); m_actionConfigureHeaderFooter=new TDEAction( i18n( "Configure Header/Footer..." ), 0, - this, TQT_SLOT( configureHeaderFooter() ), + this, TQ_SLOT( configureHeaderFooter() ), actionCollection(), "configure_headerfooter" ); m_actionConfigureHeaderFooter->setToolTip( i18n( "Configure the currently selected header or footer." ) ); m_actionConfigureHeaderFooter->setWhatsThis( i18n( "Configure the currently selected header or footer." ) ); m_actionInlineFrame = new TDEToggleAction( i18n( "Inline Frame" ), 0, - this, TQT_SLOT( inlineFrame() ), + this, TQ_SLOT( inlineFrame() ), actionCollection(), "inline_frame" ); m_actionInlineFrame->setToolTip( i18n( "Convert current frame to an inline frame." ) ); m_actionInlineFrame->setWhatsThis( i18n( "Convert the current frame to an inline frame.<br><br>Place the inline frame within the text at the point nearest to the frames current position." ) ); m_actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, - this, TQT_SLOT( openLink() ), + this, TQ_SLOT( openLink() ), actionCollection(), "open_link" ); m_actionOpenLink->setToolTip( i18n( "Open the link with the appropriate application." ) ); m_actionOpenLink->setWhatsThis( i18n( "Open the link with the appropriate application.<br><br>Web addresses are opened in a browser.<br>Email addresses begin a new message addressed to the link.<br>File links are opened by the appropriate viewer or editor." ) ); m_actionChangeLink=new TDEAction( i18n("Change Link..."), 0, - this, TQT_SLOT(changeLink()), + this, TQ_SLOT(changeLink()), actionCollection(), "change_link"); m_actionChangeLink->setToolTip( i18n( "Change the content of the currently selected link." ) ); m_actionChangeLink->setWhatsThis( i18n( "Change the details of the currently selected link." ) ); m_actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, - this, TQT_SLOT( copyLink() ), + this, TQ_SLOT( copyLink() ), actionCollection(), "copy_link" ); m_actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, - this, TQT_SLOT( addToBookmark() ), + this, TQ_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); m_actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, - this, TQT_SLOT( removeLink() ), + this, TQ_SLOT( removeLink() ), actionCollection(), "remove_link" ); m_actionShowDocStruct = new TDEToggleAction( i18n( "Show Doc Structure" ), 0, - this, TQT_SLOT( showDocStructure() ), + this, TQ_SLOT( showDocStructure() ), actionCollection(), "show_docstruct" ); m_actionShowDocStruct->setCheckedState(i18n("Hide Doc Structure")); m_actionShowDocStruct->setToolTip( i18n( "Open document structure sidebar." ) ); m_actionShowDocStruct->setWhatsThis( i18n( "Open document structure sidebar.<p>This sidebar helps you organize your document and quickly find pictures, tables etc." ) ); m_actionShowRuler = new TDEToggleAction( i18n( "Show Rulers" ), 0, - this, TQT_SLOT( showRuler() ), + this, TQ_SLOT( showRuler() ), actionCollection(), "show_ruler" ); m_actionShowRuler->setCheckedState(i18n("Hide Rulers")); m_actionShowRuler->setToolTip( i18n( "Shows or hides rulers." ) ); @@ -1254,16 +1254,16 @@ void KWView::setupActions() "the rulers from being displayed." ) ); m_actionViewShowGrid = new TDEToggleAction( i18n( "Show Grid" ), 0, - this, TQT_SLOT( viewGrid() ), + this, TQ_SLOT( viewGrid() ), actionCollection(), "view_grid" ); m_actionViewShowGrid->setCheckedState(i18n("Hide Grid")); m_actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, - this, TQT_SLOT(viewSnapToGrid() ), + this, TQ_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); m_actionConfigureCompletion = new TDEAction( i18n( "Configure C&ompletion..." ), 0, - this, TQT_SLOT( configureCompletion() ), + this, TQ_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); m_actionConfigureCompletion->setToolTip( i18n( "Change the words and options for autocompletion." ) ); m_actionConfigureCompletion->setWhatsThis( i18n( "Add words or change the options for autocompletion." ) ); @@ -1271,132 +1271,132 @@ void KWView::setupActions() // ------------------- Actions with a key binding and no GUI item new TDEAction( i18n( "Insert Non-Breaking Space" ), TQt::CTRL+TQt::Key_Space, - this, TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + this, TQ_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), TQt::CTRL+TQt::SHIFT+TQt::Key_Minus, - this, TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + this, TQ_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); new TDEAction( i18n( "Insert Soft Hyphen" ), TQt::CTRL+TQt::Key_Minus, - this, TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + this, TQ_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, - this, TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + this, TQ_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); - new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), this, TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), this, TQ_SLOT( slotCompletion() ), actionCollection(), "completion" ); new TDEAction( i18n( "Increase Numbering Level" ), TQt::ALT+TQt::Key_Right, - this, TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + this, TQ_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); new TDEAction( i18n( "Decrease Numbering Level" ), TQt::ALT+TQt::Key_Left, - this, TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + this, TQ_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); // -------- m_actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, - this, TQT_SLOT( editCustomVariable() ), + this, TQ_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); m_actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, - this, TQT_SLOT( applyAutoFormat() ), + this, TQ_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); m_actionApplyAutoFormat->setToolTip( i18n( "Manually force KWord to scan the entire document and apply autocorrection." ) ); m_actionApplyAutoFormat->setWhatsThis( i18n( "Manually force KWord to scan the entire document and apply autocorrection." ) ); m_actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, - this, TQT_SLOT( createStyleFromSelection()), + this, TQ_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); m_actionCreateStyleFromSelection->setToolTip( i18n( "Create a new style based on the currently selected text." ) ); m_actionCreateStyleFromSelection->setWhatsThis( i18n( "Create a new style based on the currently selected text." ) ); // ## "on the current paragraph, taking the formatting from where the cursor is. Selecting text isn't even needed." m_actionConfigureFootEndNote = new TDEAction( i18n( "&Footnote..." ), 0, - this, TQT_SLOT( configureFootEndNote()), + this, TQ_SLOT( configureFootEndNote()), actionCollection(), "format_footendnote" ); m_actionConfigureFootEndNote->setToolTip( i18n( "Change the look of footnotes." ) ); m_actionConfigureFootEndNote->setWhatsThis( i18n( "Change the look of footnotes." ) ); m_actionEditFootEndNote= new TDEAction( i18n("Edit Footnote"), 0, - this, TQT_SLOT( editFootEndNote()), + this, TQ_SLOT( editFootEndNote()), actionCollection(), "edit_footendnote" ); m_actionEditFootEndNote->setToolTip( i18n( "Change the content of the currently selected footnote." ) ); m_actionEditFootEndNote->setWhatsThis( i18n( "Change the content of the currently selected footnote." ) ); m_actionChangeFootNoteType = new TDEAction( i18n("Change Footnote/Endnote Parameter"), 0, - this, TQT_SLOT( changeFootNoteType() ), + this, TQ_SLOT( changeFootNoteType() ), actionCollection(), "change_footendtype"); m_actionSavePicture= new TDEAction( i18n("Save Picture As..."), 0, - this, TQT_SLOT( savePicture() ), + this, TQ_SLOT( savePicture() ), actionCollection(), "save_picture"); m_actionSavePicture->setToolTip( i18n( "Save the picture in a separate file." ) ); m_actionSavePicture->setWhatsThis( i18n( "Save the picture in the currently selected frame in a separate file, outside the KWord document." ) ); m_actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, - this, TQT_SLOT( autoSpellCheck() ), + this, TQ_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); m_actionGoToFootEndNote = new TDEAction( TQString() /*set dynamically*/, 0, - this, TQT_SLOT( goToFootEndNote() ), + this, TQ_SLOT( goToFootEndNote() ), actionCollection(), "goto_footendnote" ); // Document Structure Area popup menu. m_actionDocStructEdit = new TDEAction( i18n( "Edit Text" ), 0, - this, TQT_SLOT( docStructEdit() ), + this, TQ_SLOT( docStructEdit() ), actionCollection(), "docstruct_edit" ); m_actionDocStructSpeak = new TDEAction( i18n("Speak Text" ), 0, - this, TQT_SLOT( docStructSpeak() ), + this, TQ_SLOT( docStructSpeak() ), actionCollection(), "docstruct_speak" ); m_actionDocStructSelect = new TDEAction( i18n( "Show" ), 0, - this, TQT_SLOT( docStructSelect() ), + this, TQ_SLOT( docStructSelect() ), actionCollection(), "docstruct_select" ); m_actionDocStructDelete = new TDEAction( i18n( "Delete Frame" ), 0, - this, TQT_SLOT( docStructDelete() ), + this, TQ_SLOT( docStructDelete() ), actionCollection(), "docstruct_delete" ); m_actionDocStructProperties = new TDEAction( i18n( "Properties" ), 0, - this, TQT_SLOT( docStructProperties() ), + this, TQ_SLOT( docStructProperties() ), actionCollection(), "docstruct_properties" ); m_actionAddBookmark= new TDEAction( i18n( "&Bookmark..." ), 0, - this, TQT_SLOT( addBookmark() ), + this, TQ_SLOT( addBookmark() ), actionCollection(), "add_bookmark" ); m_actionSelectBookmark= new TDEAction( i18n( "Select &Bookmark..." ), 0, - this, TQT_SLOT( selectBookmark() ), + this, TQ_SLOT( selectBookmark() ), actionCollection(), "select_bookmark" ); m_actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, - this, TQT_SLOT( importStyle() ), + this, TQ_SLOT( importStyle() ), actionCollection(), "import_style" ); m_actionCreateFrameStyle = new TDEAction( i18n( "&Create Framestyle From Frame..." ), 0, - this, TQT_SLOT( createFrameStyle()), + this, TQ_SLOT( createFrameStyle()), actionCollection(), "create_framestyle" ); m_actionCreateFrameStyle->setToolTip( i18n( "Create a new style based on the currently selected frame." ) ); m_actionCreateFrameStyle->setWhatsThis( i18n( "Create a new framestyle based on the currently selected frame." ) ); #if 0 // re-enable after fixing m_actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, - this, TQT_SLOT( insertDirectCursor() ), + this, TQ_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif m_actionConvertToTextBox = new TDEAction( i18n( "Convert to Text Box" ), 0, - this, TQT_SLOT( convertToTextBox() ), + this, TQ_SLOT( convertToTextBox() ), actionCollection(), "convert_to_text_box" ); m_actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, - this, TQT_SLOT( slotAddIgnoreAllWord() ), + this, TQ_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); m_actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, - this, TQT_SLOT( addWordToDictionary() ), + this, TQ_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); m_actionEmbeddedStoreInternal=new TDEToggleAction( i18n( "Store Document Internally" ),0, - this, TQT_SLOT( embeddedStoreInternal() ), + this, TQ_SLOT( embeddedStoreInternal() ), actionCollection(), "embedded_store_internal" ); m_actionGoToDocumentStructure=new TDEAction( i18n( "Go to Document Structure" ), TDEShortcut("Alt+1"), - this, TQT_SLOT( goToDocumentStructure() ), + this, TQ_SLOT( goToDocumentStructure() ), actionCollection(), "goto_document_structure" ); m_actionGoToDocument=new TDEAction( i18n( "Go to Document" ), TDEShortcut("Alt+2"), - this, TQT_SLOT( goToDocument() ), + this, TQ_SLOT( goToDocument() ), actionCollection(), "goto_document" ); // For RMB inside a cell, see KWFrameView::showPopup @@ -1489,7 +1489,7 @@ void KWView::createExpressionActions( TDEActionMenu * parentMenu,const TQString& if ( e2.tagName() == "Expression" ) { TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() ); - TDEAction * act = new TDEAction( text, 0, this, TQT_SLOT( insertExpression() ), + TDEAction * act = new TDEAction( text, 0, this, TQ_SLOT( insertExpression() ), actionCollection(), TQString("expression-action_%1").arg(i).latin1() ); if ( personalShortCut.contains(text) ) @@ -1539,7 +1539,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts, v.subtype = i; TQCString actionName; actionName.sprintf( "var-action-%d-%d", type, i ); - TDEAction * act = new TDEAction( (*it), 0, this, TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, this, TQ_SLOT( insertVariable() ), actionCollection(), actionName ); // Mainly for KEditToolbar act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) ); @@ -1584,7 +1584,7 @@ void KWView::refreshCustomMenu() { lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); - act = new TDEAction( varName, shortCuts[varName], this, TQT_SLOT( insertCustomVariable() ),actionCollection(), name ); + act = new TDEAction( varName, shortCuts[varName], this, TQ_SLOT( insertCustomVariable() ),actionCollection(), name ); act->setGroup( "custom-variable-action" ); m_actionInsertCustom->insert( act ); i++; @@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu() if(state) m_actionInsertCustom->popupMenu()->insertSeparator(); - act = new TDEAction( i18n("New..."), 0, this, TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); + act = new TDEAction( i18n("New..."), 0, this, TQ_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); act->setGroup( "custom-variable-action" ); @@ -2228,7 +2228,7 @@ void KWView::updateStyleList() { TQString name = PARAGSTYLE_ACTION_PREFIX + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), - shortCuts[name], this, TQT_SLOT( slotStyleSelected() ), + shortCuts[name], this, TQ_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); act->setExclusiveGroup( "styleListAction" ); @@ -2294,7 +2294,7 @@ void KWView::updateFrameStyleList() TQString name = FRAMESTYLE_ACTION_PREFIX + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), shortCuts[name], // KDE4: use value() - this, TQT_SLOT( slotFrameStyleSelected() ), + this, TQ_SLOT( slotFrameStyleSelected() ), actionCollection(), name.utf8() /*KDE4: remove conversion*/ ); act->setGroup( "frameStyleList" ); act->setExclusiveGroup( "frameStyleList" ); @@ -2344,7 +2344,7 @@ void KWView::updateTableStyleList() { TQString name = TABLESTYLE_ACTION_PREFIX + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), - shortCuts[name], this, TQT_SLOT( slotTableStyleSelected() ), + shortCuts[name], this, TQ_SLOT( slotTableStyleSelected() ), actionCollection(), name.utf8() ); act->setExclusiveGroup( "tableStyleList" ); act->setGroup( "tableStyleList" ); @@ -2941,7 +2941,7 @@ void KWView::viewTextMode() { case KoZoomMode::ZOOM_WIDTH: m_doc->setZoomMode(KoZoomMode::ZOOM_WIDTH); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: // no break m_zoomViewModeNormal.m_zoomMode = KoZoomMode::ZOOM_CONSTANT; @@ -2977,11 +2977,11 @@ void KWView::viewPageMode() { case KoZoomMode::ZOOM_WIDTH: m_doc->setZoomMode(KoZoomMode::ZOOM_WIDTH); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: m_doc->setZoomMode(KoZoomMode::ZOOM_PAGE); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_CONSTANT: m_doc->setZoomMode(KoZoomMode::ZOOM_CONSTANT); @@ -3005,11 +3005,11 @@ void KWView::viewPreviewMode() { case KoZoomMode::ZOOM_WIDTH: m_doc->setZoomMode(KoZoomMode::ZOOM_WIDTH); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: m_doc->setZoomMode(KoZoomMode::ZOOM_PAGE); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_CONSTANT: m_doc->setZoomMode(KoZoomMode::ZOOM_CONSTANT); @@ -3230,7 +3230,7 @@ void KWView::viewZoom( const TQString &s ) if(zoom != m_doc->zoom() && !canvas->verticalScrollBar() || !canvas->verticalScrollBar()->isVisible()) { // has no vertical scrollbar // we have to do this twice to take into account a possibly appearing vertical scrollbar - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } ok = true; } @@ -3450,10 +3450,10 @@ void KWView::insertSpecialChar() if (m_specialCharDlg==0) { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); - connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - connect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + connect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + connect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -3462,10 +3462,10 @@ void KWView::slotSpecialCharDlgClosed() { if ( m_specialCharDlg ) { - disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + disconnect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + disconnect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } @@ -3649,8 +3649,8 @@ void KWView::formatFont() , m_broker , this, "" ); - connect( m_fontDlg, TQT_SIGNAL( applyFont() ), - this, TQT_SLOT( slotApplyFont() ) ); + connect( m_fontDlg, TQ_SIGNAL( applyFont() ), + this, TQ_SLOT( slotApplyFont() ) ); m_fontDlg->exec(); delete m_fontDlg; @@ -3713,7 +3713,7 @@ void KWView::showParagraphDialog( int initialPage, double initialTabPos ) if ( initialPage == KoParagDia::PD_TABS ) m_paragDlg->tabulatorsWidget()->setCurrentTab( initialTabPos ); } - connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), this, TQT_SLOT( slotApplyParag())); + connect( m_paragDlg, TQ_SIGNAL( applyParagStyle() ), this, TQ_SLOT( slotApplyParag())); m_paragDlg->exec(); delete m_paragDlg; @@ -5568,16 +5568,16 @@ void KWView::startKSpell() m_spell.dlg = new KSpell2::Dialog( m_spell.kospell, this ); m_spell.dlg->activeAutoCorrect( true ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), - this, TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), - this, TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), - this, TQT_SLOT(spellCheckerDone(const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), - this, TQT_SLOT( spellCheckerCancel() ) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), - this, TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(misspelling(const TQString&, int)), + this, TQ_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(replace(const TQString&, int, const TQString&)), + this, TQ_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(done(const TQString&) ), + this, TQ_SLOT(spellCheckerDone(const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(cancel() ), + this, TQ_SLOT( spellCheckerCancel() ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), + this, TQ_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); m_spell.dlg->show(); //clearSpellChecker(); @@ -6052,8 +6052,8 @@ int KWView::canvasYOffset() const void KWView::canvasAddChild( KoViewChild * child ) { - connect( m_gui->canvasWidget(), TQT_SIGNAL( viewTransformationsChanged() ), - child, TQT_SLOT( reposition() ) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL( viewTransformationsChanged() ), + child, TQ_SLOT( reposition() ) ); // Not necessary anymore //m_gui->canvasWidget()->addChild( child->frame() ); } @@ -6298,14 +6298,14 @@ void KWView::showDocStructure() { m_doc->setShowDocStruct(m_actionShowDocStruct->isChecked()); m_doc->reorganizeGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } void KWView::showRuler() { m_doc->setShowRuler( m_actionShowRuler->isChecked()); m_doc->reorganizeGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } void KWView::viewGrid() @@ -7448,7 +7448,7 @@ TQPtrList<TDEAction> KWView::listOfResultOfCheckWord( const TQString &word ) if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { TDEAction * act = new TDEAction( *it ); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotCorrectWord()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotCorrectWord()) ); listAction.append( act ); } } @@ -7578,7 +7578,7 @@ void KWViewWidget::resizeEvent( TQResizeEvent *e ) if ( ( e->size().width() != e->oldSize().width() ) && ( m_view->kWordDocument()->zoomMode() == KoZoomMode::ZOOM_WIDTH ) ) { - TQTimer::singleShot( 0, m_view, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, m_view, TQ_SLOT( updateZoom() ) ); } TQWidget::resizeEvent( e ); @@ -7638,17 +7638,17 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) m_horRuler->setGridSize(doc->gridX()); - connect( m_horRuler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); - connect( m_horRuler, TQT_SIGNAL( newLeftIndent( double ) ), m_view, TQT_SLOT( newLeftIndent( double ) ) ); - connect( m_horRuler, TQT_SIGNAL( newFirstIndent( double ) ), m_view, TQT_SLOT( newFirstIndent( double ) ) ); - connect( m_horRuler, TQT_SIGNAL( newRightIndent( double ) ), m_view, TQT_SLOT( newRightIndent( double ) ) ); + connect( m_horRuler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); + connect( m_horRuler, TQ_SIGNAL( newLeftIndent( double ) ), m_view, TQ_SLOT( newLeftIndent( double ) ) ); + connect( m_horRuler, TQ_SIGNAL( newFirstIndent( double ) ), m_view, TQ_SLOT( newFirstIndent( double ) ) ); + connect( m_horRuler, TQ_SIGNAL( newRightIndent( double ) ), m_view, TQ_SLOT( newRightIndent( double ) ) ); - connect( m_horRuler, TQT_SIGNAL( doubleClicked() ), m_view, TQT_SLOT( slotHRulerDoubleClicked() ) ); - connect( m_horRuler, TQT_SIGNAL( doubleClicked(double) ), m_view, TQT_SLOT( slotHRulerDoubleClicked(double) ) ); - connect( m_horRuler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); - connect( m_vertRuler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); - connect( m_vertRuler, TQT_SIGNAL( doubleClicked() ), m_view, TQT_SLOT( formatPage() ) ); - connect( m_vertRuler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + connect( m_horRuler, TQ_SIGNAL( doubleClicked() ), m_view, TQ_SLOT( slotHRulerDoubleClicked() ) ); + connect( m_horRuler, TQ_SIGNAL( doubleClicked(double) ), m_view, TQ_SLOT( slotHRulerDoubleClicked(double) ) ); + connect( m_horRuler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); + connect( m_vertRuler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); + connect( m_vertRuler, TQ_SIGNAL( doubleClicked() ), m_view, TQ_SLOT( formatPage() ) ); + connect( m_vertRuler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); m_horRuler->hide(); m_vertRuler->hide(); @@ -7657,8 +7657,8 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) reorganize(); - connect( m_horRuler, TQT_SIGNAL( tabListChanged( const KoTabulatorList & ) ), m_view, - TQT_SLOT( tabListChanged( const KoTabulatorList & ) ) ); + connect( m_horRuler, TQ_SIGNAL( tabListChanged( const KoTabulatorList & ) ), m_view, + TQ_SLOT( tabListChanged( const KoTabulatorList & ) ) ); setKeyCompression( TRUE ); setAcceptDrops( TRUE ); diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index 2588b06e4..c05ad1aec 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -245,12 +245,12 @@ KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KW addColumn( i18n( "Name" ) ); addColumn( i18n( "Value" ) ); header()->setMovingEnabled( FALSE ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( columnSizeChange( int, int, int ) ) ); -// connect( header(), TQT_SIGNAL( sectionClicked( int ) ), -// this, TQT_SLOT( sectionClicked( int ) ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( columnSizeChange( int, int, int ) ) ); +// connect( header(), TQ_SIGNAL( sectionClicked( int ) ), +// this, TQ_SLOT( sectionClicked( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); currentRecord = -1; } @@ -343,27 +343,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS first = new TQToolButton( toolbar ); first->setIconSet( SmallIconSet( "go-first" ) ); first->setFixedSize( first->sizeHint() ); - connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord())); + connect(first, TQ_SIGNAL(clicked()), this, TQ_SLOT(firstRecord())); back_ = new TQToolButton( toolbar ); back_->setIconSet( SmallIconSet( "back" ) ); back_->setFixedSize( back_->sizeHint() ); - connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord())); + connect(back_, TQ_SIGNAL(clicked()), this, TQ_SLOT(prevRecord())); records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar ); records->setMaximumHeight( records->sizeHint().height() ); - connect( records, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( changeRecord( int ) ) ); + connect( records, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( changeRecord( int ) ) ); forward = new TQToolButton( toolbar ); forward->setIconSet( SmallIconSet( "forward" ) ); forward->setFixedSize( forward->sizeHint() ); - connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord())); + connect(forward, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextRecord())); finish = new TQToolButton( toolbar ); finish->setIconSet( SmallIconSet( "go-last" ) ); finish->setFixedSize( finish->sizeHint() ); - connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord())); + connect(finish, TQ_SIGNAL(clicked()), this, TQ_SLOT(lastRecord())); TQWidget *sep = new TQWidget( toolbar ); sep->setMaximumWidth( 10 ); @@ -371,29 +371,29 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS newRecord = new TQToolButton( toolbar ); newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) ); newRecord->setFixedSize( newRecord->sizeHint() ); - connect( newRecord, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addRecord() ) ); + connect( newRecord, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addRecord() ) ); TQToolTip::add( newRecord, i18n( "Add record" ) ); newEntry = new TQToolButton( toolbar ); newEntry->setIconSet( SmallIconSet( "sl_addentry" ) ); newEntry->setFixedSize( newEntry->sizeHint() ); - connect( newEntry, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addEntry() ) ); + connect( newEntry, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addEntry() ) ); TQToolTip::add( newEntry, i18n( "Add entry" ) ); deleteRecord = new TQToolButton( toolbar ); deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) ); deleteRecord->setFixedSize( deleteRecord->sizeHint() ); - connect( deleteRecord, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeRecord() ) ); + connect( deleteRecord, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeRecord() ) ); TQToolTip::add( deleteRecord, i18n( "Remove record" ) ); deleteEntry = new TQToolButton( toolbar ); deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) ); deleteEntry->setFixedSize( deleteEntry->sizeHint() ); - connect( deleteEntry, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeEntry() ) ); + connect( deleteEntry, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeEntry() ) ); TQToolTip::add( deleteEntry, i18n( "Remove entry" ) ); dbList = new KWClassicMailMergeEditorList( back, db ); diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 527d1e687..6b93e3d32 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -100,7 +100,7 @@ void KWMailMergeKSpread::initDocument() { _document = new Doc(); - connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( initSpreadSheets() ) ); + connect( _document, TQ_SIGNAL( completed() ), TQ_SLOT( initSpreadSheets() ) ); _document->openURL( _url ); } diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp index 441c3207e..005546251 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp @@ -46,8 +46,8 @@ KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMerg _urlRequester->setURL( _object->url().url() ); _initialPage = _object->spreadSheetNumber(); - connect( _urlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( loadDocument() ) ); + connect( _urlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( loadDocument() ) ); loadDocument(); slotTextChanged( _urlRequester->lineEdit()->text() ); @@ -75,7 +75,7 @@ void KWMailMergeKSpreadConfig::loadDocument() if ( !_urlRequester->url().isEmpty() ) { _document = new Doc(); - connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( documentLoaded() ) ); + connect( _document, TQ_SIGNAL( completed() ), TQ_SLOT( documentLoaded() ) ); _document->openURL( _urlRequester->url() ); } @@ -114,7 +114,7 @@ void KWMailMergeKSpreadConfig::initGUI() _pageNumber = new KComboBox( page ); _pageNumber->setEnabled( false ); layout->addWidget( _pageNumber, 1, 1 ); - connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( _urlRequester->lineEdit() , TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); } void KWMailMergeKSpreadConfig::slotTextChanged( const TQString & _text ) diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index 08def7cd8..ad692ddcd 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -40,7 +40,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent) for (int i=0;i<3;i++) w+=m_table->columnWidth(i); w+=m_table->verticalHeader()->headerWidth(); m_table->setMinimumWidth(w); - connect(m_table,TQT_SIGNAL(valueChanged ( int, int)),this,TQT_SLOT(slotValueChanged ( int, int))); + connect(m_table,TQ_SIGNAL(valueChanged ( int, int)),this,TQ_SLOT(slotValueChanged ( int, int))); } void KWQtSqlEasyFilter::createColumn(int i) diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index 538e36a6d..951944b24 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -47,11 +47,11 @@ KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataS widget->port->setText(db->port); widget->databasename->setText(db->databasename); fillSavedProperties(); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(handleOk())); - connect(widget->savedProperties,TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(savedPropertiesChanged(const TQString&))); - connect(widget->rememberButton,TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSave())); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(handleOk())); + connect(widget->savedProperties,TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(savedPropertiesChanged(const TQString&))); + connect(widget->rememberButton,TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSave())); } KWQtSqlMailMergeOpen::~KWQtSqlMailMergeOpen(){;} diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index a30340ad5..afc464ed1 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -180,10 +180,10 @@ KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQt { (new TQVBoxLayout(plainPage()))->setAutoAdd(true); setMainWidget(widget=new KWQtSqlPowerWidget(plainPage())); - connect(widget->setup,TQT_SIGNAL(clicked()),this,TQT_SLOT(openSetup())); - connect(widget->tables,TQT_SIGNAL(currentChanged(TQListBoxItem*)),this,TQT_SLOT(slotTableChanged(TQListBoxItem*))); - connect(widget->execute,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotExecute())); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotSetQuery())); + connect(widget->setup,TQ_SIGNAL(clicked()),this,TQ_SLOT(openSetup())); + connect(widget->tables,TQ_SIGNAL(currentChanged(TQListBoxItem*)),this,TQ_SLOT(slotTableChanged(TQListBoxItem*))); + connect(widget->execute,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotExecute())); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotSetQuery())); widget->query->setText(db->query); updateDBViews(); } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 04bd18308..5549128f4 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -169,11 +169,11 @@ KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSeria filter=db->filter; (new TQVBoxLayout(plainPage()))->setAutoAdd(true); setMainWidget(widget=new QtSqlDataSourceEditor(plainPage())); - connect(widget->tableCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(tableChanged(int))); - connect(widget->editFilter,TQT_SIGNAL(clicked()),this,TQT_SLOT(editFilter())); + connect(widget->tableCombo,TQ_SIGNAL(activated(int)),this,TQ_SLOT(tableChanged(int))); + connect(widget->editFilter,TQ_SIGNAL(clicked()),this,TQ_SLOT(editFilter())); updateTableCombo(); -// connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotSetQuery())); +// connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotSetQuery())); } void KWQtSqlDataSourceEditor::tableChanged(int item) diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp index 440e208ab..bb183a74a 100644 --- a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp +++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp @@ -267,19 +267,19 @@ void KWMailMergeTDEABCConfig::initSelectedLists() void KWMailMergeTDEABCConfig::initSlotSignalConnections() { - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( acceptSelection() ) ); - connect( _ui->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addSelectedContacts() ) ); - connect( _ui->mAddressBook, TQT_SIGNAL( clicked() ), TQT_SLOT( launchAddressbook() ) ); - - connect( _ui->mAvailableView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( addSelectedContacts() ) ); - - connect( _ui->mFilterEdit, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( filterChanged(const TQString &) ) ); - connect( _ui->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelectedContacts() ) ); - connect( _ui->mSaveList, TQT_SIGNAL( clicked() ), TQT_SLOT( saveDistributionList() ) ); - connect( _ui->mSelectedView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( removeSelectedContacts() ) ); + connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( acceptSelection() ) ); + connect( _ui->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addSelectedContacts() ) ); + connect( _ui->mAddressBook, TQ_SIGNAL( clicked() ), TQ_SLOT( launchAddressbook() ) ); + + connect( _ui->mAvailableView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( addSelectedContacts() ) ); + + connect( _ui->mFilterEdit, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( filterChanged(const TQString &) ) ); + connect( _ui->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelectedContacts() ) ); + connect( _ui->mSaveList, TQ_SIGNAL( clicked() ), TQ_SLOT( saveDistributionList() ) ); + connect( _ui->mSelectedView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( removeSelectedContacts() ) ); } diff --git a/lib/kformula/MatrixDialog.cpp b/lib/kformula/MatrixDialog.cpp index feac37cea..0f8e22b63 100644 --- a/lib/kformula/MatrixDialog.cpp +++ b/lib/kformula/MatrixDialog.cpp @@ -52,12 +52,12 @@ MatrixDialog::MatrixDialog( TQWidget *parent, int _width, int _height ) height = new TQSpinBox(1, MAX_SIZE, 1, page); grid->addWidget(height, 1, 0); height->setValue(h); - connect(height, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setHeight(int))); + connect(height, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setHeight(int))); width = new TQSpinBox(1, MAX_SIZE, 1, page); grid->addWidget(width, 1, 1); width->setValue(w); - connect(width, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setWidth(int))); + connect(width, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setWidth(int))); height->setFocus(); } diff --git a/lib/kformula/kformulaconfigpage.cpp b/lib/kformula/kformulaconfigpage.cpp index 380bfcd2f..e1bfbc539 100644 --- a/lib/kformula/kformulaconfigpage.cpp +++ b/lib/kformula/kformulaconfigpage.cpp @@ -75,19 +75,19 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con connect( buildFontLine( gbox, grid, 0, defaultFont, i18n( "Default font:" ), defaultFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewDefaultFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewDefaultFont() ) ); connect( buildFontLine( gbox, grid, 1, nameFont, i18n( "Name font:" ), nameFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewNameFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewNameFont() ) ); connect( buildFontLine( gbox, grid, 2, numberFont, i18n( "Number font:" ), numberFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewNumberFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewNumberFont() ) ); connect( buildFontLine( gbox, grid, 3, operatorFont, i18n( "Operator font:" ), operatorFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewOperatorFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewOperatorFont() ) ); TQLabel* sizeTitle = new TQLabel( i18n( "Default base size:" ), gbox ); grid->addWidget( sizeTitle, 4, 0 ); @@ -97,8 +97,8 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con grid->addMultiCellWidget( sizeSpin, 4, 4, 1, 2 ); - connect( sizeSpin, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( baseSizeChanged( int ) ) ); + connect( sizeSpin, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( baseSizeChanged( int ) ) ); // syntax highlighting @@ -155,13 +155,13 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con // errorColorBtn->setColor( contextStyle.getErrorColorPlain() ); // grid->addWidget( errorColorBtn, 4, 1 ); - connect( syntaxHighlighting, TQT_SIGNAL( clicked() ), - TQT_SLOT( syntaxHighlightingClicked() ) ); + connect( syntaxHighlighting, TQ_SIGNAL( clicked() ), + TQ_SLOT( syntaxHighlightingClicked() ) ); syntaxHighlightingClicked(); - connect( syntaxHighlighting, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( sizeSpin, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( syntaxHighlighting, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( sizeSpin, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChanged() ) ); Q_ASSERT( !m_changed ); } @@ -389,14 +389,14 @@ void ConfigurePage::slotChanged() // fontLayout->addLayout( hLayout, 0, 0 ); -// // connect( availableFonts, TQT_SIGNAL( executed( TQListViewItem* ) ), -// // this, TQT_SLOT( slotAddFont() ) ); -// // connect( requestedFonts, TQT_SIGNAL( executed( TQListViewItem* ) ), -// // this, TQT_SLOT( slotRemoveFont() ) ); -// connect( addFont, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFont() ) ); -// connect( removeFont, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveFont() ) ); -// connect( moveUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); -// connect( moveDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); +// // connect( availableFonts, TQ_SIGNAL( executed( TQListViewItem* ) ), +// // this, TQ_SLOT( slotAddFont() ) ); +// // connect( requestedFonts, TQ_SIGNAL( executed( TQListViewItem* ) ), +// // this, TQ_SLOT( slotRemoveFont() ) ); +// connect( addFont, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFont() ) ); +// connect( removeFont, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveFont() ) ); +// connect( moveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); +// connect( moveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); // const ContextStyle& contextStyle = document->getContextStyle( true ); // const SymbolTable& symbolTable = contextStyle.symbolTable(); diff --git a/lib/kformula/kformuladocument.cpp b/lib/kformula/kformuladocument.cpp index c041232fb..3efd37807 100644 --- a/lib/kformula/kformuladocument.cpp +++ b/lib/kformula/kformuladocument.cpp @@ -442,187 +442,187 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) m_addNegThinSpaceAction = new TDEAction( i18n( "Add Negative Thin Space" ), 0, - this, TQT_SLOT( addNegThinSpace() ), + this, TQ_SLOT( addNegThinSpace() ), collection, "formula_addnegthinspace") ; m_addThinSpaceAction = new TDEAction( i18n( "Add Thin Space" ), 0, - this, TQT_SLOT( addThinSpace() ), + this, TQ_SLOT( addThinSpace() ), collection, "formula_addthinspace") ; m_addMediumSpaceAction = new TDEAction( i18n( "Add Medium Space" ), 0, - this, TQT_SLOT( addMediumSpace() ), + this, TQ_SLOT( addMediumSpace() ), collection, "formula_addmediumspace" ); m_addThickSpaceAction = new TDEAction( i18n( "Add Thick Space" ), 0, - this, TQT_SLOT( addThickSpace() ), + this, TQ_SLOT( addThickSpace() ), collection, "formula_addthickspace" ); m_addQuadSpaceAction = new TDEAction( i18n( "Add Quad Space" ), 0, - this, TQT_SLOT( addQuadSpace() ), + this, TQ_SLOT( addQuadSpace() ), collection, "formula_addquadspace" ); m_addIntegralAction = new TDEAction(i18n("Add Integral"), "int", 0, - this, TQT_SLOT(addIntegral()), + this, TQ_SLOT(addIntegral()), collection, "formula_addintegral"); m_addSumAction = new TDEAction(i18n("Add Sum"), "sum", 0, - this, TQT_SLOT(addSum()), + this, TQ_SLOT(addSum()), collection, "formula_addsum"); m_addProductAction = new TDEAction(i18n("Add Product"), "prod", 0, - this, TQT_SLOT(addProduct()), + this, TQ_SLOT(addProduct()), collection, "formula_addproduct"); m_addRootAction = new TDEAction(i18n("Add Root"), "sqrt", 0, - this, TQT_SLOT(addRoot()), + this, TQ_SLOT(addRoot()), collection, "formula_addroot"); m_addFractionAction = new TDEAction(i18n("Add Fraction"), "frac", 0, - this, TQT_SLOT(addFraction()), + this, TQ_SLOT(addFraction()), collection, "formula_addfrac"); m_addBracketAction = new TDEAction(i18n("Add Bracket"), "paren", 0, - this, TQT_SLOT(addDefaultBracket()), + this, TQ_SLOT(addDefaultBracket()), collection,"formula_addbra"); m_addSBracketAction = new TDEAction(i18n("Add Square Bracket"), "brackets", 0, - this, TQT_SLOT(addSquareBracket()), + this, TQ_SLOT(addSquareBracket()), collection,"formula_addsqrbra"); m_addCBracketAction = new TDEAction(i18n("Add Curly Bracket"), "math_brace", 0, - this, TQT_SLOT(addCurlyBracket()), + this, TQ_SLOT(addCurlyBracket()), collection,"formula_addcurbra"); m_addAbsAction = new TDEAction(i18n("Add Abs"), "abs", 0, - this, TQT_SLOT(addLineBracket()), + this, TQ_SLOT(addLineBracket()), collection,"formula_addabsbra"); m_addMatrixAction = new TDEAction(i18n("Add Matrix..."), "matrix", 0, - this, TQT_SLOT(addMatrix()), + this, TQ_SLOT(addMatrix()), collection, "formula_addmatrix"); m_addOneByTwoMatrixAction = new TDEAction(i18n("Add 1x2 Matrix"), "onetwomatrix", 0, - this, TQT_SLOT(addOneByTwoMatrix()), + this, TQ_SLOT(addOneByTwoMatrix()), collection, "formula_add_one_by_two_matrix"); m_addUpperLeftAction = new TDEAction(i18n("Add Upper Left Index"), "lsup", 0, - this, TQT_SLOT(addUpperLeftIndex()), + this, TQ_SLOT(addUpperLeftIndex()), collection, "formula_addupperleft"); m_addLowerLeftAction = new TDEAction(i18n("Add Lower Left Index"), "lsub", 0, - this, TQT_SLOT(addLowerLeftIndex()), + this, TQ_SLOT(addLowerLeftIndex()), collection, "formula_addlowerleft"); m_addUpperRightAction = new TDEAction(i18n("Add Upper Right Index"), "rsup", 0, - this, TQT_SLOT(addUpperRightIndex()), + this, TQ_SLOT(addUpperRightIndex()), collection, "formula_addupperright"); m_addLowerRightAction = new TDEAction(i18n("Add Lower Right Index"), "rsub", 0, - this, TQT_SLOT(addLowerRightIndex()), + this, TQ_SLOT(addLowerRightIndex()), collection, "formula_addlowerright"); m_addGenericUpperAction = new TDEAction(i18n("Add Upper Index"), "gsup", /*CTRL + Key_U*/0, - this, TQT_SLOT(addGenericUpperIndex()), + this, TQ_SLOT(addGenericUpperIndex()), collection, "formula_addupperindex"); m_addGenericLowerAction = new TDEAction(i18n("Add Lower Index"), "gsub", 0, - this, TQT_SLOT(addGenericLowerIndex()), + this, TQ_SLOT(addGenericLowerIndex()), collection, "formula_addlowerindex"); m_addOverlineAction = new TDEAction(i18n("Add Overline"), "over", 0, - this, TQT_SLOT(addOverline()), + this, TQ_SLOT(addOverline()), collection, "formula_addoverline"); m_addUnderlineAction = new TDEAction(i18n("Add Underline"), "under", 0, - this, TQT_SLOT(addUnderline()), + this, TQ_SLOT(addUnderline()), collection, "formula_addunderline"); m_addMultilineAction = new TDEAction(i18n("Add Multiline"), "multiline", 0, - this, TQT_SLOT(addMultiline()), + this, TQ_SLOT(addMultiline()), collection, "formula_addmultiline"); m_removeEnclosingAction = new TDEAction(i18n("Remove Enclosing Element"), 0, - this, TQT_SLOT(removeEnclosing()), + this, TQ_SLOT(removeEnclosing()), collection, "formula_removeenclosing"); m_makeGreekAction = new TDEAction(i18n("Convert to Greek"), 0, - this, TQT_SLOT(makeGreek()), + this, TQ_SLOT(makeGreek()), collection, "formula_makegreek"); m_appendColumnAction = new TDEAction( i18n( "Append Column" ), "inscol", 0, - this, TQT_SLOT( appendColumn() ), + this, TQ_SLOT( appendColumn() ), collection, "formula_appendcolumn" ); m_insertColumnAction = new TDEAction( i18n( "Insert Column" ), "inscol", 0, - this, TQT_SLOT( insertColumn() ), + this, TQ_SLOT( insertColumn() ), collection, "formula_insertcolumn" ); m_removeColumnAction = new TDEAction( i18n( "Remove Column" ), "remcol", 0, - this, TQT_SLOT( removeColumn() ), + this, TQ_SLOT( removeColumn() ), collection, "formula_removecolumn" ); m_appendRowAction = new TDEAction( i18n( "Append Row" ), "insrow", 0, - this, TQT_SLOT( appendRow() ), + this, TQ_SLOT( appendRow() ), collection, "formula_appendrow" ); m_insertRowAction = new TDEAction( i18n( "Insert Row" ), "insrow", 0, - this, TQT_SLOT( insertRow() ), + this, TQ_SLOT( insertRow() ), collection, "formula_insertrow" ); m_removeRowAction = new TDEAction( i18n( "Remove Row" ), "remrow", 0, - this, TQT_SLOT( removeRow() ), + this, TQ_SLOT( removeRow() ), collection, "formula_removerow" ); m_syntaxHighlightingAction = new TDEToggleAction(i18n("Syntax Highlighting"), 0, - this, TQT_SLOT(toggleSyntaxHighlighting()), + this, TQ_SLOT(toggleSyntaxHighlighting()), collection, "formula_syntaxhighlighting"); //m_syntaxHighlightingAction->setChecked( m_contextStyle->syntaxHighlighting() ); m_formatBoldAction = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", 0, //CTRL + Key_B, - this, TQT_SLOT( textBold() ), + this, TQ_SLOT( textBold() ), collection, "formula_format_bold" ); m_formatItalicAction = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", 0, //CTRL + Key_I, - this, TQT_SLOT( textItalic() ), + this, TQ_SLOT( textItalic() ), collection, "formula_format_italic" ); m_formatBoldAction->setEnabled( false ); m_formatItalicAction->setEnabled( false ); @@ -641,7 +641,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) delimiter.append(TQString("}")); delimiter.append(TQString(">")); m_leftBracket = new TDESelectAction(i18n("Left Delimiter"), - 0, this, TQT_SLOT(delimiterLeft()), + 0, this, TQ_SLOT(delimiterLeft()), collection, "formula_typeleft"); m_leftBracket->setItems(delimiter); //leftBracket->setCurrentItem(0); @@ -660,7 +660,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) delimiter.append(TQString("{")); delimiter.append(TQString("<")); m_rightBracket = new TDESelectAction(i18n("Right Delimiter"), - 0, this, TQT_SLOT(delimiterRight()), + 0, this, TQ_SLOT(delimiterRight()), collection, "formula_typeright"); m_rightBracket->setItems(delimiter); //rightBracket->setCurrentItem(0); @@ -668,10 +668,10 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) m_insertSymbolAction = new TDEAction(i18n("Insert Symbol"), "key_enter", /*CTRL + Key_I*/0, - this, TQT_SLOT(insertSymbol()), + this, TQ_SLOT(insertSymbol()), collection, "formula_insertsymbol"); m_symbolNamesAction = new SymbolAction(i18n("Symbol Names"), - 0, this, TQT_SLOT(symbolNames()), + 0, this, TQ_SLOT(symbolNames()), collection, "formula_symbolnames"); TQStringList ff; @@ -680,7 +680,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) ff.append( i18n( "Fraktur" ) ); ff.append( i18n( "Double Struck" ) ); m_fontFamily = new TDESelectAction(i18n("Font Family"), - 0, this, TQT_SLOT(fontFamily()), + 0, this, TQ_SLOT(fontFamily()), collection, "formula_fontfamily"); m_fontFamily->setItems( ff ); m_fontFamily->setEnabled( false ); @@ -691,7 +691,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) et.append( i18n( "Number" ) ); et.append( i18n( "Text" ) ); m_tokenElement = new TDESelectAction( i18n( "Token Type" ), - 0, this, TQT_SLOT( tokenElement() ), + 0, this, TQ_SLOT( tokenElement() ), collection, "formula_tokenelement" ); m_tokenElement->setItems( et ); // m_tokenElements->setEnabled( true ); diff --git a/lib/kformula/kformulaview.cpp b/lib/kformula/kformulaview.cpp index 1e50694da..92022e54e 100644 --- a/lib/kformula/kformulaview.cpp +++ b/lib/kformula/kformulaview.cpp @@ -41,17 +41,17 @@ struct View::View_Impl { : smallCursor(false), activeCursor(true), cursorHasChanged(true), document(doc) { - connect(document, TQT_SIGNAL(elementWillVanish(BasicElement*)), - view, TQT_SLOT(slotElementWillVanish(BasicElement*))); - connect(document, TQT_SIGNAL(formulaLoaded(FormulaElement*)), - view, TQT_SLOT(slotFormulaLoaded(FormulaElement*))); - connect(document, TQT_SIGNAL(cursorMoved(FormulaCursor*)), - view, TQT_SLOT(slotCursorMoved(FormulaCursor*))); + connect(document, TQ_SIGNAL(elementWillVanish(BasicElement*)), + view, TQ_SLOT(slotElementWillVanish(BasicElement*))); + connect(document, TQ_SIGNAL(formulaLoaded(FormulaElement*)), + view, TQ_SLOT(slotFormulaLoaded(FormulaElement*))); + connect(document, TQ_SIGNAL(cursorMoved(FormulaCursor*)), + view, TQ_SLOT(slotCursorMoved(FormulaCursor*))); cursor = document->createCursor(); blinkTimer = new TQTimer( view ); - connect( blinkTimer, TQT_SIGNAL( timeout() ), - view, TQT_SLOT( slotBlinkCursor() ) ); + connect( blinkTimer, TQ_SIGNAL( timeout() ), + view, TQ_SLOT( slotBlinkCursor() ) ); if ( TQApplication::cursorFlashTime() > 0 ) blinkTimer->start( TQApplication::cursorFlashTime() / 2 ); } diff --git a/lib/kformula/kformulawidget.cpp b/lib/kformula/kformulawidget.cpp index e827537e8..8877b628c 100644 --- a/lib/kformula/kformulawidget.cpp +++ b/lib/kformula/kformulawidget.cpp @@ -39,10 +39,10 @@ KFormulaWidget::KFormulaWidget(Container* doc, TQWidget* parent, const char* nam : TQWidget(parent, name, f | WRepaintNoErase | WResizeNoErase), formulaView(doc) { - connect(doc, TQT_SIGNAL(formulaChanged(int, int)), - this, TQT_SLOT(slotFormulaChanged(int, int))); - connect(&formulaView, TQT_SIGNAL(cursorChanged(bool, bool)), - this, TQT_SLOT(slotCursorChanged(bool, bool))); + connect(doc, TQ_SIGNAL(formulaChanged(int, int)), + this, TQ_SLOT(slotFormulaChanged(int, int))); + connect(&formulaView, TQ_SIGNAL(cursorChanged(bool, bool)), + this, TQ_SLOT(slotCursorChanged(bool, bool))); setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(NoBackground/*TQWidget::PaletteBase*/); diff --git a/lib/kformula/main.cpp b/lib/kformula/main.cpp index c92adfd74..bf0f058fe 100644 --- a/lib/kformula/main.cpp +++ b/lib/kformula/main.cpp @@ -209,8 +209,8 @@ void ScrollView::addChild(KFormulaWidget* c, int x, int y) { TQScrollView::addChild(c, x, y); child = c; - connect(child, TQT_SIGNAL(cursorChanged(bool, bool)), - this, TQT_SLOT(cursorChanged(bool, bool))); + connect(child, TQ_SIGNAL(cursorChanged(bool, bool)), + this, TQ_SLOT(cursorChanged(bool, bool))); } void ScrollView::focusInEvent(TQFocusEvent*) @@ -246,7 +246,7 @@ int main(int argc, char** argv) TDEApplication app; - app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); DocumentWrapper* wrapper = new DocumentWrapper( kapp->config(), 0 ); Document* document = new Document; diff --git a/lib/kformula/prototype/main.py b/lib/kformula/prototype/main.py index c58553407..5f9fc29b5 100755 --- a/lib/kformula/prototype/main.py +++ b/lib/kformula/prototype/main.py @@ -9,5 +9,5 @@ a = TQApplication(sys.argv) mw = Widget() mw.setCaption('Prototype of the formula engine') mw.show() -a.connect(a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()')) +a.connect(a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()')) a.exec_loop() diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py index 10e0f8483..6b725b5de 100755 --- a/lib/kformula/prototype/unicode.py +++ b/lib/kformula/prototype/unicode.py @@ -81,8 +81,8 @@ class Widget(TQWidget): loadButton = TQPushButton("load", self) saveButton = TQPushButton("save", self) - TQObject.connect(loadButton, SIGNAL("pressed()"), self.load) - TQObject.connect(saveButton, SIGNAL("pressed()"), self.save) + TQObject.connect(loadButton, TQ_SIGNAL("pressed()"), self.load) + TQObject.connect(saveButton, TQ_SIGNAL("pressed()"), self.save) hbox.addWidget(loadButton) hbox.addWidget(saveButton) @@ -101,7 +101,7 @@ class Widget(TQWidget): vbox.addWidget(splitter) - self.connect(self.listbox, SIGNAL('highlighted( const TQString& )'), + self.connect(self.listbox, TQ_SIGNAL('highlighted( const TQString& )'), self.fontHighlighted) def fontHighlighted(self, fontStr): @@ -184,7 +184,7 @@ def main(): mw.setCaption('Unicode mapping util') mw.show() - a.connect(a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()')) + a.connect(a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()')) a.exec_loop() if __name__ == '__main__': diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp index 08c5ac7b2..71e60ceef 100644 --- a/lib/kformula/symbolaction.cpp +++ b/lib/kformula/symbolaction.cpp @@ -124,15 +124,15 @@ int SymbolAction::plug( TQWidget* w, int index ) TDEToolBar* bar = static_cast<TDEToolBar*>( w ); int id_ = TDEAction::getToolButtonID(); KComboBox *cb = new KComboBox( bar ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - TQT_SLOT( slotActivated( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + TQ_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateItems( containerCount() - 1 ); diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index 75a0d5e1e..6429d6eb5 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -132,7 +132,7 @@ bool KoApplication::start() return false; KoMainWindow *shell = new KoMainWindow( doc->instance() ); shell->show(); - TQObject::connect(doc, TQT_SIGNAL(sigProgress(int)), shell, TQT_SLOT(slotProgress(int))); + TQObject::connect(doc, TQ_SIGNAL(sigProgress(int)), shell, TQ_SLOT(slotProgress(int))); // for initDoc to fill in the recent docs list // and for KoDocument::slotStarted doc->addShell( shell ); @@ -144,7 +144,7 @@ bool KoApplication::start() } // FIXME This needs to be moved someplace else - TQObject::disconnect(doc, TQT_SIGNAL(sigProgress(int)), shell, TQT_SLOT(slotProgress(int))); + TQObject::disconnect(doc, TQ_SIGNAL(sigProgress(int)), shell, TQ_SLOT(slotProgress(int))); } else { bool print = koargs->isSet("print"); bool doTemplate = koargs->isSet("template"); diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 35b518ac8..acdc63618 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -100,11 +100,11 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TQString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName"); d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate"); - connect(m_alwaysUseCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(alwaysUseClicked())); + connect(m_alwaysUseCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(alwaysUseClicked())); changePalette(); if(kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(changePalette())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TDEListViewItem* selectItem = 0; @@ -125,13 +125,13 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, } } - connect(m_documentList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(openTemplate(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(openTemplate(TQListViewItem*))); - connect(m_openButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(openTemplate())); + connect(m_documentList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(openTemplate(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(openTemplate(TQListViewItem*))); + connect(m_openButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(openTemplate())); if(selectItem) { m_documentList->setSelected(selectItem, true); @@ -284,7 +284,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst changePalette(); if(kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(changePalette())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TQString oldGroup = instance->config()->group(); @@ -334,23 +334,23 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst instance->config()->setGroup( oldGroup ); - connect(m_documentList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(openFile(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(openFile(TQListViewItem*))); - connect(m_openButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFile())); + connect(m_documentList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(openFile(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(openFile(TQListViewItem*))); + connect(m_openButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFile())); m_documentList->setSelected(m_documentList->firstChild(), true); d->m_previewJob = TDEIO::filePreview(fileList, 200, 200); - connect(d->m_previewJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(previewResult(TDEIO::Job*))); - connect(d->m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - this, TQT_SLOT(updatePreview(const KFileItem*, const TQPixmap&))); + connect(d->m_previewJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(previewResult(TDEIO::Job*))); + connect(d->m_previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + this, TQ_SLOT(updatePreview(const KFileItem*, const TQPixmap&))); } KoRecentDocumentsPane::~KoRecentDocumentsPane() diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 6a6331de6..85397acc9 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -231,7 +231,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec d = new Private; m_bEmpty = TRUE; - connect( &d->m_autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoSave() ) ); + connect( &d->m_autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); setAutoSave( s_defaultAutoSave ); d->m_bSingleViewMode = singleViewMode; @@ -264,7 +264,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec // A way to 'fix' the job's window, since we have no widget known to KParts if ( !singleViewMode ) - connect( this, TQT_SIGNAL( started( TDEIO::Job* ) ), TQT_SLOT( slotStarted( TDEIO::Job* ) ) ); + connect( this, TQ_SIGNAL( started( TDEIO::Job* ) ), TQ_SLOT( slotStarted( TDEIO::Job* ) ) ); } KoDocument::~KoDocument() @@ -277,8 +277,8 @@ KoDocument::~KoDocument() TQPtrListIterator<KoDocumentChild> childIt( d->m_children ); for (; childIt.current(); ++childIt ) - disconnect( childIt.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotChildDestroyed() ) ); + disconnect( childIt.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotChildDestroyed() ) ); // Tell our views that the document is already destroyed and // that they shouldn't try to access it. @@ -544,7 +544,7 @@ void KoDocument::slotAutoSave() { if ( isModified() && d->modifiedAfterAutosave && !d->m_bLoading ) { - connect( this, TQT_SIGNAL( sigProgress( int ) ), shells().current(), TQT_SLOT( slotProgress( int ) ) ); + connect( this, TQ_SIGNAL( sigProgress( int ) ), shells().current(), TQ_SLOT( slotProgress( int ) ) ); emit sigStatusBarMessage( i18n("Autosaving...") ); d->m_autosaving = true; bool ret = saveNativeFormat( autoSaveFile( m_file ) ); @@ -555,7 +555,7 @@ void KoDocument::slotAutoSave() } d->m_autosaving = false; emit sigClearStatusBarMessage(); - disconnect( this, TQT_SIGNAL( sigProgress( int ) ), shells().current(), TQT_SLOT( slotProgress( int ) ) ); + disconnect( this, TQ_SIGNAL( sigProgress( int ) ), shells().current(), TQ_SLOT( slotProgress( int ) ) ); if ( !ret ) emit sigStatusBarMessage( i18n("Error during autosave! Partition full?") ); } @@ -657,10 +657,10 @@ void KoDocument::insertChild( KoDocumentChild *child ) d->m_children.append( child ); - connect( child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotChildChanged( KoChild * ) ) ); - connect( child, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotChildDestroyed() ) ); + connect( child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotChildChanged( KoChild * ) ) ); + connect( child, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotChildDestroyed() ) ); // It may be that insertChild is called without the KoDocumentChild // having a KoDocument attached, yet. This happens for example @@ -2576,7 +2576,7 @@ void KoDocument::openExistingFile( const TQString& file ) setModified( false ); if( ok ) - TQTimer::singleShot( 0, this, TQT_SLOT( deleteOpenPane() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteOpenPane() ) ); } void KoDocument::openTemplate( const TQString& file ) @@ -2611,14 +2611,14 @@ KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, TDEInstance* instance, TQWidget *customDoc = createCustomDocumentWidget(openPane); if(customDoc) { openPane->setCustomDocumentWidget( customDoc ); - connect( customDoc, TQT_SIGNAL( documentSelected() ), this, TQT_SLOT( startCustomDocument() ) ); + connect( customDoc, TQ_SIGNAL( documentSelected() ), this, TQ_SLOT( startCustomDocument() ) ); } openPane->show(); - connect( openPane, TQT_SIGNAL( openExistingFile( const TQString& ) ), - this, TQT_SLOT( openExistingFile( const TQString& ) ) ); - connect( openPane, TQT_SIGNAL( openTemplate( const TQString& ) ), - this, TQT_SLOT( openTemplate( const TQString& ) ) ); + connect( openPane, TQ_SIGNAL( openExistingFile( const TQString& ) ), + this, TQ_SLOT( openExistingFile( const TQString& ) ) ); + connect( openPane, TQ_SIGNAL( openTemplate( const TQString& ) ), + this, TQ_SLOT( openTemplate( const TQString& ) ) ); return openPane; } @@ -2637,7 +2637,7 @@ void KoDocument::deleteOpenPane() { if( d->m_startUpWidget ) { d->m_startUpWidget->hide(); - TQTimer::singleShot(1000, this, TQT_SLOT(deleteOpenPaneDelayed())); + TQTimer::singleShot(1000, this, TQ_SLOT(deleteOpenPaneDelayed())); shells().getFirst()->factory()->container("mainToolBar", shells().getFirst())->show(); shells().getFirst()->setRootDocument( this ); @@ -2663,7 +2663,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent) pane->layout()->setMargin(0); dlg.setMainWidget(pane); dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog")); - connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk())); + connect(this, TQ_SIGNAL(closeEmbedInitDialog()), &dlg, TQ_SLOT(slotOk())); bool ok = dlg.exec() == TQDialog::Accepted; diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index b799eab3d..c1cd49367 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -220,36 +220,36 @@ void KoDocumentInfoDlg::addAuthorPage( KoDocumentInfoAuthor *authorInfo ) d->m_authorWidget->leStreet->setText( authorInfo->street() ); d->m_authorWidget->leAuthorPosition->setText( authorInfo->position() ); - connect( d->m_authorWidget->leFullName, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leInitial, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leAuthorTitle, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCompany, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leEmail, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leTelephoneWork, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leTelephoneHome, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leFax, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCountry, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->lePostalCode, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCity, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leStreet, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leAuthorPosition, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->pbLoadKABC, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( loadFromKABC() ) ); - connect( d->m_authorWidget->pbDelete, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteInfo() ) ); + connect( d->m_authorWidget->leFullName, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leInitial, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leAuthorTitle, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCompany, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leEmail, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leTelephoneWork, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leTelephoneHome, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leFax, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCountry, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->lePostalCode, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCity, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leStreet, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leAuthorPosition, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->pbLoadKABC, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( loadFromKABC() ) ); + connect( d->m_authorWidget->pbDelete, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteInfo() ) ); } void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) @@ -274,18 +274,18 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) d->m_aboutWidget->leDocKeywords->setText( aboutInfo->keywords() ); d->m_aboutWidget->meDocAbstract->setText( aboutInfo->abstract() ); - connect( d->m_aboutWidget->leDocTitle, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->meDocAbstract, TQT_SIGNAL( textChanged() ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->leDocSubject, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->leDocKeywords, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->pbReset, TQT_SIGNAL( clicked() ), - aboutInfo, TQT_SLOT( resetMetaData() ) ); - connect( d->m_aboutWidget->pbReset, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( resetMetaData() ) ); + connect( d->m_aboutWidget->leDocTitle, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->meDocAbstract, TQ_SIGNAL( textChanged() ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->leDocSubject, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->leDocKeywords, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->pbReset, TQ_SIGNAL( clicked() ), + aboutInfo, TQ_SLOT( resetMetaData() ) ); + connect( d->m_aboutWidget->pbReset, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( resetMetaData() ) ); } void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMetadataInfo ) @@ -426,8 +426,8 @@ KoDocumentInfoPropsPage::KoDocumentInfoPropsPage( KPropertiesDialog *props, } d->m_dlg = new KoDocumentInfoDlg( d->m_info, 0, 0, props ); - connect( d->m_dlg, TQT_SIGNAL( changed() ), - this, TQT_SIGNAL( changed() ) ); + connect( d->m_dlg, TQ_SIGNAL( changed() ), + this, TQ_SIGNAL( changed() ) ); } KoDocumentInfoPropsPage::~KoDocumentInfoPropsPage() diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 84c5bde8b..97a934b1f 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -30,8 +30,8 @@ KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter, bool modal) : KFileDialog( startDir, filter, parent, name, modal ) { - connect( filterWidget, TQT_SIGNAL( activated( int) ), - this, TQT_SLOT( slotChangedfilter( int ) ) ); + connect( filterWidget, TQ_SIGNAL( activated( int) ), + this, TQ_SLOT( slotChangedfilter( int ) ) ); } void KoFileDialog::slotChangedfilter( int index ) diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 91123fd3c..1f30ff479 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -84,8 +84,8 @@ int KoFilterChain::ChainLink::lruPartIndex() const void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentFilter ) const { // progress information - TQObject::connect( m_filter, TQT_SIGNAL( sigProgress( int ) ), - m_chain->manager(), TQT_SIGNAL( sigProgress( int ) ) ); + TQObject::connect( m_filter, TQ_SIGNAL( sigProgress( int ) ), + m_chain->manager(), TQ_SIGNAL( sigProgress( int ) ) ); if ( !parentFilter ) return; @@ -110,10 +110,10 @@ void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const T if ( strncmp( slotIt.current(), SLOT_PREFIX, SLOT_PREFIX_LEN ) == 0 ) { if ( strcmp( signalIt.current() + SIGNAL_PREFIX_LEN, slotIt.current() + SLOT_PREFIX_LEN ) == 0 ) { TQCString signalString; - signalString.setNum( TQSIGNAL_CODE ); + signalString.setNum( TQ_SIGNAL_CODE ); signalString += signalIt.current(); TQCString slotString; - slotString.setNum( TQSLOT_CODE ); + slotString.setNum( TQ_SLOT_CODE ); slotString += slotIt.current(); TQObject::connect( sender, signalString, receiver, slotString ); } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index e22d5f3ee..44b837123 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -89,7 +89,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType m_filterList->centerCurrentItem (); m_filterList->setFocus (); - connect (m_filterList, TQT_SIGNAL (selected (int)), this, TQT_SLOT (slotOk ())); + connect (m_filterList, TQ_SIGNAL (selected (int)), this, TQ_SLOT (slotOk ())); } KoFilterChooser::~KoFilterChooser () @@ -119,8 +119,8 @@ KoFilterManager::KoFilterManager( KoDocument* document ) : d = new KoFilterManager::Private; d -> m_batch = false; if ( document ) - TQObject::connect( this, TQT_SIGNAL( sigProgress( int ) ), - document, TQT_SIGNAL( sigProgress( int ) ) ); + TQObject::connect( this, TQ_SIGNAL( sigProgress( int ) ), + document, TQ_SIGNAL( sigProgress( int ) ) ); } diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index c2680b44d..cce7fff28 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -192,8 +192,8 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_manager = new KoPartManager( this ); - connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part * ) ) ); if ( instance ) setInstance( instance, false ); // don't load plugins! we don't want @@ -205,41 +205,41 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) setXMLFile( findMostRecentXMLFile( allFiles, doc ) ); setLocalXMLFile( locateLocal( "data", "koffice/koffice_shell.rc" ) ); - KStdAction::openNew( this, TQT_SLOT( slotFileNew() ), actionCollection(), "file_new" ); - KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - m_recent = KStdAction::openRecent( this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); - d->m_paSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ), actionCollection(), "file_save" ); - d->m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ), actionCollection(), "file_save_as" ); - d->m_paPrint = KStdAction::print( this, TQT_SLOT( slotFilePrint() ), actionCollection(), "file_print" ); - d->m_paPrintPreview = KStdAction::printPreview( this, TQT_SLOT( slotFilePrintPreview() ), actionCollection(), "file_print_preview" ); - d->m_sendfile = KStdAction::mail( this, TQT_SLOT( slotEmailFile() ), actionCollection(), "file_send_file"); + KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection(), "file_new" ); + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); + m_recent = KStdAction::openRecent( this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); + d->m_paSave = KStdAction::save( this, TQ_SLOT( slotFileSave() ), actionCollection(), "file_save" ); + d->m_paSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ), actionCollection(), "file_save_as" ); + d->m_paPrint = KStdAction::print( this, TQ_SLOT( slotFilePrint() ), actionCollection(), "file_print" ); + d->m_paPrintPreview = KStdAction::printPreview( this, TQ_SLOT( slotFilePrintPreview() ), actionCollection(), "file_print_preview" ); + d->m_sendfile = KStdAction::mail( this, TQ_SLOT( slotEmailFile() ), actionCollection(), "file_send_file"); - d->m_paCloseFile = KStdAction::close( this, TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" ); - KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); + d->m_paCloseFile = KStdAction::close( this, TQ_SLOT( slotFileClose() ), actionCollection(), "file_close" ); + KStdAction::quit( this, TQ_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); d->m_reloadfile = new TDEAction( i18n( "Reload"), 0, - this, TQT_SLOT( slotReloadFile() ), + this, TQ_SLOT( slotReloadFile() ), actionCollection(), "file_reload_file"); d->m_versionsfile = new TDEAction( i18n( "Versions..."), 0, - this, TQT_SLOT( slotVersionsFile() ), + this, TQ_SLOT( slotVersionsFile() ), actionCollection(), "file_versions_file"); d->m_importFile = new TDEAction( i18n( "I&mport..." ), 0, // clashing accel key :( - this, TQT_SLOT( slotImportFile() ), + this, TQ_SLOT( slotImportFile() ), actionCollection(), "file_import_file"); d->m_exportFile = new TDEAction( i18n( "E&xport..." ), 0, - this, TQT_SLOT( slotExportFile() ), + this, TQ_SLOT( slotExportFile() ), actionCollection(), "file_export_file"); /* The following entry opens the document information dialog. Since the action is named so it intends to show data this entry should not have a trailing ellipses (...). */ d->m_paDocInfo = new TDEAction( i18n( "&Document Information" ), "documentinfo", 0, - this, TQT_SLOT( slotDocumentInfo() ), + this, TQ_SLOT( slotDocumentInfo() ), actionCollection(), "file_documentinfo" ); - KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); d->m_paDocInfo->setEnabled( false ); d->m_paSaveAs->setEnabled( false ); @@ -260,20 +260,20 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) // set up the action "list" for "Close all Views" (hacky :) (Werner) d->m_veryHackyActionList.append( new TDEAction(i18n("&Close All Views"), "window-close", - "ctrl+shift+w", this, TQT_SLOT(slotCloseAllViews()), + "ctrl+shift+w", this, TQ_SLOT(slotCloseAllViews()), actionCollection(), "view_closeallviews") ); // set up the action list for the splitter stuff d->m_splitViewActionList.append(new TDEAction(i18n("&Split View"), "view_split", 0, - this, TQT_SLOT(slotSplitView()), + this, TQ_SLOT(slotSplitView()), actionCollection(), "view_split")); d->m_removeView=new TDEAction(i18n("&Remove View"), "view_remove", 0, - this, TQT_SLOT(slotRemoveView()), + this, TQ_SLOT(slotRemoveView()), actionCollection(), "view_rm_splitter"); d->m_splitViewActionList.append(d->m_removeView); d->m_removeView->setEnabled(false); d->m_orientation=new TDESelectAction(i18n("Splitter &Orientation"), "view_orientation", 0, - this, TQT_SLOT(slotSetOrientation()), + this, TQ_SLOT(slotSetOrientation()), actionCollection(), "view_splitter_orientation"); TQStringList items; items << i18n("&Vertical") @@ -596,9 +596,9 @@ bool KoMainWindow::openDocumentInternal( const KURL & url, KoDocument *newdoc ) return false; d->m_firstTime=true; - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - connect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + connect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); newdoc->addShell( this ); // used by openURL bool openRet = (!isImporting ()) ? newdoc->openURL(url) : newdoc->import(url); if(!openRet) @@ -639,9 +639,9 @@ void KoMainWindow::slotLoadCompleted() // We had no document, set the new one setRootDocument( newdoc ); } - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); } void KoMainWindow::slotLoadCanceled( const TQString & errMsg ) @@ -652,9 +652,9 @@ void KoMainWindow::slotLoadCanceled( const TQString & errMsg ) // ... can't delete the document, it's the one who emitted the signal... KoDocument* newdoc = (KoDocument *)(sender()); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); newdoc->removeShell(this); delete newdoc; @@ -672,10 +672,10 @@ void KoMainWindow::slotSaveCompleted() { kdDebug(30003) << "KoMainWindow::slotSaveCompleted" << endl; KoDocument* pDoc = (KoDocument *)(sender()); - disconnect(pDoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(pDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSaveCompleted())); - disconnect(pDoc, TQT_SIGNAL(canceled( const TQString & )), - this, TQT_SLOT(slotSaveCanceled( const TQString & ))); + disconnect(pDoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(pDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSaveCompleted())); + disconnect(pDoc, TQ_SIGNAL(canceled( const TQString & )), + this, TQ_SLOT(slotSaveCanceled( const TQString & ))); } // returns true if we should save, false otherwise. @@ -739,10 +739,10 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) else reset_url = false; - connect(pDoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(pDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSaveCompleted())); - connect(pDoc, TQT_SIGNAL(canceled( const TQString & )), - this, TQT_SLOT(slotSaveCanceled( const TQString & ))); + connect(pDoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(pDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSaveCompleted())); + connect(pDoc, TQ_SIGNAL(canceled( const TQString & )), + this, TQ_SLOT(slotSaveCanceled( const TQString & ))); KURL oldURL = pDoc->url(); TQString oldFile = pDoc->file(); @@ -1088,8 +1088,8 @@ void KoMainWindow::chooseNewDocument( int /*KoDocument::InitDocFlags*/ initDocFl return; //FIXME: This needs to be handled differently - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); if ( ( !doc && ( initDocFlags == KoDocument::InitDocFileNew ) ) || ( doc && !doc->isEmpty() ) ) { @@ -1286,7 +1286,7 @@ void KoMainWindow::slotConfigureToolbars() if (rootDocument()) saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() ); KEditToolbar edit(factory(), this); - connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&edit,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); (void) edit.exec(); } @@ -1541,7 +1541,7 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) TDEToggleAction * act = new TDEToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, actionCollection(), tb->name() ); act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() )); - connect( act, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToolbarToggled( bool ) ) ); + connect( act, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToolbarToggled( bool ) ) ); act->setChecked ( !tb->isHidden() ); d->m_toolbarList.append( act ); } diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 3d7ff56e9..0e38706a3 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -105,18 +105,18 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& #if KDE_IS_VERSION(3,4,0) m_sectionList->setShadeSortColumn(false); #endif - connect(m_sectionList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); KGuiItem openExistingGItem(i18n("Open Existing Document..."), "document-open"); m_openExistingButton->setGuiItem(openExistingGItem); - connect(m_openExistingButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showOpenFileDialog())); + connect(m_openExistingButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showOpenFileDialog())); initRecentDocs(); initTemplates(templateType); @@ -136,8 +136,8 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& sizes = cfgGrp.readIntListEntry("DetailsPaneSplitterSizes"); emit splitterResized(0, sizes); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SLOT(saveSplitterSizes(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SLOT(saveSplitterSizes(KoDetailsPaneBase*, const TQValueList<int>&))); } KoOpenPane::~KoOpenPane() @@ -171,12 +171,12 @@ void KoOpenPane::showOpenFileDialog() void KoOpenPane::initRecentDocs() { KoRecentDocumentsPane* recentDocPane = new KoRecentDocumentsPane(this, d->m_instance); - connect(recentDocPane, TQT_SIGNAL(openFile(const TQString&)), this, TQT_SIGNAL(openExistingFile(const TQString&))); + connect(recentDocPane, TQ_SIGNAL(openFile(const TQString&)), this, TQ_SIGNAL(openExistingFile(const TQString&))); TQListViewItem* item = addPane(i18n("Recent Documents"), "document-open", recentDocPane, 0); - connect(recentDocPane, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - recentDocPane, TQT_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(recentDocPane, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + recentDocPane, TQ_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); KoSectionListItem* separator = new KoSectionListItem(m_sectionList, "", 1); separator->setEnabled(false); @@ -203,15 +203,15 @@ void KoOpenPane::initTemplates(const TQString& templateType) KoTemplatesPane* pane = new KoTemplatesPane(this, d->m_instance, group, templateTree.defaultTemplate()); - connect(pane, TQT_SIGNAL(openTemplate(const TQString&)), this, TQT_SIGNAL(openTemplate(const TQString&))); - connect(pane, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), - this, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&))); - connect(this, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), - pane, TQT_SLOT(changeAlwaysUseTemplate(KoTemplatesPane*, const TQString&))); - connect(pane, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - pane, TQT_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(pane, TQ_SIGNAL(openTemplate(const TQString&)), this, TQ_SIGNAL(openTemplate(const TQString&))); + connect(pane, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), + this, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&))); + connect(this, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), + pane, TQ_SLOT(changeAlwaysUseTemplate(KoTemplatesPane*, const TQString&))); + connect(pane, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + pane, TQ_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); TQListViewItem* item = addPane(group->name(), group->first()->loadPicture(d->m_instance), pane, group->sortingWeight() + templateOffset); diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index d85a69951..2d1a62e27 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -210,7 +210,7 @@ void KoSpeaker::readConfig(TDEConfig* config) if (d->m_speakFlags & (SpeakPointerWidget | SpeakFocusWidget)) { if (startKttsd()) { d->m_timer = new TQTimer( this ); - connect( d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(probe()) ); + connect( d->m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(probe()) ); d->m_timer->start( d->m_timeout ); } } diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 6bebf91e8..cca65063d 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -120,14 +120,14 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) setMouseTracking( true ); - connect( d->m_doc, TQT_SIGNAL( childChanged( KoDocumentChild * ) ), - this, TQT_SLOT( slotChildChanged( KoDocumentChild * ) ) ); + connect( d->m_doc, TQ_SIGNAL( childChanged( KoDocumentChild * ) ), + this, TQ_SLOT( slotChildChanged( KoDocumentChild * ) ) ); - connect( d->m_doc, TQT_SIGNAL( sigBeginOperation() ), - this, TQT_SLOT( beginOperation() ) ); + connect( d->m_doc, TQ_SIGNAL( sigBeginOperation() ), + this, TQ_SLOT( beginOperation() ) ); - connect( d->m_doc, TQT_SIGNAL( sigEndOperation() ), - this, TQT_SLOT( endOperation() ) ); + connect( d->m_doc, TQ_SIGNAL( sigEndOperation() ), + this, TQ_SLOT( endOperation() ) ); actionCollection()->setWidget( this ); @@ -145,20 +145,20 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) if ( sb ) // No statusbar in e.g. konqueror { coll->setHighlightingEnabled( true ); - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); - - connect( d->m_doc, TQT_SIGNAL( sigStatusBarMessage( const TQString& ) ), - this, TQT_SLOT( slotActionStatusText( const TQString& ) ) ); - connect( d->m_doc, TQT_SIGNAL( sigClearStatusBarMessage() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); + + connect( d->m_doc, TQ_SIGNAL( sigStatusBarMessage( const TQString& ) ), + this, TQ_SLOT( slotActionStatusText( const TQString& ) ) ); + connect( d->m_doc, TQ_SIGNAL( sigClearStatusBarMessage() ), + this, TQ_SLOT( slotClearStatusText() ) ); } d->m_doc->setCurrent(); d->m_scrollTimer = new TQTimer( this ); - connect (d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); + connect (d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) ); } KoView::~KoView() @@ -627,7 +627,7 @@ void KoView::slotAutoScroll( ) void KoView::setupGlobalActions() { actionNewView = new TDEAction( i18n( "&New View" ), "window-new", 0, - this, TQT_SLOT( newView() ), + this, TQ_SLOT( newView() ), actionCollection(), "view_newview" ); } @@ -763,8 +763,8 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) // Setting the frameGeometry is done in setInitialFrameGeometry, which is // also called right after activation. - connect( view, TQT_SIGNAL( activated( bool ) ), - parentView(), TQT_SLOT( slotChildActivated( bool ) ) ); + connect( view, TQ_SIGNAL( activated( bool ) ), + parentView(), TQ_SLOT( slotChildActivated( bool ) ) ); } KoViewChild::~KoViewChild() @@ -852,10 +852,10 @@ void KoViewChild::setInitialFrameGeometry() kdDebug() << k_funcinfo << endl; // Connect only now, so that the GUI building doesn't move us around. - connect( m_frame, TQT_SIGNAL( geometryChanged() ), - this, TQT_SLOT( slotFrameGeometryChanged() ) ); - connect( m_child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotDocGeometryChanged() ) ); + connect( m_frame, TQ_SIGNAL( geometryChanged() ), + this, TQ_SLOT( slotFrameGeometryChanged() ) ); + connect( m_child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotDocGeometryChanged() ) ); // Set frameGeometry from childGeometry slotDocGeometryChanged(); diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 8759ef664..a0929fec0 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -66,10 +66,10 @@ KoVersionDialog::KoVersionDialog( TQWidget* parent, const char* name ) grid1->addWidget(m_pOpen,4,2); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pOpen, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpen() ) ); - connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pOpen, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpen() ) ); + connect( m_pModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModify() ) ); updateButton(); diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index 5a4a288df..f35eafc6e 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -57,7 +57,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool grid = new TQGridLayout( page, 1, 1, 0, KDialog::spacingHint() ); charSelect = new KCharSelect( page, "", _font, _chr ); - connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); + connect(charSelect, TQ_SIGNAL(doubleClicked()),this, TQ_SLOT(slotDoubleClicked())); charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( true ); grid->addWidget( charSelect, 0, 0 ); diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 4f81388cb..f7da01190 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -91,10 +91,10 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool if (withMenus) { TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo", - TDEStdAccel::undo(), this, TQT_SLOT( undo() ), + TDEStdAccel::undo(), this, TQ_SLOT( undo() ), actionCollection, /*KStdAction::stdName( KStdAction::Undo )*/"koffice_undo" ); - connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); - connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); + connect( undo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUndoAboutToShow() ) ); + connect( undo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) ); m_undo = undo; m_undoPopup = undo->popupMenu(); d->m_undoListBox = new KoListBox( m_undoPopup ); @@ -104,17 +104,17 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool d->m_undoLabel = new TQLabel( m_undoPopup); m_undoPopup->insertItem(d->m_undoLabel); - connect( d->m_undoListBox, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); - connect( d->m_undoListBox, TQT_SIGNAL(clicked ( TQListBoxItem *)), this, TQT_SLOT( slotUndoActivated( TQListBoxItem * ) ) ); + connect( d->m_undoListBox, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) ); + connect( d->m_undoListBox, TQ_SIGNAL(clicked ( TQListBoxItem *)), this, TQ_SLOT( slotUndoActivated( TQListBoxItem * ) ) ); - connect( d->m_undoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeUndoNumberOfSelectedItem( int ))); + connect( d->m_undoListBox, TQ_SIGNAL( changeNumberOfSelectedItem( int )), this, TQ_SLOT( slotChangeUndoNumberOfSelectedItem( int ))); TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo", - TDEStdAccel::redo(), this, TQT_SLOT( redo() ), + TDEStdAccel::redo(), this, TQ_SLOT( redo() ), actionCollection, /*KStdAction::stdName( KStdAction::Redo )*/ "koffice_redo"); - connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); - connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) ); + connect( redo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotRedoAboutToShow() ) ); + connect( redo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) ); m_redo = redo; m_redoPopup = redo->popupMenu(); d->m_redoListBox = new KoListBox( m_redoPopup ); @@ -125,15 +125,15 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool m_redoPopup->insertItem(d->m_redoLabel); - connect( d->m_redoListBox, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) ); - connect( d->m_redoListBox, TQT_SIGNAL(clicked ( TQListBoxItem *)), this, TQT_SLOT( slotRedoActivated( TQListBoxItem * ) ) ); - connect( d->m_redoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeRedoNumberOfSelectedItem( int ))); + connect( d->m_redoListBox, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) ); + connect( d->m_redoListBox, TQ_SIGNAL(clicked ( TQListBoxItem *)), this, TQ_SLOT( slotRedoActivated( TQListBoxItem * ) ) ); + connect( d->m_redoListBox, TQ_SIGNAL( changeNumberOfSelectedItem( int )), this, TQ_SLOT( slotChangeRedoNumberOfSelectedItem( int ))); } else { - m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), actionCollection, "koffice_undo"); - m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), actionCollection, "koffice_redo"); + m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), actionCollection, "koffice_undo"); + m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), actionCollection, "koffice_redo"); m_undoPopup = 0L; m_redoPopup = 0L; d->m_redoListBox = 0L; diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 2db2bd31c..8d200c080 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -286,11 +286,11 @@ KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent ) setBackgroundMode( PaletteLight ); - connect( m_upButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( startScrollingUp() ) ); - connect( m_downButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( startScrollingDown() ) ); - connect( m_upButton, TQT_SIGNAL( released() ), this, TQT_SLOT( stopScrolling() ) ); - connect( m_downButton, TQT_SIGNAL( released() ), this, TQT_SLOT( stopScrolling() ) ); - connect( m_helpView, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_upButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( startScrollingUp() ) ); + connect( m_downButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( startScrollingDown() ) ); + connect( m_upButton, TQ_SIGNAL( released() ), this, TQ_SLOT( stopScrolling() ) ); + connect( m_downButton, TQ_SIGNAL( released() ), this, TQ_SLOT( stopScrolling() ) ); + connect( m_helpView, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoHelpWidget::KoHelpWidget void KoHelpWidget::updateButtons() @@ -390,9 +390,9 @@ KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent ) m_isSticky = false; setFocusPolicy( TQWidget::StrongFocus ); - connect( m_close, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( wantsToBeClosed() ) ); - connect( m_sticky, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( setSticky( bool ) ) ); - connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_close, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( wantsToBeClosed() ) ); + connect( m_sticky, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( setSticky( bool ) ) ); + connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpPopup::KoContextHelpPopup KoContextHelpPopup::~KoContextHelpPopup() @@ -511,9 +511,9 @@ KoContextHelpAction::KoContextHelpAction( TDEActionCollection* parent, TQWidget* : TDEToggleAction( i18n( "Context Help" ), BarIcon( "help" ), TDEShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" ) { m_popup = new KoContextHelpPopup( 0L ); - connect( m_popup, TQT_SIGNAL( wantsToBeClosed() ), this, TQT_SLOT( closePopup() ) ); - connect( this, TQT_SIGNAL( toggled( bool ) ), m_popup, TQT_SLOT( setShown( bool ) ) ); - connect( m_popup, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_popup, TQ_SIGNAL( wantsToBeClosed() ), this, TQ_SLOT( closePopup() ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), m_popup, TQ_SLOT( setShown( bool ) ) ); + connect( m_popup, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpAction::KoContextHelpAction KoContextHelpAction::~KoContextHelpAction() @@ -547,7 +547,7 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name ) this->setMinimumSize( 180, 120 ); this->show(); setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 ); - connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpWidget::KoContextHelpWidget KoContextHelpWidget::~KoContextHelpWidget() @@ -578,7 +578,7 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name ) mainWidget->show(); setWidget( mainWidget ); setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 ); - connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpDocker::KoContextHelpDocker KoContextHelpDocker::~KoContextHelpDocker() diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index bb937a7f0..0ae290832 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -80,7 +80,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons m_urlReq->lineEdit()->setText( _path ); m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly); m_defaultPath = new TQCheckBox( i18n("Default path"), page ); - connect( m_defaultPath, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( slotChangeDefaultValue( bool ))); + connect( m_defaultPath, TQ_SIGNAL(toggled ( bool )), this, TQ_SLOT( slotChangeDefaultValue( bool ))); slotChangeDefaultValue( _path.isEmpty() ); m_defaultPath->setChecked( _path.isEmpty() ); } diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index 740a71912..fc5e3f96d 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -63,7 +63,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, m_hButton = new TQRadioButton( i18n( "Horizontal" ), group ); m_vButton = new TQRadioButton( i18n( "Vertical" ), group ); - connect( group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotOrientationChanged() ) ); + connect( group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotOrientationChanged() ) ); m_vButton->setChecked( true );; @@ -73,7 +73,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, m_position->setFocus(); label->setBuddy( m_position ); - connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); } @@ -104,9 +104,9 @@ void KoGuideLineDia::slotOrientationChanged() m_position->setMaxValue( TQMAX( 0.0, m_rect.bottom() ) ); if ( ! m_positionChanged ) { - disconnect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + disconnect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); m_position->changeValue( m_pos.y() ); - connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); } } else if ( m_vButton->isChecked() ) @@ -115,9 +115,9 @@ void KoGuideLineDia::slotOrientationChanged() m_position->setMaxValue( TQMAX( 0.0, m_rect.right() ) ); if ( ! m_positionChanged ) { - disconnect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + disconnect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); m_position->changeValue( m_pos.x() ); - connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); } } } diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index cb25ace91..f0c1bb735 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -41,9 +41,9 @@ public: Popup( KoGuides * guides ) { m_title = insertTitle( i18n( "Guide Line" ) ); - m_delete = insertItem( i18n( "&Delete" ), guides, TQT_SLOT( slotRemove() ) ); + m_delete = insertItem( i18n( "&Delete" ), guides, TQ_SLOT( slotRemove() ) ); m_seperator = insertSeparator(); - m_pos = insertItem( i18n( "&Set Position..." ), guides, TQT_SLOT( slotChangePosition() ) ); + m_pos = insertItem( i18n( "&Set Position..." ), guides, TQ_SLOT( slotChangePosition() ) ); } void update( int count ) diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index c0866e3d1..f0ff9ff1c 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -44,24 +44,24 @@ KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displ bookmarkLink = 0L; TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("text-html",TDEIcon::SizeMedium)); internetLink = new internetLinkPage(page ); - connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ( ))); + connect(internetLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ( ))); page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",TDEIcon::SizeMedium)); mailLink = new mailLinkPage(page ); - connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); + connect(mailLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ())); page=addVBoxPage(i18n("File"), TQString(),BarIcon("document-new",TDEIcon::SizeMedium)); fileLink = new fileLinkPage(page ); - connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); + connect(fileLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ())); if ( displayBookmarkLink) { page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",TDEIcon::SizeMedium)); bookmarkLink = new bookmarkLinkPage(page ); - connect(bookmarkLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); + connect(bookmarkLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ())); } - connect( this, TQT_SIGNAL( aboutToShowPage(TQWidget *) ), this, TQT_SLOT( tabChanged(TQWidget *) ) ); + connect( this, TQ_SIGNAL( aboutToShowPage(TQWidget *) ), this, TQ_SLOT( tabChanged(TQWidget *) ) ); slotTextChanged ( ); resize(400,300); @@ -245,8 +245,8 @@ internetLinkPage::internetLinkPage( TQWidget *parent , char *name ) m_linkName->setFocus(); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); lay2->addWidget( bar1 ); @@ -318,8 +318,8 @@ bookmarkLinkPage::bookmarkLinkPage( TQWidget *parent , char *name ) m_linkName->setFocus(); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); lay2->addWidget( bar1 ); @@ -397,8 +397,8 @@ mailLinkPage::mailLinkPage( TQWidget *parent , char *name ) lay2->addWidget(m_hrefName); lay2->addStretch( 1 ); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); lay2->addWidget( bar1 ); @@ -486,7 +486,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this, TQT_SLOT( slotSelectRecentFile( const TQString & ))); + connect( recentFile , TQ_SIGNAL(highlighted ( const TQString &)), this, TQ_SLOT( slotSelectRecentFile( const TQString & ))); tmpTQLabel = new TQLabel( this); lay2->addWidget(tmpTQLabel); @@ -497,8 +497,8 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) lay2->addWidget(m_hrefName); lay2->addStretch( 1 ); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp index ce8488746..997c68014 100644 --- a/lib/kofficeui/KoKoolBar.cpp +++ b/lib/kofficeui/KoKoolBar.cpp @@ -53,7 +53,7 @@ int KoKoolBar::insertItem( int _grp, const TQPixmap& _pix, const TQString& _text KoKoolBarItem *item = new KoKoolBarItem( g, _pix, _text ); if ( _obj != 0L && _slot != 0L ) - connect( item, TQT_SIGNAL( pressed( int, int ) ), _obj, _slot ); + connect( item, TQ_SIGNAL( pressed( int, int ) ), _obj, _slot ); g->append( item ); if ( g->id() == m_iActiveGroup ) @@ -245,13 +245,13 @@ void KoKoolBarBox::resizeEvent( TQResizeEvent * ) { m_pButtonUp = new TQPushButton( this ); m_pButtonUp->setPixmap( TQPixmap( UserIcon( "koKoolBarUp" ) ) ); - connect( m_pButtonUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( scrollUp() ) ); + connect( m_pButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollUp() ) ); } if ( m_pButtonDown == 0L ) { m_pButtonDown = new TQPushButton( this ); m_pButtonDown->setPixmap( TQPixmap( UserIcon( "koKoolBarDown" ) ) ); - connect( m_pButtonDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( scrollDown() ) ); + connect( m_pButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollDown() ) ); } m_pButtonUp->show(); m_pButtonUp->raise(); @@ -415,7 +415,7 @@ KoKoolBarGroup::KoKoolBarGroup( KoKoolBar *_bar, const TQString& _text ) : m_bEnabled = true; - connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( pressed() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( pressed() ) ); m_id = g_koKoolBarId++; } diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp index 2d1e6b775..7cea44c1b 100644 --- a/lib/kofficeui/KoPageLayoutColumns.cpp +++ b/lib/kofficeui/KoPageLayoutColumns.cpp @@ -42,8 +42,8 @@ KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& colu nColumns->setValue( m_columns.columns ); m_preview->setPageColumns( m_columns ); - connect( nColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( nColChanged( int ) ) ); - connect( m_spacing, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( nSpaceChanged( double ) ) ); + connect( nColumns, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( nColChanged( int ) ) ); + connect( m_spacing, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( nSpaceChanged( double ) ) ); } void KoPageLayoutColumns::setEnableColumns(bool on) { diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 3c0678cc9..ffb0bd25c 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -257,8 +257,8 @@ void KoPageLayoutDia::setupTab1( bool enableBorders ) m_pageSizeTab = new KoPageLayoutSize(tab1, m_layout, m_unit, m_column, !(flags & DISABLE_UNIT), enableBorders ); lay->addWidget(m_pageSizeTab); m_pageSizeTab->show(); - connect (m_pageSizeTab, TQT_SIGNAL( propertyChange(KoPageLayout&)), - this, TQT_SLOT (sizeUpdated( KoPageLayout&))); + connect (m_pageSizeTab, TQ_SIGNAL( propertyChange(KoPageLayout&)), + this, TQ_SLOT (sizeUpdated( KoPageLayout&))); } void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) { @@ -365,8 +365,8 @@ void KoPageLayoutDia::setupTab3() m_columnsTab->layout()->setMargin(0); lay->addWidget(m_columnsTab); m_columnsTab->show(); - connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)), - this, TQT_SLOT (columnsUpdated( KoColumns&))); + connect (m_columnsTab, TQ_SIGNAL( propertyChange(KoColumns&)), + this, TQ_SLOT (columnsUpdated( KoColumns&))); } void KoPageLayoutDia::columnsUpdated(KoColumns &columns) { diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 7cc70ca5c..aaeadaa91 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -56,7 +56,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, cpgUnit->insertStringList( KoUnit::listOfUnitName() ); cpgUnit->setCurrentItem( unit ); unitLayout->addWidget( cpgUnit, 0, TQt::AlignLeft | TQt::AlignVCenter ); - connect( cpgUnit, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setUnitInt( int ) ) ); + connect( cpgUnit, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setUnitInt( int ) ) ); } else { TQString str=KoUnit::unitDescription(unit); @@ -79,7 +79,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, cpgFormat = new TQComboBox( false, formatPageSize, "cpgFormat" ); cpgFormat->insertStringList( KoPageFormat::allFormats() ); lpgFormat->setBuddy( cpgFormat ); - connect( cpgFormat, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( formatChanged( int ) ) ); + connect( cpgFormat, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( formatChanged( int ) ) ); // spacer formatPageSize->setStretchFactor( new TQWidget( formatPageSize ), 10 ); @@ -95,7 +95,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lpgWidth->setBuddy( epgWidth ); if ( m_layout.format != PG_CUSTOM ) epgWidth->setEnabled( false ); - connect( epgWidth, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( widthChanged(double) ) ); + connect( epgWidth, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( widthChanged(double) ) ); // label height TQLabel *lpgHeight = new TQLabel( i18n( "&Height:" ), formatCustomSize ); @@ -105,7 +105,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lpgHeight->setBuddy( epgHeight ); if ( m_layout.format != PG_CUSTOM ) epgHeight->setEnabled( false ); - connect( epgHeight, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( heightChanged(double) ) ); + connect( epgHeight, TQ_SIGNAL( valueChangedPt(double ) ), this, TQ_SLOT( heightChanged(double) ) ); // --------------- orientation --------------- m_orientGroup = new TQHButtonGroup( i18n( "Orientation" ), this ); @@ -122,7 +122,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() ); new TQRadioButton( i18n("La&ndscape"), m_orientGroup ); - connect( m_orientGroup, TQT_SIGNAL (clicked (int)), this, TQT_SLOT( orientationChanged(int) )); + connect( m_orientGroup, TQ_SIGNAL (clicked (int)), this, TQ_SLOT( orientationChanged(int) )); // --------------- page margins --------------- TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this ); @@ -136,22 +136,22 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, // left margin ebrLeft = new KoUnitDoubleSpinBox( marginsFrame, "Left" ); marginsLayout->addWidget( ebrLeft, 1, 0 ); - connect( ebrLeft, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( leftChanged( double ) ) ); + connect( ebrLeft, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( leftChanged( double ) ) ); // right margin ebrRight = new KoUnitDoubleSpinBox( marginsFrame, "Right" ); marginsLayout->addWidget( ebrRight, 1, 2 ); - connect( ebrRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); + connect( ebrRight, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( rightChanged( double ) ) ); // top margin ebrTop = new KoUnitDoubleSpinBox( marginsFrame, "Top" ); marginsLayout->addWidget( ebrTop, 0, 1 , TQt::AlignCenter ); - connect( ebrTop, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( topChanged( double ) ) ); + connect( ebrTop, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( topChanged( double ) ) ); // bottom margin ebrBottom = new KoUnitDoubleSpinBox( marginsFrame, "Bottom" ); marginsLayout->addWidget( ebrBottom, 2, 1, TQt::AlignCenter ); - connect( ebrBottom, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( bottomChanged( double ) ) ); + connect( ebrBottom, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( bottomChanged( double ) ) ); // ------------- preview ----------- pgPreview = new KoPagePreview( this, "Preview", m_layout ); diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index e5aaf73c9..3e1d013e1 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -40,7 +40,7 @@ KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& ic : TDEActionMenu( text, icon, parent, name ) { if (receiver) - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); init(); } @@ -53,7 +53,7 @@ void KoPartSelectAction::init() KService::Ptr serv = (*it).service(); if (!serv->genericName().isEmpty()) { TDEAction *action = new TDEAction( serv->genericName().replace('&',"&&"), serv->icon(), 0, - this, TQT_SLOT( slotActionActivated() ), + this, TQ_SLOT( slotActionActivated() ), parentCollection(), serv->name().latin1() ); insert( action ); } diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index 897aba8d1..8119ade35 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -38,10 +38,10 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) : listview->setAllColumnsShowFocus( TRUE ); listview->setShowSortIndicator( TRUE ); setMainWidget( listview ); - connect( listview, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotOk() ) ); - connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( selectionChanged( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotOk() ) ); + connect( listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( selectionChanged( TQListViewItem * ) ) ); // Query for documents m_lstEntries = KoDocumentEntry::query(); diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index b5ab6ec97..500496d6b 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -136,7 +136,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, TQt::Orientation _orient setupMenu(); // For compatibility, emitting doubleClicked shall emit openPageLayoutDia - connect( this, TQT_SIGNAL( doubleClicked() ), this, TQT_SIGNAL( openPageLayoutDia() ) ); + connect( this, TQ_SIGNAL( doubleClicked() ), this, TQ_SIGNAL( openPageLayoutDia() ) ); } /*================================================================*/ @@ -1014,12 +1014,12 @@ void KoRuler::setupMenu() if ( m_unit == unit ) d->rb_menu->setItemChecked( i, true ); } - connect( d->rb_menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMenuActivated( int ) ) ); + connect( d->rb_menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMenuActivated( int ) ) ); d->rb_menu->insertSeparator(); - d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, TQT_SLOT(pageLayoutDia())); + d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, TQ_SLOT(pageLayoutDia())); d->rb_menu->insertSeparator(); - d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, TQT_SLOT(rbRemoveTab())); + d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, TQ_SLOT(rbRemoveTab())); d->rb_menu->setItemEnabled( d->mRemoveTab, false ); } diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 0558c512c..e8840c0ba 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -57,7 +57,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, d = new KoSelectActionPrivate; setShowCurrentSelection(true); - connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(execute(int))); + connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int))); } KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const TQObject* receiver, @@ -65,8 +65,8 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const { d = new KoSelectActionPrivate; - connect(this, TQT_SIGNAL(selectionChanged(int)), receiver, slot); - connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(execute(int))); + connect(this, TQ_SIGNAL(selectionChanged(int)), receiver, slot); + connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int))); } KoSelectAction::~KoSelectAction() @@ -105,7 +105,7 @@ int KoSelectAction::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; } @@ -116,8 +116,8 @@ int KoSelectAction::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 { TDEInstance *instance; @@ -128,8 +128,8 @@ int KoSelectAction::plug(TQWidget* widget, int index) 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 ); } @@ -138,7 +138,7 @@ int KoSelectAction::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 ); @@ -156,7 +156,7 @@ int KoSelectAction::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/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h index 8ee0799ec..fb6074bcc 100644 --- a/lib/kofficeui/KoSelectAction.h +++ b/lib/kofficeui/KoSelectAction.h @@ -43,8 +43,8 @@ class KOFFICEUI_EXPORT KoSelectAction : public TDEAction /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a selectionChanged(int) signal is emited. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index 4e7c39313..bb90c7b9e 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -363,17 +363,17 @@ KoTabBar::KoTabBar( TQWidget* parent, const char* name ) // initialize the scroll buttons d->scrollFirstButton = new TQToolButton( this ); - connect( d->scrollFirstButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollFirst() ) ); + connect( d->scrollFirstButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollFirst() ) ); d->scrollLastButton = new TQToolButton( this ); - connect( d->scrollLastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollLast() ) ); + connect( d->scrollLastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollLast() ) ); d->scrollBackButton = new TQToolButton( this ); - connect( d->scrollBackButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollBack() ) ); + connect( d->scrollBackButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollBack() ) ); d->scrollForwardButton = new TQToolButton( this ); - connect( d->scrollForwardButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollForward() ) ); + connect( d->scrollForwardButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollForward() ) ); d->layoutButtons(); d->updateButtons(); } @@ -634,7 +634,7 @@ void KoTabBar::autoScrollBack() if( !canScrollBack() ) d->autoScroll = false; else - TQTimer::singleShot( 400, this, TQT_SLOT( autoScrollBack() ) ); + TQTimer::singleShot( 400, this, TQ_SLOT( autoScrollBack() ) ); } void KoTabBar::autoScrollForward() @@ -646,7 +646,7 @@ void KoTabBar::autoScrollForward() if( !canScrollForward() ) d->autoScroll = false; else - TQTimer::singleShot( 400, this, TQT_SLOT( autoScrollForward() ) ); + TQTimer::singleShot( 400, this, TQ_SLOT( autoScrollForward() ) ); } void KoTabBar::paintEvent( TQPaintEvent* ) diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index 8fc563c77..ed02ebea4 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -155,10 +155,10 @@ void KoTabChooser::setupMenu() { rb_menu = new TQPopupMenu(); TQ_CHECK_PTR( rb_menu ); - mLeft = rb_menu->insertItem( i18n( "Tabulator &Left" ), this, TQT_SLOT( rbLeft() ) ); - mCenter = rb_menu->insertItem( i18n( "Tabulator &Center" ), this, TQT_SLOT( rbCenter() ) ); - mRight = rb_menu->insertItem( i18n( "Tabulator &Right" ), this, TQT_SLOT( rbRight() ) ); - mDecPoint = rb_menu->insertItem( i18n( "Tabulator &Decimal Point" ), this, TQT_SLOT( rbDecPoint() ) ); + mLeft = rb_menu->insertItem( i18n( "Tabulator &Left" ), this, TQ_SLOT( rbLeft() ) ); + mCenter = rb_menu->insertItem( i18n( "Tabulator &Center" ), this, TQ_SLOT( rbCenter() ) ); + mRight = rb_menu->insertItem( i18n( "Tabulator &Right" ), this, TQ_SLOT( rbRight() ) ); + mDecPoint = rb_menu->insertItem( i18n( "Tabulator &Decimal Point" ), this, TQ_SLOT( rbDecPoint() ) ); rb_menu->setCheckable( false ); } diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index c42ff0010..fa9b52cd6 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -335,8 +335,8 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout d->m_instance->config()->setGroup( oldGroup ); d->m_recent->showPreviews(); - connect(d->m_recent, TQT_SIGNAL( doubleClicked ( TQIconViewItem * ) ), - this, TQT_SLOT( recentSelected( TQIconViewItem * ) ) ); + connect(d->m_recent, TQ_SIGNAL( doubleClicked ( TQIconViewItem * ) ), + this, TQ_SLOT( recentSelected( TQIconViewItem * ) ) ); } @@ -377,11 +377,11 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * } d->m_filedialog->setMimeFilter( mimeFilter ); - connect(d->m_filedialog, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT ( slotOk() )); + connect(d->m_filedialog, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT ( slotOk() )); - connect(d->m_filedialog, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT ( slotCancel() )); + connect(d->m_filedialog, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT ( slotCancel() )); } @@ -445,11 +445,11 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou canvas->sort(); canvas->setSelectionMode(TQIconView::Single); - connect( canvas, TQT_SIGNAL( clicked ( TQIconViewItem * ) ), - this, TQT_SLOT( currentChanged( TQIconViewItem * ) ) ); + connect( canvas, TQ_SIGNAL( clicked ( TQIconViewItem * ) ), + this, TQ_SLOT( currentChanged( TQIconViewItem * ) ) ); - connect( canvas, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), - this, TQT_SLOT( chosen(TQIconViewItem *) ) ); + connect( canvas, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), + this, TQ_SLOT( chosen(TQIconViewItem *) ) ); entriesnumber++; } diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index b2dd4df57..0295da1a2 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -99,10 +99,10 @@ class KoTCDRecentFilesIconView : public KFileIconView { KoTCDRecentFilesIconView( TQWidget* parent, const char* name ) : KFileIconView( parent, name ), toolTip(0) { - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - TQT_SLOT( showToolTip( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), - TQT_SLOT( removeToolTip() ) ); + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + TQ_SLOT( showToolTip( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + TQ_SLOT( removeToolTip() ) ); } virtual ~KoTCDRecentFilesIconView(); protected: diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index cb418650e..ae827d756 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -114,8 +114,8 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst namefield->addWidget(label); d->m_name=new KLineEdit(mainwidget); d->m_name->setFocus(); - connect(d->m_name, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotNameChanged(const TQString &))); + connect(d->m_name, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotNameChanged(const TQString &))); namefield->addWidget(d->m_name); label=new TQLabel(i18n("Group:"), mainwidget); @@ -133,10 +133,10 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst TQHBoxLayout *bbox=new TQHBoxLayout(leftbox); d->m_add=new TQPushButton(i18n("&Add Group..."), mainwidget); - connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddGroup())); + connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddGroup())); bbox->addWidget(d->m_add); d->m_remove=new TQPushButton(i18n("&Remove"), mainwidget); - connect(d->m_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemove())); + connect(d->m_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemove())); bbox->addWidget(d->m_remove); TQVBoxLayout *rightbox=new TQVBoxLayout(mbox); @@ -148,15 +148,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst pixlayout->addStretch(1); d->m_default=new TQRadioButton(i18n("&Default"), pixbox); d->m_default->setChecked(true); - connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault())); + connect(d->m_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefault())); pixlayout->addWidget(d->m_default); TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout); d->m_custom=new TQRadioButton(i18n("Custom"), pixbox); d->m_custom->setChecked(false); - connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom())); + connect(d->m_custom, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCustom())); custombox->addWidget(d->m_custom); d->m_select=new TQPushButton(i18n("&Select..."), pixbox); - connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect())); + connect(d->m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelect())); custombox->addWidget(d->m_select, 1); custombox->addStretch(1); pixlayout->addStretch(1); @@ -178,7 +178,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst d->m_changed=false; updatePixmap(); - connect(d->m_groups,TQT_SIGNAL( selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); + connect(d->m_groups,TQ_SIGNAL( selectionChanged()),this,TQ_SLOT(slotSelectionChanged())); d->m_remove->setEnabled(d->m_groups->currentItem()); } diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index 86d2ad88d..ceba3d710 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -52,7 +52,7 @@ KoToolBox::KoToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* ins m_buttonGroup = new TQButtonGroup( 0L ); m_buttonGroup->setExclusive( true ); - connect( m_buttonGroup, TQT_SIGNAL( pressed( int ) ), this, TQT_SLOT( slotButtonPressed( int ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( pressed( int ) ), this, TQ_SLOT( slotButtonPressed( int ) ) ); m_tools.setAutoDelete( true ); // Create separate lists for the various sorts of tools diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index f202177c2..7e03f0bf9 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -76,29 +76,29 @@ TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, cons p.fillRect( 0, 0, 12, 12, defaultColor ); p.end(); proxy = new KoColorPopupProxy( defaultColor, 0, menu, "color proxy" ); - connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); - menu->insertItem( TQIconSet( pixmap ), i18n( "Default Color" ), proxy, TQT_SLOT( slotDefaultColor() ) ); + connect( proxy, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + menu->insertItem( TQIconSet( pixmap ), i18n( "Default Color" ), proxy, TQ_SLOT( slotDefaultColor() ) ); menu->insertSeparator(); } KoColorPanel* panel = new KoColorPanel( menu, "default colors" ); panel->insertDefaultColors(); - connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); menu->insertItem( panel ); if ( style == CustomColors ) { menu->insertSeparator(); panel = new KoColorPanel( menu, "custom panel" ); - connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); menu->insertItem( panel ); if ( !proxy ) { proxy = new KoColorPopupProxy( TQColor(), panel, menu, "color proxy" ); - connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + connect( proxy, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); } else proxy->setRecentColorPanel( panel ); menu->insertSeparator(); - menu->insertItem( i18n( "More Colors..." ), proxy, TQT_SLOT( slotMoreColors() ) ); + menu->insertItem( i18n( "More Colors..." ), proxy, TQ_SLOT( slotMoreColors() ) ); } return menu; @@ -833,7 +833,7 @@ bool KoToolButton::eventFilter( TQObject* o, TQEvent* e ) void KoToolButton::init() { m_popup = KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::yellow, this, - TQT_SLOT( colorSelected( const TQColor& ) ), + TQ_SLOT( colorSelected( const TQColor& ) ), this, "no-name" ); // We are interested in the mouse clicks on the arrow button m_popup->installEventFilter( this ); diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 5c5bdbd9c..7bf6d308d 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -129,7 +129,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name ) setAcceptLocalizedNumbers( true ); setUnit( KoUnit::U_PT ); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged())); } @@ -152,7 +152,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, changeValue( value ); setLineStep( 0.5 ); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged())); } void @@ -292,7 +292,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); changeValue( KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) ); - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit, @@ -305,7 +305,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub lineEdit()->setValidator( m_validator ); setUnit( unit ); changeValue( KoUnit::ptToUnit( value, unit ) ); - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } void @@ -386,16 +386,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); layout->addWidget( up, 0, 0 ); - connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); layout->addWidget( down, 1, 0 ); - connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name ); - connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); + connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) ); layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } @@ -410,16 +410,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double low up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); layout->addWidget( up, 0, 0 ); - connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); layout->addWidget( down, 1, 0 ); - connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name ); - connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); + connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) ); layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index 78a4fc201..c3e37a322 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -108,8 +108,8 @@ void KoZoomAction::init() setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) ); - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( activated( const TQString& ) ) ); + connect( this, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( activated( const TQString& ) ) ); } #include "KoZoomAction.moc" diff --git a/lib/kofficeui/Kolinestyleaction.h b/lib/kofficeui/Kolinestyleaction.h index e310c2269..e67afa4fe 100644 --- a/lib/kofficeui/Kolinestyleaction.h +++ b/lib/kofficeui/Kolinestyleaction.h @@ -38,8 +38,8 @@ class KOFFICEUI_EXPORT KoLineStyleAction : public KoSelectAction /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a selectionChanged(int) signal is emited. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index a000ca56e..0abb52478 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -70,7 +70,7 @@ KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon, createMenu(); - connect(this, TQT_SIGNAL(lineWidthChanged(double)), receiver, slot); + connect(this, TQ_SIGNAL(lineWidthChanged(double)), receiver, slot); } KoLineWidthAction::~KoLineWidthAction() diff --git a/lib/kofficeui/Kolinewidthaction.h b/lib/kofficeui/Kolinewidthaction.h index 4adc92663..737cea1ca 100644 --- a/lib/kofficeui/Kolinewidthaction.h +++ b/lib/kofficeui/Kolinewidthaction.h @@ -42,8 +42,8 @@ class KOFFICEUI_EXPORT KoLineWidthAction : public KoSelectAction /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a lineWidthChanged(double) signal is emited. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a lineWidthChanged(double) signal is emited. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index d34c23923..a27d7f236 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -252,10 +252,10 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) instance = TDEGlobal::instance(); */ id = menu->insertItem( iconSet( TDEIcon::Small, 0 ), text(), this,//dsweet - TQT_SLOT( slotActivated() ), 0, -1, index ); + TQ_SLOT( slotActivated() ), 0, -1, index ); } else - id = menu->insertItem( text(), this, TQT_SLOT( slotActivated() ), //dsweet + id = menu->insertItem( text(), this, TQ_SLOT( slotActivated() ), //dsweet 0, -1, index ); updateShortcut( menu, id ); @@ -269,7 +269,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) menu->setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( parentCollection() ) parentCollection()->connectHighlight( menu, this ); @@ -289,13 +289,13 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) if ( icon().isEmpty() ) // old code using TQIconSet directly { - bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), + bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index ); } else - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); bar->getButton( id_ )->setName( TQCString("toolbutton_")+name() ); @@ -308,7 +308,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( parentCollection() ) parentCollection()->connectHighlight( bar, this ); diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index c7287a720..5e38c950c 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -44,7 +44,7 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w ); panel = new KoColorPanel( b1, "panel1" ); - connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) ); + connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), TQ_SLOT( slotColorSelected( const TQColor& ) ) ); //panel->insertDefaultColors(); l->addWidget( b1 ); @@ -57,20 +57,20 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, menuBar()->insertItem( "&File", file ); file->insertItem( "Custom + Default", KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::red, this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertItem( "Custom", KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQColor(), this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertItem( "Plain + Default", KoColorPanel::createColorPopup( KoColorPanel::Plain, TQt::green, this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertItem( "Plain", KoColorPanel::createColorPopup( KoColorPanel::Plain, TQColor(), this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertSeparator(); - file->insertItem( "Default Colors", this, TQT_SLOT( defaultColors() ), CTRL+Key_D ); - file->insertItem( "Insert Random Color", this, TQT_SLOT( insertRandomColor() ), CTRL+Key_R ); + file->insertItem( "Default Colors", this, TQ_SLOT( defaultColors() ), CTRL+Key_D ); + file->insertItem( "Insert Random Color", this, TQ_SLOT( insertRandomColor() ), CTRL+Key_R ); file->insertSeparator(); - file->insertItem( "Clear", this, TQT_SLOT( clearColors() ), CTRL+Key_C ); + file->insertItem( "Clear", this, TQ_SLOT( clearColors() ), CTRL+Key_C ); file->insertSeparator(); - file->insertItem( "&Quit", tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( "&Quit", tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); TDEToolBar* toolBar = new TDEToolBar( this ); addDockWindow( toolBar ); diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 8eaf1d9d4..3328b474d 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -78,7 +78,7 @@ TTDESelectColorAction::TTDESelectColorAction( const TQString& text, Type type, d->defaultColor=TQColor(); setText(text); m_type = type; - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); init(); } @@ -87,10 +87,10 @@ void TTDESelectColorAction::init() m_pStandardColor = new TKColorPanel(); m_pRecentColor = new TKColorPanel(); - connect(m_pStandardColor,TQT_SIGNAL(colorSelected(const TQColor&)),TQT_SLOT(panelColorSelected(const TQColor&))); - connect(m_pStandardColor,TQT_SIGNAL(reject()),TQT_SLOT(panelReject())); - connect(m_pRecentColor,TQT_SIGNAL(colorSelected(const TQColor&)),TQT_SLOT(panelColorSelected(const TQColor&))); - connect(m_pRecentColor,TQT_SIGNAL(reject()),TQT_SLOT(panelReject())); + connect(m_pStandardColor,TQ_SIGNAL(colorSelected(const TQColor&)),TQ_SLOT(panelColorSelected(const TQColor&))); + connect(m_pStandardColor,TQ_SIGNAL(reject()),TQ_SLOT(panelReject())); + connect(m_pRecentColor,TQ_SIGNAL(colorSelected(const TQColor&)),TQ_SLOT(panelColorSelected(const TQColor&))); + connect(m_pRecentColor,TQ_SIGNAL(reject()),TQ_SLOT(panelReject())); m_pRecentColor->clear(); @@ -102,17 +102,17 @@ void TTDESelectColorAction::init() switch (m_type) { case TextColor: - m_pMenu->insertItem(i18n("More Text Colors..."),this,TQT_SLOT(selectColorDialog())); + m_pMenu->insertItem(i18n("More Text Colors..."),this,TQ_SLOT(selectColorDialog())); setCurrentColor(black); setIcon("textcolor"); break; case LineColor: - m_pMenu->insertItem(i18n("More Line Colors..."),this,TQT_SLOT(selectColorDialog())); + m_pMenu->insertItem(i18n("More Line Colors..."),this,TQ_SLOT(selectColorDialog())); setCurrentColor(black); setIcon("color_line"); break; case FillColor: - m_pMenu->insertItem(i18n("More Fill Colors..."),this,TQT_SLOT(selectColorDialog())); + m_pMenu->insertItem(i18n("More Fill Colors..."),this,TQ_SLOT(selectColorDialog())); setCurrentColor(white); setIcon("color_fill"); break; @@ -122,11 +122,11 @@ void TTDESelectColorAction::init() if(d->defaultColorMenu) { m_pMenu->insertSeparator(); - m_pMenu->insertItem(i18n("Default Color"),this,TQT_SLOT(defaultColor())); + m_pMenu->insertItem(i18n("Default Color"),this,TQ_SLOT(defaultColor())); } - connect(m_pStandardColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize())); - connect(m_pRecentColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize())); + connect(m_pStandardColor,TQ_SIGNAL(sizeChanged()),m_pMenu,TQ_SLOT(updateItemSize())); + connect(m_pRecentColor,TQ_SIGNAL(sizeChanged()),m_pMenu,TQ_SLOT(updateItemSize())); } TTDESelectColorAction::~TTDESelectColorAction() @@ -368,7 +368,7 @@ void TKColorPanel::insertColor( const TQColor& color ) if ( m_activeColor == color ) f->setActive(true); - connect(f,TQT_SIGNAL(selected(const TQColor&)),TQT_SLOT(selected(const TQColor&))); + connect(f,TQ_SIGNAL(selected(const TQColor&)),TQ_SLOT(selected(const TQColor&))); addToGrid(f); } diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp index 6725812a8..17ca8c29b 100644 --- a/lib/kofficeui/ttdeaction.cpp +++ b/lib/kofficeui/ttdeaction.cpp @@ -65,13 +65,13 @@ int TTDEAction::plug(TQWidget* widget, int index) TTDEToolBarButton* b = new TTDEToolBarButton(icon(),plainText(),bar,name(),instance); // we don't need clicked() and buttonClicked(), do we? - // connect(b,TQT_SIGNAL(clicked()),TQT_SLOT(slotActivated())); + // connect(b,TQ_SIGNAL(clicked()),TQ_SLOT(slotActivated())); b->setIconMode(m_imode); initToolBarButton(b); bar->insertWidget( id_, 100, b, index ); addContainer(bar,id_); - connect( bar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( bar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); return containerCount() - 1; } @@ -80,7 +80,7 @@ int TTDEAction::plug(TQWidget* widget, int index) void TTDEAction::initToolBarButton(TTDEToolBarButton* button) { - connect(button,TQT_SIGNAL(buttonClicked()),TQT_SLOT(slotActivated())); + connect(button,TQ_SIGNAL(buttonClicked()),TQ_SLOT(slotActivated())); } TK::IconMode TTDEAction::iconMode() @@ -197,7 +197,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index) bar->insertWidget( id_, 100, base, index ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); setCurrentItem(currentItem()); @@ -213,7 +213,7 @@ int TKBaseSelectAction::currentItem() void TKBaseSelectAction::initComboBox(TKComboBox* cb) { - connect(cb,TQT_SIGNAL(activated(int)),TQT_SLOT(slotActivated(int))); + connect(cb,TQ_SIGNAL(activated(int)),TQ_SLOT(slotActivated(int))); } void TKBaseSelectAction::setEditable(bool editable) @@ -260,7 +260,7 @@ TTDESelectAction::~TTDESelectAction() void TTDESelectAction::initComboBox(TKComboBox* cb) { TKBaseSelectAction::initComboBox(cb); - connect(cb,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotActivated(const TQString&))); + connect(cb,TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(slotActivated(const TQString&))); cb->insertStringList(items()); } diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 8188919e5..16b36d35e 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -99,9 +99,9 @@ TTDEToolBarButton::TTDEToolBarButton( const TQString& icon, const TQString& txt, setFocusPolicy( TQWidget::NoFocus ); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) ); - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); - connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) ); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()) ); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) ); + connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) ); installEventFilter(this); @@ -117,9 +117,9 @@ TTDEToolBarButton::TTDEToolBarButton( const TQPixmap& pixmap, const TQString& tx setFocusPolicy( TQWidget::NoFocus ); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) ); - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); - connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) ); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()) ); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) ); + connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) ); installEventFilter(this); @@ -272,7 +272,7 @@ void TTDEToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) if (!d->m_delayTimer) { d->m_delayTimer = new TQTimer(this); - connect(d->m_delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayTimeout())); + connect(d->m_delayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayTimeout())); } setPopup(p); @@ -514,9 +514,9 @@ void TTDEToolBarButton::setToggle(bool flag) { d->m_isToggle = flag; if (flag == true) - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); else - disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + disconnect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); modeChange(); repaint(); diff --git a/lib/kopainter/koColorChooser.cpp b/lib/kopainter/koColorChooser.cpp index 02439a8cb..350589160 100644 --- a/lib/kopainter/koColorChooser.cpp +++ b/lib/kopainter/koColorChooser.cpp @@ -54,12 +54,12 @@ KoColorChooser::KoColorChooser(TQWidget *parent, const char *name) : TQWidget(pa mColorSelector->setFixedHeight(20); mGrid->addMultiCellWidget(m_tab, 0, 1, 0, 4); mGrid->addMultiCellWidget(mColorSelector, 2, 2, 0, 4); - connect(mRGBWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); - connect(mHSVWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); -// connect(mLABWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); - connect(mGreyWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); - connect(mColorSelector, TQT_SIGNAL(valueChanged(int, int)), this, TQT_SLOT(slotChangeXY(int, int))); - connect(m_tab, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(mRGBWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); + connect(mHSVWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); +// connect(mLABWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); + connect(mGreyWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); + connect(mColorSelector, TQ_SIGNAL(valueChanged(int, int)), this, TQ_SLOT(slotChangeXY(int, int))); + connect(m_tab, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*))); slotChangeColor(KoColor::black()); } @@ -147,17 +147,17 @@ RGBWidget::RGBWidget(TQWidget *parent) : ColorWidget(parent) mGrid->addWidget(mGIn, 2, 4); mGrid->addWidget(mBIn, 3, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color sliders */ - connect(mRSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRSliderChanged(int))); - connect(mGSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGSliderChanged(int))); - connect(mBSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBSliderChanged(int))); + connect(mRSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRSliderChanged(int))); + connect(mGSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGSliderChanged(int))); + connect(mBSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBSliderChanged(int))); /* connect spin box */ - connect(mRIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRInChanged(int))); - connect(mGIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGInChanged(int))); - connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBInChanged(int))); + connect(mRIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRInChanged(int))); + connect(mGIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGInChanged(int))); + connect(mBIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBInChanged(int))); } ColorWidget::ColorWidget(TQWidget *parent) : TQWidget(parent) @@ -328,17 +328,17 @@ HSVWidget::HSVWidget(TQWidget *parent): ColorWidget(parent) mGrid->addWidget(mSIn, 2, 4); mGrid->addWidget(mVIn, 3, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color sliders */ - connect(mHSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotHSliderChanged(int))); - connect(mSSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSSliderChanged(int))); - connect(mVSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVSliderChanged(int))); + connect(mHSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotHSliderChanged(int))); + connect(mSSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSSliderChanged(int))); + connect(mVSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVSliderChanged(int))); /* connect spin box */ - connect(mHIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotHInChanged(int))); - connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSInChanged(int))); - connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVInChanged(int))); + connect(mHIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotHInChanged(int))); + connect(mSIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSInChanged(int))); + connect(mVIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVInChanged(int))); } void HSVWidget::slotRefreshColor() @@ -465,13 +465,13 @@ GreyWidget::GreyWidget(TQWidget *parent): ColorWidget(parent) mGrid->addMultiCellWidget(mVSlider, 1, 1, 2, 3); mGrid->addWidget(mVIn, 1, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color slider */ - connect(mVSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVSliderChanged(int))); + connect(mVSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVSliderChanged(int))); /* connect spin box */ - connect(mVIn, TQT_SIGNAL(valueChanged(int)), mVSlider, TQT_SLOT(slotSetValue(int))); + connect(mVIn, TQ_SIGNAL(valueChanged(int)), mVSlider, TQ_SLOT(slotSetValue(int))); } void GreyWidget::slotRefreshColor() @@ -563,17 +563,17 @@ LABWidget::LABWidget(TQWidget *parent) : ColorWidget(parent) mGrid->addWidget(mAIn, 2, 4); mGrid->addWidget(mBIn, 3, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color sliders */ - connect(mLSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLSliderChanged(int))); - connect(mASlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotASliderChanged(int))); - connect(mBSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBSliderChanged(int))); + connect(mLSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLSliderChanged(int))); + connect(mASlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotASliderChanged(int))); + connect(mBSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBSliderChanged(int))); /* connect spin box */ - connect(mLIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLInChanged(int))); - connect(mAIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotAInChanged(int))); - connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBInChanged(int))); + connect(mLIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLInChanged(int))); + connect(mAIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotAInChanged(int))); + connect(mBIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBInChanged(int))); } void LABWidget::slotRefreshColor() diff --git a/lib/kopainter/koColorSlider.cpp b/lib/kopainter/koColorSlider.cpp index 720357ca3..0fd26a28f 100644 --- a/lib/kopainter/koColorSlider.cpp +++ b/lib/kopainter/koColorSlider.cpp @@ -245,8 +245,8 @@ TQWidget(parent) mMax = 255; mValue = 0; - connect(mSlider, TQT_SIGNAL(positionChanged(int)), this, TQT_SLOT(slotSliderMoved(int))); - connect(mColorFrame, TQT_SIGNAL(clicked(const TQPoint &)), this, TQT_SLOT(slotFrameClicked(const TQPoint &))); + connect(mSlider, TQ_SIGNAL(positionChanged(int)), this, TQ_SLOT(slotSliderMoved(int))); + connect(mColorFrame, TQ_SIGNAL(clicked(const TQPoint &)), this, TQ_SLOT(slotFrameClicked(const TQPoint &))); } KoColorSlider::~KoColorSlider() diff --git a/lib/kopainter/koIconChooser.cpp b/lib/kopainter/koIconChooser.cpp index bae95a21a..aa9f4aca5 100644 --- a/lib/kopainter/koIconChooser.cpp +++ b/lib/kopainter/koIconChooser.cpp @@ -439,8 +439,8 @@ KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget //frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); chooser = new KoIconChooser( TQSize(30,30), this, "pattern chooser" ); - TQObject::connect( chooser, TQT_SIGNAL(selected( KoIconItem * ) ), - this, TQT_SIGNAL( selected( KoIconItem * ))); + TQObject::connect( chooser, TQ_SIGNAL(selected( KoIconItem * ) ), + this, TQ_SIGNAL( selected( KoIconItem * ))); TQPtrListIterator<KoIconItem> itr( list ); for( itr.toFirst(); itr.current(); ++itr ) diff --git a/lib/kopainter/ko_cmyk_widget.cpp b/lib/kopainter/ko_cmyk_widget.cpp index 21c96abe5..3c691cb79 100644 --- a/lib/kopainter/ko_cmyk_widget.cpp +++ b/lib/kopainter/ko_cmyk_widget.cpp @@ -118,20 +118,20 @@ KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, n mGrid->addWidget(mYIn, 2, 4); mGrid->addWidget(mKIn, 3, 4); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); /* connect color sliders */ - connect(mCSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotCChanged(int))); - connect(mMSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotMChanged(int))); - connect(mYSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotYChanged(int))); - connect(mKSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotKChanged(int))); + connect(mCSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotCChanged(int))); + connect(mMSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotMChanged(int))); + connect(mYSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotYChanged(int))); + connect(mKSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotKChanged(int))); /* connect spin box */ - connect(mCIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotCChanged(int))); - connect(mMIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotMChanged(int))); - connect(mYIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotYChanged(int))); - connect(mKIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotKChanged(int))); + connect(mCIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotCChanged(int))); + connect(mMIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotMChanged(int))); + connect(mYIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotYChanged(int))); + connect(mKIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotKChanged(int))); } void KoCMYKWidget::slotCChanged(int c) @@ -225,14 +225,14 @@ void KoCMYKWidget::update(const TQColor fgColor, const TQColor bgColor) CMYKColor col = RgbToCmyk(color); - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor ); m_ColorButton->setBackground( m_bgColor ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); mCSlider->blockSignals(true); mCIn->blockSignals(true); diff --git a/lib/kopainter/ko_gray_widget.cpp b/lib/kopainter/ko_gray_widget.cpp index 16a65aa2a..bbbb48753 100644 --- a/lib/kopainter/ko_gray_widget.cpp +++ b/lib/kopainter/ko_gray_widget.cpp @@ -63,14 +63,14 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n mGrid->addMultiCellWidget(mSlider, 0, 0, 2, 3); mGrid->addWidget(mIn, 0, 4); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); /* connect color slider */ - connect(mSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); /* connect spin box */ - connect(mIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(mIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); } void KoGrayWidget::slotChanged(int v) @@ -107,8 +107,8 @@ void KoGrayWidget::update(const TQColor & fgColor, const TQColor & bgColor) TQColor color = (m_ColorButton->current() == KDualColorButton::Foreground)? m_fgColor : m_bgColor; - disconnect(mSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); - disconnect(mIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + disconnect(mSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); + disconnect(mIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); mIn->blockSignals(true); mSlider->blockSignals(true); @@ -120,17 +120,17 @@ void KoGrayWidget::update(const TQColor & fgColor, const TQColor & bgColor) mIn->blockSignals(false); mSlider->blockSignals(false); - connect(mSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); - connect(mIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); + connect(mIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); } void KoGrayWidget::slotFGColorSelected(const TQColor& c) { m_fgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); emit sigFgColorChanged(m_fgColor); } @@ -139,9 +139,9 @@ void KoGrayWidget::slotBGColorSelected(const TQColor& c) { m_bgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setBackground( m_bgColor ); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); emit sigBgColorChanged(m_bgColor); } diff --git a/lib/kopainter/ko_hsv_widget.cpp b/lib/kopainter/ko_hsv_widget.cpp index 83919d302..d6df28007 100644 --- a/lib/kopainter/ko_hsv_widget.cpp +++ b/lib/kopainter/ko_hsv_widget.cpp @@ -84,17 +84,17 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam mGrid->addMultiCellWidget(m_VSelector, 0, 3, 5, 5); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQT_SLOT(currentChanged(KDualColorButton::DualColor))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQ_SLOT(currentChanged(KDualColorButton::DualColor))); - connect(m_VSelector, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int))); - connect(m_colorwheel, TQT_SIGNAL(valueChanged(const KoColor&)), this, TQT_SLOT(slotWheelChanged(const KoColor&))); + connect(m_VSelector, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVChanged(int))); + connect(m_colorwheel, TQ_SIGNAL(valueChanged(const KoColor&)), this, TQ_SLOT(slotWheelChanged(const KoColor&))); /* connect spin box */ - connect(mHIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotHChanged(int))); - connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSChanged(int))); - connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int))); + connect(mHIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotHChanged(int))); + connect(mSIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSChanged(int))); + connect(mVIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVChanged(int))); //setFixedSize(mGrid -> minimumSize()); m_autovalue = true; // So on the initial selection of h or v, s gets set to 255. @@ -181,9 +181,9 @@ void KoHSVWidget::setBgColor(const TQColor & c) void KoHSVWidget::changedFgColor() { //kdDebug() << "ChangedFgColor\n"; - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor.color() ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); update( m_fgColor, m_bgColor); @@ -193,9 +193,9 @@ void KoHSVWidget::changedFgColor() void KoHSVWidget::changedBgColor() { //kdDebug() << "changedBgColor()\n"; - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setBackground( m_bgColor.color() ); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); update(m_fgColor, m_bgColor ); diff --git a/lib/kopainter/ko_rgb_widget.cpp b/lib/kopainter/ko_rgb_widget.cpp index 22fb97726..1073ac6b5 100644 --- a/lib/kopainter/ko_rgb_widget.cpp +++ b/lib/kopainter/ko_rgb_widget.cpp @@ -98,19 +98,19 @@ KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, nam mGrid->addWidget(mGIn, 1, 4); mGrid->addWidget(mBIn, 2, 4); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQT_SLOT(currentChanged(KDualColorButton::DualColor))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQ_SLOT(currentChanged(KDualColorButton::DualColor))); /* connect color sliders */ - connect(mRSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRChanged(int))); - connect(mGSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGChanged(int))); - connect(mBSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBChanged(int))); + connect(mRSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRChanged(int))); + connect(mGSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGChanged(int))); + connect(mBSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBChanged(int))); /* connect spin box */ - connect(mRIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRChanged(int))); - connect(mGIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGChanged(int))); - connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBChanged(int))); + connect(mRIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRChanged(int))); + connect(mGIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGChanged(int))); + connect(mBIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBChanged(int))); update(TQt::black, TQt::white); } @@ -198,9 +198,9 @@ void KoRGBWidget::update(const TQColor fgColor, const TQColor bgColor) void KoRGBWidget::slotFGColorSelected(const TQColor& c) { m_fgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); update( m_fgColor, m_bgColor); emit sigFgColorChanged(m_fgColor); @@ -210,9 +210,9 @@ void KoRGBWidget::slotBGColorSelected(const TQColor& c) { m_bgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setBackground( m_bgColor ); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); update(m_fgColor, m_bgColor); emit sigBgColorChanged(m_bgColor); diff --git a/lib/kopalette/kopalettemanager.cpp b/lib/kopalette/kopalettemanager.cpp index 48dc682d4..afbc693b2 100644 --- a/lib/kopalette/kopalettemanager.cpp +++ b/lib/kopalette/kopalettemanager.cpp @@ -62,7 +62,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const m_widgetNames = new TQStringList(); m_mapper = new TQSignalMapper(this); - connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int))); + connect(m_mapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotTogglePalette(int))); m_viewActionMenu = new TDEActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); TDEConfig * cfg = TDEGlobal::config(); @@ -74,7 +74,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const if ( palettesShown) { m_toggleShowHidePalettes = new TDEToggleAction(i18n("Hide All Palette Windows"), "CTRL+SHIFT+H", this, - TQT_SLOT(slotToggleAllPalettes()), + TQ_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); m_toggleShowHidePalettes->setCheckedState(i18n("Show Palette Windows Again")); @@ -82,7 +82,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const else { m_toggleShowHidePalettes = new TDEToggleAction(i18n("Show Palette Windows Again"), "CTRL+SHIFT+H", this, - TQT_SLOT(slotToggleAllPalettes()), + TQ_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); m_toggleShowHidePalettes->setCheckedState(i18n("Hide All Palette Windows")); @@ -107,7 +107,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const /* TDEAction * a = new TDEAction(i18n("Restore Palettes"), 0, this, - TQT_SLOT(slotReset()), + TQ_SLOT(slotReset()), this, "restorePalettes"); m_viewActionMenu->insert(a); */ @@ -165,7 +165,7 @@ void KoPaletteManager::addWidget(TQWidget * widget, } TDEToggleAction * a; - a = new TDEToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); + a = new TDEToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQ_SLOT(map()), m_actionCollection); a->setCheckedState(i18n("Hide %1").arg(widget->caption())); m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 8dfb6e8bb..8c62f14b2 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -77,8 +77,8 @@ class EditorPrivate previouslyCollapsedGroupItem = 0; childFormPreviouslyCollapsedGroupItem = 0; slotPropertyChanged_enabled = true; - TQObject::connect(&changeSetLaterTimer, TQT_SIGNAL(timeout()), - editor, TQT_SLOT(changeSetLater())); + TQObject::connect(&changeSetLaterTimer, TQ_SIGNAL(timeout()), + editor, TQ_SLOT(changeSetLater())); } ~EditorPrivate() { @@ -141,7 +141,7 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name) d->undoButton->setPixmap(SmallIcon("edit-undo")); TQToolTip::add(d->undoButton, i18n("Undo changes")); d->undoButton->hide(); - connect(d->undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); + connect(d->undoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(undo())); installEventFilter(this); viewport()->installEventFilter(this); @@ -164,14 +164,14 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name) updateFont(); // d->baseRowHeight = TQFontMetrics(font()).height() + itemMargin()*2; - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem *))); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem *)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem *))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem *)), this, TQT_SLOT(slotExpanded(TQListViewItem *))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem *)), this, TQT_SLOT(slotCollapsed(TQListViewItem *))); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); -// connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateEditorGeometry())); -// connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateEditorGeometryAndGroupLabels())); - connect(header(), TQT_SIGNAL(sectionHandleDoubleClicked (int)), this, TQT_SLOT(slotColumnSizeChanged(int))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem *)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem *))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem *)), this, TQ_SLOT(slotExpanded(TQListViewItem *))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem *)), this, TQ_SLOT(slotCollapsed(TQListViewItem *))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); +// connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateEditorGeometry())); +// connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateEditorGeometryAndGroupLabels())); + connect(header(), TQ_SIGNAL(sectionHandleDoubleClicked (int)), this, TQ_SLOT(slotColumnSizeChanged(int))); updateGroupLabelsPosition(); } @@ -343,12 +343,12 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString& d->set = set; if (d->set) { //receive property changes - connect(d->set, TQT_SIGNAL(propertyChangedInternal(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); - connect(d->set, TQT_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&))); - connect(d->set,TQT_SIGNAL(aboutToBeCleared()), this, TQT_SLOT(slotSetWillBeCleared())); - connect(d->set,TQT_SIGNAL(aboutToBeDeleted()), this, TQT_SLOT(slotSetWillBeDeleted())); + connect(d->set, TQ_SIGNAL(propertyChangedInternal(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(d->set, TQ_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&))); + connect(d->set,TQ_SIGNAL(aboutToBeCleared()), this, TQ_SLOT(slotSetWillBeCleared())); + connect(d->set,TQ_SIGNAL(aboutToBeDeleted()), this, TQ_SLOT(slotSetWillBeDeleted())); } fill(); @@ -365,7 +365,7 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString& if (item) { d->itemToSelectLater = item; - TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); + TQTimer::singleShot(10, this, TQ_SLOT(selectItemLater())); //d->doNotSetFocusOnSelection = !hasParent(this, focusWidget()); //setSelected(item, true); //d->doNotSetFocusOnSelection = false; @@ -644,12 +644,12 @@ Editor::createWidgetForProperty(Property *property, bool changeWidgetProperty) d->widgetCache[property] = widget; widget->setProperty(0); // to force reloading property later widget->hide(); - connect(widget, TQT_SIGNAL(valueChanged(Widget*)), - this, TQT_SLOT(slotWidgetValueChanged(Widget*)) ); - connect(widget, TQT_SIGNAL(acceptInput(Widget*)), - this, TQT_SLOT(slotWidgetAcceptInput(Widget*)) ); - connect(widget, TQT_SIGNAL(rejectInput(Widget*)), - this, TQT_SLOT(slotWidgetRejectInput(Widget*)) ); + connect(widget, TQ_SIGNAL(valueChanged(Widget*)), + this, TQ_SLOT(slotWidgetValueChanged(Widget*)) ); + connect(widget, TQ_SIGNAL(acceptInput(Widget*)), + this, TQ_SLOT(slotWidgetAcceptInput(Widget*)) ); + connect(widget, TQ_SIGNAL(rejectInput(Widget*)), + this, TQ_SLOT(slotWidgetRejectInput(Widget*)) ); } //update geometry earlier, because Widget::setValue() can depend on widget's geometry diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index fb71a4453..a913c4835 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -50,7 +50,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) m_toggle->move(0, 0); m_toggle->resize(width(), height()); setFocusWidget(m_toggle); - connect(m_toggle, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_toggle, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } BoolEdit::~BoolEdit() diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp index f3cb2a2a4..9288abb4a 100644 --- a/lib/koproperty/editors/coloredit.cpp +++ b/lib/koproperty/editors/coloredit.cpp @@ -35,7 +35,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name) TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); m_edit->setFocusPolicy(TQWidget::NoFocus); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotValueChanged(int))); m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index 92b437e9a..3438beabd 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -53,7 +53,7 @@ ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name) //not needed for combo setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotValueChanged(int))); } ComboBox::~ComboBox() diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index 4b61d80ff..2c39ecc35 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -44,7 +44,7 @@ DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name) setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged(const TQDate&))); } DateEdit::~DateEdit() diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 74636c894..d45ae2df7 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -43,7 +43,7 @@ DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *nam setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(slotValueChanged(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(slotValueChanged(const TQDateTime&))); } DateTimeEdit::~DateTimeEdit() diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index e53e785f3..e9f48db7e 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -86,7 +86,7 @@ FontEdit::FontEdit(Property *property, TQWidget *parent, const char *name) m_edit->setMinimumHeight(5); setEditor(m_edit); setFocusWidget(m_edit->label()); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(slotValueChanged(const TQFont&))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(slotValueChanged(const TQFont&))); } FontEdit::~FontEdit() diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp index b8345390c..f1b5e30ee 100644 --- a/lib/koproperty/editors/linestyledit.cpp +++ b/lib/koproperty/editors/linestyledit.cpp @@ -152,7 +152,7 @@ LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *n setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotValueChanged(int))); } LineStyleEdit::~LineStyleEdit() diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 070de038b..0aac449ae 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -80,7 +80,7 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) m_popup->hide(); setFocusWidget(m_edit); - connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectPixmap())); + connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectPixmap())); } PixmapEdit::~PixmapEdit() diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 3a53d9a06..fcb6ab896 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -102,7 +102,7 @@ IntEdit::IntEdit(Property *property, TQWidget *parent, const char *name) setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } IntEdit::~IntEdit() @@ -253,7 +253,7 @@ DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name) setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotValueChanged(double))); } DoubleEdit::~DoubleEdit() diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp index 1b61a251d..0d0be87b7 100644 --- a/lib/koproperty/editors/stringedit.cpp +++ b/lib/koproperty/editors/stringedit.cpp @@ -37,7 +37,7 @@ StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name) l->addWidget(m_edit); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValueChanged(const TQString&))); } StringEdit::~StringEdit() diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index dee5b335e..79e7257e3 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -55,7 +55,7 @@ StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char l->addWidget(m_selectButton); setFocusWidget(m_selectButton); - connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); + connect(m_selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showEditor())); } StringListEdit::~StringListEdit() diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index 98882e58b..8c2308ee4 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -50,8 +50,8 @@ SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name) m_select->setMinimumHeight(5); l->addWidget(m_select); - connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); + connect(m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectChar())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValueChanged(const TQString&))); } SymbolCombo::~SymbolCombo() diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 94692a47a..d7c41b67f 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -43,7 +43,7 @@ TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name) l->addWidget(m_edit); setLeavesTheSpaceForRevertButton(true); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged(const TQTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged(const TQTime&))); } TimeEdit::~TimeEdit() diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp index 426fe0bd3..78ee3e879 100644 --- a/lib/koproperty/editors/urledit.cpp +++ b/lib/koproperty/editors/urledit.cpp @@ -42,7 +42,7 @@ URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name) setProperty(property); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValueChanged(const TQString&))); m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp index 16fdacc8d..3d50a2b15 100644 --- a/lib/koproperty/set.cpp +++ b/lib/koproperty/set.cpp @@ -439,21 +439,21 @@ Set::typeName() const Buffer::Buffer() :Set(false) { - connect( this, TQT_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); - connect( this, TQT_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); } Buffer::Buffer(const Set *set) :Set(false) { - connect( this, TQT_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); - connect( this, TQT_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); initialSet( set ); } diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index f72bbbd36..bed2b5717 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -52,10 +52,10 @@ DateFormatWidget::DateFormatWidget( TQWidget* parent, const char* name, WFlags label_correction->setText(i18n("Correct in Days")); - connect( CheckBox1, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(slotPersonalizeChanged(bool))); - connect( combo1, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( combo1, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( KIntNumInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT( slotOffsetChanged(int))); + connect( CheckBox1, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(slotPersonalizeChanged(bool))); + connect( combo1, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( combo1, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( KIntNumInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT( slotOffsetChanged(int))); slotPersonalizeChanged(false); } diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 5b5487564..b62812d85 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -71,18 +71,18 @@ KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *parent, const exceptionLine = new KoAutoFormatLineEdit( this ); grid->addWidget(exceptionLine,1,0); - connect(exceptionLine,TQT_SIGNAL(keyReturnPressed()),TQT_SLOT(slotAddException())); - connect(exceptionLine ,TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT(textChanged ( const TQString & ))); + connect(exceptionLine,TQ_SIGNAL(keyReturnPressed()),TQ_SLOT(slotAddException())); + connect(exceptionLine ,TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT(textChanged ( const TQString & ))); pbAddException=new TQPushButton(i18n("Add"),this); - connect(pbAddException, TQT_SIGNAL(clicked()),TQT_SLOT(slotAddException())); + connect(pbAddException, TQ_SIGNAL(clicked()),TQ_SLOT(slotAddException())); grid->addWidget(pbAddException,1,1); pbAddException->setEnabled(false); pbRemoveException=new TQPushButton(i18n("Remove"),this); - connect(pbRemoveException, TQT_SIGNAL(clicked()),TQT_SLOT(slotRemoveException())); + connect(pbRemoveException, TQ_SIGNAL(clicked()),TQ_SLOT(slotRemoveException())); grid->addWidget(pbRemoveException,2,1,TQt::AlignTop); exceptionList=new TQListBox(this); @@ -92,8 +92,8 @@ KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *parent, const grid->setRowStretch( 2, 1 ); - connect( exceptionList , TQT_SIGNAL(selectionChanged () ), - this,TQT_SLOT(slotExceptionListSelected()) ); + connect( exceptionList , TQ_SIGNAL(selectionChanged () ), + this,TQ_SLOT(slotExceptionListSelected()) ); pbRemoveException->setEnabled( exceptionList->currentItem()!=-1); @@ -188,7 +188,7 @@ KoAutoFormatDia::KoAutoFormatDia( TQWidget *parent, const char *name, setupTab3(); setupTab4(); setInitialSize( TQSize(500, 300) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotResetConf())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotResetConf())); noSignal=false; } @@ -322,8 +322,8 @@ void KoAutoFormatDia::setupTab1() "formatting means that a correct bullet is used to draw the list." ) ); - connect( cbUseBulletStyle, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotBulletStyleToggled( bool ) ) ); + connect( cbUseBulletStyle, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotBulletStyleToggled( bool ) ) ); vbox->addWidget(cbUseBulletStyle); TQHBoxLayout *hbox = new TQHBoxLayout(); @@ -345,9 +345,9 @@ void KoAutoFormatDia::setupTab1() initTab1(); - connect( pbBulletStyle, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseBulletStyle() ) ); - connect( pbDefaultBulletStyle, TQT_SIGNAL( clicked()), - TQT_SLOT( defaultBulletStyle() ) ); + connect( pbBulletStyle, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseBulletStyle() ) ); + connect( pbDefaultBulletStyle, TQ_SIGNAL( clicked()), + TQ_SLOT( defaultBulletStyle() ) ); } void KoAutoFormatDia::initTab1() @@ -384,8 +384,8 @@ void KoAutoFormatDia::setupTab2() cbTypographicDoubleQuotes->setText( i18n( "Replace &double quotes with typographical quotes" ) ); - connect( cbTypographicDoubleQuotes,TQT_SIGNAL(toggled ( bool)), - TQT_SLOT(slotChangeStateDouble(bool))); + connect( cbTypographicDoubleQuotes,TQ_SIGNAL(toggled ( bool)), + TQ_SLOT(slotChangeStateDouble(bool))); vbox->addWidget( cbTypographicDoubleQuotes ); @@ -415,9 +415,9 @@ void KoAutoFormatDia::setupTab2() hbox->addStretch( 1 ); - connect(pbDoubleQuote1, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseDoubleQuote1() )); - connect(pbDoubleQuote2, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseDoubleQuote2() )); - connect(pbDoubleDefault, TQT_SIGNAL( clicked()), TQT_SLOT( defaultDoubleQuote() )); + connect(pbDoubleQuote1, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseDoubleQuote1() )); + connect(pbDoubleQuote2, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseDoubleQuote2() )); + connect(pbDoubleDefault, TQ_SIGNAL( clicked()), TQ_SLOT( defaultDoubleQuote() )); vbox->addItem( hbox ); @@ -425,8 +425,8 @@ void KoAutoFormatDia::setupTab2() cbTypographicSimpleQuotes->setText( i18n( "Replace &single quotes with typographical quotes" ) ); - connect( cbTypographicSimpleQuotes,TQT_SIGNAL(toggled ( bool)), - TQT_SLOT(slotChangeStateSimple(bool))); + connect( cbTypographicSimpleQuotes,TQ_SIGNAL(toggled ( bool)), + TQ_SLOT(slotChangeStateSimple(bool))); vbox->addWidget( cbTypographicSimpleQuotes ); @@ -456,9 +456,9 @@ void KoAutoFormatDia::setupTab2() hbox->addStretch( 1 ); - connect(pbSimpleQuote1, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseSimpleQuote1() )); - connect(pbSimpleQuote2, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseSimpleQuote2() )); - connect(pbSimpleDefault, TQT_SIGNAL( clicked()), TQT_SLOT( defaultSimpleQuote() )); + connect(pbSimpleQuote1, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseSimpleQuote1() )); + connect(pbSimpleQuote2, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseSimpleQuote2() )); + connect(pbSimpleDefault, TQ_SIGNAL( clicked()), TQ_SLOT( defaultSimpleQuote() )); vbox->addItem( hbox ); vbox->addStretch( 1 ); @@ -524,7 +524,7 @@ void KoAutoFormatDia::setupTab3() } autoFormatLanguage->insertStringList(lst); - connect(autoFormatLanguage->listBox(), TQT_SIGNAL(selected ( const TQString & )), this, TQT_SLOT(changeAutoformatLanguage(const TQString & ))); + connect(autoFormatLanguage->listBox(), TQ_SIGNAL(selected ( const TQString & )), this, TQ_SLOT(changeAutoformatLanguage(const TQString & ))); grid->addMultiCellWidget( autoFormatLanguage, 0, 0, 4, 6 ); TQLabel *lblAutoFormatLanguage = new TQLabel( i18n("Replacements and exceptions for language:"), tab3); @@ -532,7 +532,7 @@ void KoAutoFormatDia::setupTab3() cbAdvancedAutoCorrection = new TQCheckBox( tab3 ); cbAdvancedAutoCorrection->setText( i18n("Enable word replacement") ); - connect( cbAdvancedAutoCorrection, TQT_SIGNAL(clicked ()), this, TQT_SLOT( slotChangeAdvancedAutoCorrection())); + connect( cbAdvancedAutoCorrection, TQ_SIGNAL(clicked ()), this, TQ_SLOT( slotChangeAdvancedAutoCorrection())); grid->addMultiCellWidget( cbAdvancedAutoCorrection, 1, 1, 0, 6 ); cbAutoCorrectionWithFormat = new TQCheckBox( tab3 ); @@ -547,17 +547,17 @@ void KoAutoFormatDia::setupTab3() lblFind->setBuddy( m_find ); - connect( m_find, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotfind( const TQString & ) ) ); - connect( m_find, TQT_SIGNAL( keyReturnPressed() ), - TQT_SLOT( slotAddEntry())); + connect( m_find, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotfind( const TQString & ) ) ); + connect( m_find, TQ_SIGNAL( keyReturnPressed() ), + TQ_SLOT( slotAddEntry())); pbSpecialChar1 = new TQPushButton( "...", tab3 ); TQToolTip::add( pbSpecialChar1, i18n( "Insert a special character..." ) ); pbSpecialChar1->setFixedWidth( 40 ); grid->addWidget( pbSpecialChar1, 3, 2 ); - connect(pbSpecialChar1,TQT_SIGNAL(clicked()), TQT_SLOT(chooseSpecialChar1())); + connect(pbSpecialChar1,TQ_SIGNAL(clicked()), TQ_SLOT(chooseSpecialChar1())); lblReplace = new TQLabel( i18n( "&Replace:" ), tab3 ); grid->addWidget( lblReplace, 3, 3 ); @@ -567,22 +567,22 @@ void KoAutoFormatDia::setupTab3() lblReplace->setBuddy( m_replace ); - connect( m_replace, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotfind2( const TQString & ) ) ); - connect( m_replace, TQT_SIGNAL( keyReturnPressed() ), - TQT_SLOT( slotAddEntry())); + connect( m_replace, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotfind2( const TQString & ) ) ); + connect( m_replace, TQ_SIGNAL( keyReturnPressed() ), + TQ_SLOT( slotAddEntry())); pbSpecialChar2 = new TQPushButton( "...", tab3 ); TQToolTip::add( pbSpecialChar2, i18n( "Insert a special character..." ) ); pbSpecialChar2->setFixedWidth( 40 ); grid->addWidget( pbSpecialChar2, 3, 5 ); - connect(pbSpecialChar2,TQT_SIGNAL(clicked()), TQT_SLOT(chooseSpecialChar2())); + connect(pbSpecialChar2,TQ_SIGNAL(clicked()), TQ_SLOT(chooseSpecialChar2())); pbAdd = new TQPushButton( i18n( "&Add"), tab3 ); grid->addWidget( pbAdd, 3, 6 ); - connect(pbAdd,TQT_SIGNAL(clicked()),this, TQT_SLOT(slotAddEntry())); + connect(pbAdd,TQ_SIGNAL(clicked()),this, TQ_SLOT(slotAddEntry())); m_pListView = new TDEListView( tab3 ); m_pListView->addColumn( i18n( "Find" ) ); @@ -590,25 +590,25 @@ void KoAutoFormatDia::setupTab3() m_pListView->setAllColumnsShowFocus( true ); grid->addMultiCellWidget( m_pListView, 4, 10, 0, 5 ); - connect(m_pListView, TQT_SIGNAL(doubleClicked ( TQListViewItem * )), - TQT_SLOT(slotChangeTextFormatEntry()) ); - connect(m_pListView, TQT_SIGNAL(clicked ( TQListViewItem * ) ), - TQT_SLOT(slotEditEntry()) ); + connect(m_pListView, TQ_SIGNAL(doubleClicked ( TQListViewItem * )), + TQ_SLOT(slotChangeTextFormatEntry()) ); + connect(m_pListView, TQ_SIGNAL(clicked ( TQListViewItem * ) ), + TQ_SLOT(slotEditEntry()) ); pbRemove = new TQPushButton( i18n( "Remove" ), tab3 ); grid->addWidget( pbRemove, 4, 6, TQt::AlignTop ); - connect(pbRemove,TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveEntry())); + connect(pbRemove,TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveEntry())); pbChangeFormat= new TQPushButton( i18n( "Change Format..." ), tab3 ); grid->addWidget( pbChangeFormat, 5, 6, TQt::AlignTop ); - connect( pbChangeFormat, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeTextFormatEntry())); + connect( pbChangeFormat, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeTextFormatEntry())); pbClearFormat= new TQPushButton( i18n( "Clear Format" ), tab3 ); grid->addWidget( pbClearFormat, 6, 6, TQt::AlignTop ); - connect( pbClearFormat, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearTextFormatEntry())); + connect( pbClearFormat, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearTextFormatEntry())); grid->setRowStretch( 10, 1 ); initTab3(); diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 6546c51cc..1be095954 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -73,12 +73,12 @@ KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *parent, d->intraWordPosition = 0; d->backSpeller = new KoSpell( broker, this, "KoSpell" ); - connect( d->backSpeller, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(spellCheckerMisspelling(const TQString &, int )) ); - connect( d->backSpeller, TQT_SIGNAL(done()), - TQT_SLOT(spellCheckerDone()) ); - connect( d->backSpeller, TQT_SIGNAL(aboutToFeedText()), - TQT_SLOT(slotClearPara()) ); + connect( d->backSpeller, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(spellCheckerMisspelling(const TQString &, int )) ); + connect( d->backSpeller, TQ_SIGNAL(done()), + TQ_SLOT(spellCheckerDone()) ); + connect( d->backSpeller, TQ_SIGNAL(aboutToFeedText()), + TQ_SLOT(slotClearPara()) ); } KoBgSpellCheck::~KoBgSpellCheck() @@ -90,12 +90,12 @@ void KoBgSpellCheck::registerNewTextObject( KoTextObject *obj ) { Q_ASSERT( obj ); - connect( obj, TQT_SIGNAL(paragraphCreated(KoTextParag*)), - TQT_SLOT(slotParagraphCreated(KoTextParag*)) ); - connect( obj, TQT_SIGNAL(paragraphModified(KoTextParag*, int, int, int)), - TQT_SLOT(slotParagraphModified(KoTextParag*, int, int, int)) ); - connect( obj, TQT_SIGNAL(paragraphDeleted(KoTextParag*)), - TQT_SLOT(slotParagraphDeleted(KoTextParag*)) ); + connect( obj, TQ_SIGNAL(paragraphCreated(KoTextParag*)), + TQ_SLOT(slotParagraphCreated(KoTextParag*)) ); + connect( obj, TQ_SIGNAL(paragraphModified(KoTextParag*, int, int, int)), + TQ_SLOT(slotParagraphModified(KoTextParag*, int, int, int)) ); + connect( obj, TQ_SIGNAL(paragraphDeleted(KoTextParag*)), + TQ_SLOT(slotParagraphDeleted(KoTextParag*)) ); } void KoBgSpellCheck::setEnabled( bool b ) @@ -140,7 +140,7 @@ void KoBgSpellCheck::spellCheckerMisspelling( const TQString &old, int pos ) if ( d->startupChecking && d->marked > delayAfterMarked ) { d->marked = 0; - TQTimer::singleShot( 1000, this, TQT_SLOT(checkerContinue()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(checkerContinue()) ); } else { if ( d->startupChecking ) ++d->marked; diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index 727c6e5b9..f0625da37 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -45,8 +45,8 @@ KoCommentDia::KoCommentDia( TQWidget *parent, const TQString &_note, const TQStr if ( authorName.isEmpty() ) pbAddAuthorName->setEnabled( false ); else - connect (pbAddAuthorName, TQT_SIGNAL(clicked ()), this , TQT_SLOT(slotAddAuthorName())); - connect ( m_multiLine , TQT_SIGNAL( textChanged()), this, TQT_SLOT( slotTextChanged( ))); + connect (pbAddAuthorName, TQ_SIGNAL(clicked ()), this , TQ_SLOT(slotAddAuthorName())); + connect ( m_multiLine , TQ_SIGNAL( textChanged()), this, TQ_SLOT( slotTextChanged( ))); slotTextChanged( ); resize( 300,100 ); diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 9def0ec86..867730e8a 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -41,7 +41,7 @@ KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoForm TQVBox *page = makeVBoxMainWidget(); m_widget = new KoCompletion(page, autoFormat); m_widget->layout()->setMargin(0); - connect( this, TQT_SIGNAL( user1Clicked() ), m_widget, TQT_SLOT(slotResetConf())); + connect( this, TQ_SIGNAL( user1Clicked() ), m_widget, TQ_SLOT(slotResetConf())); setButtonWhatsThis(Ok,i18n("This will save your options.")); setButtonWhatsThis(Cancel,i18n("This will abort all changes.")); setButtonWhatsThis(User1,i18n("This will reset to the state after you clicked on the Make Default button.")); @@ -57,7 +57,7 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl m_autoFormat( *autoFormat ), m_docAutoFormat( autoFormat ) { - connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtonStatus())); + connect(cbAllowCompletion, TQ_SIGNAL(toggled ( bool )), this, TQ_SLOT( changeButtonStatus())); TQStringList lst; lst << i18n( "Enter" ); lst << i18n( "Tab" ); @@ -66,12 +66,12 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl lst << i18n( "Right" ); m_completionKeyAction->insertStringList( lst ); - connect( m_lbListCompletion, TQT_SIGNAL( selected ( const TQString & ) ), this, TQT_SLOT( slotCompletionWordSelected( const TQString & ))); - connect( m_lbListCompletion, TQT_SIGNAL( highlighted ( const TQString & ) ), this, TQT_SLOT( slotCompletionWordSelected( const TQString & ))); + connect( m_lbListCompletion, TQ_SIGNAL( selected ( const TQString & ) ), this, TQ_SLOT( slotCompletionWordSelected( const TQString & ))); + connect( m_lbListCompletion, TQ_SIGNAL( highlighted ( const TQString & ) ), this, TQ_SLOT( slotCompletionWordSelected( const TQString & ))); - connect( pbAddCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCompletionEntry())); - connect( pbRemoveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveCompletionEntry())); - connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry())); + connect( pbAddCompletionEntry, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCompletionEntry())); + connect( pbRemoveCompletionEntry, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveCompletionEntry())); + connect( pbSaveCompletionEntry, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSaveCompletionEntry())); slotResetConf(); // aka load config changeButtonStatus(); diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index 93c3dafd1..2a0c7e992 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -35,7 +35,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent m_styleName = new TQLineEdit( page ); m_styleName->setMinimumWidth( m_styleName->sizeHint().width() * 3 ); - connect( m_styleName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &))); + connect( m_styleName, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(nameChanged( const TQString &))); m_styleName->setFocus(); enableButtonOK( false ); } diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index a331596a3..41c2f5df7 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -71,12 +71,12 @@ void KoVariableNameDia::init() names = new TQComboBox( TRUE, row1 ); names->setFocus(); - connect( names, TQT_SIGNAL( textChanged ( const TQString & )), - this, TQT_SLOT( textChanged ( const TQString & ))); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( names, TQ_SIGNAL( textChanged ( const TQString & )), + this, TQ_SLOT( textChanged ( const TQString & ))); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); enableButtonOK( !names->currentText().isEmpty() ); resize( 350, 100 ); } @@ -164,10 +164,10 @@ KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) header()->setMovingEnabled( FALSE ); addColumn( i18n( "Variable" ) ); addColumn( i18n( "Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( columnSizeChange( int, int, int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( sectionClicked( int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( columnSizeChange( int, int, int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( sectionClicked( int ) ) ); setResizeMode(TQListView::LastColumn); setSorting( -1 ); @@ -227,10 +227,10 @@ KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *parent, const TQPtrList<Ko } - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); showButtonOK(lst.count()>0); resize( 600, 400 ); @@ -255,13 +255,13 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent ) m_name->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotAddOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotAddOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); - connect( m_name, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged(const TQString&) ) ); + connect( m_name, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged(const TQString&) ) ); enableButtonOK( false ); resize( 350, 100 ); @@ -279,13 +279,13 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var ) m_value->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotEditOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotEditOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); - connect( m_value, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged(const TQString&) ) ); + connect( m_value, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged(const TQString&) ) ); enableButtonOK( true ); resize( 350, 100 ); diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp index 93b24a53d..e3c969b3f 100644 --- a/lib/kotext/KoDecorationTab.cpp +++ b/lib/kotext/KoDecorationTab.cpp @@ -34,11 +34,11 @@ KoDecorationTab::KoDecorationTab( TQWidget* parent, const char* name, WFlags fl { shadowDistanceKDoubleNumInput->setRange(0, 9, 0.5, false); - connect( textKColorButton, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SIGNAL( fontColorChanged( const TQColor& ) ) ); - connect( backgroundKColorButton, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SIGNAL( backgroundColorChanged( const TQColor& ) ) ); - connect( shadowKColorButton, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SIGNAL( shadowColorChanged( const TQColor& ) ) ); - connect( shadowDistanceKDoubleNumInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( shadowDistanceChanged( double ) ) ); - connect( shadowDirectionButtonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SIGNAL( shadowDirectionChanged( int ) ) ); + connect( textKColorButton, TQ_SIGNAL( changed( const TQColor& ) ), this, TQ_SIGNAL( fontColorChanged( const TQColor& ) ) ); + connect( backgroundKColorButton, TQ_SIGNAL( changed( const TQColor& ) ), this, TQ_SIGNAL( backgroundColorChanged( const TQColor& ) ) ); + connect( shadowKColorButton, TQ_SIGNAL( changed( const TQColor& ) ), this, TQ_SIGNAL( shadowColorChanged( const TQColor& ) ) ); + connect( shadowDistanceKDoubleNumInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( shadowDistanceChanged( double ) ) ); + connect( shadowDirectionButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SIGNAL( shadowDirectionChanged( int ) ) ); } KoDecorationTab::~KoDecorationTab() diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index fbde50285..fd29ee475 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -62,45 +62,45 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); fontTabWidget->addTab( fontTab, i18n( "Font" ) ); - connect( fontTab, TQT_SIGNAL( familyChanged() ), this, TQT_SLOT( slotFontFamilyChanged() ) ); - connect( fontTab, TQT_SIGNAL( boldChanged() ), this, TQT_SLOT( slotFontBoldChanged() ) ); - connect( fontTab, TQT_SIGNAL( italicChanged() ), this, TQT_SLOT( slotFontItalicChanged() ) ); - connect( fontTab, TQT_SIGNAL( sizeChanged() ), this, TQT_SLOT( slotFontSizeChanged() ) ); + connect( fontTab, TQ_SIGNAL( familyChanged() ), this, TQ_SLOT( slotFontFamilyChanged() ) ); + connect( fontTab, TQ_SIGNAL( boldChanged() ), this, TQ_SLOT( slotFontBoldChanged() ) ); + connect( fontTab, TQ_SIGNAL( italicChanged() ), this, TQ_SLOT( slotFontItalicChanged() ) ); + connect( fontTab, TQ_SIGNAL( sizeChanged() ), this, TQ_SLOT( slotFontSizeChanged() ) ); //Highlighting tab highlightingTab = new KoHighlightingTab( this ); fontTabWidget->addTab( highlightingTab, i18n( "Highlighting" ) ); - connect( highlightingTab, TQT_SIGNAL( underlineChanged( int ) ), this, TQT_SLOT( slotUnderlineChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( underlineStyleChanged( int ) ), this, TQT_SLOT( slotUnderlineStyleChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( underlineColorChanged( const TQColor & ) ), this, TQT_SLOT( slotUnderlineColorChanged( const TQColor & ) ) ); - connect( highlightingTab, TQT_SIGNAL( strikethroughChanged( int ) ), this, TQT_SLOT( slotStrikethroughChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( strikethroughStyleChanged( int ) ), this, TQT_SLOT( slotStrikethroughStyleChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( wordByWordChanged( bool ) ), this, TQT_SLOT( slotWordByWordChanged( bool ) ) ); - connect( highlightingTab, TQT_SIGNAL( capitalisationChanged( int ) ), this, TQT_SLOT( slotCapitalisationChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( underlineChanged( int ) ), this, TQ_SLOT( slotUnderlineChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( underlineStyleChanged( int ) ), this, TQ_SLOT( slotUnderlineStyleChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( underlineColorChanged( const TQColor & ) ), this, TQ_SLOT( slotUnderlineColorChanged( const TQColor & ) ) ); + connect( highlightingTab, TQ_SIGNAL( strikethroughChanged( int ) ), this, TQ_SLOT( slotStrikethroughChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( strikethroughStyleChanged( int ) ), this, TQ_SLOT( slotStrikethroughStyleChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( wordByWordChanged( bool ) ), this, TQ_SLOT( slotWordByWordChanged( bool ) ) ); + connect( highlightingTab, TQ_SIGNAL( capitalisationChanged( int ) ), this, TQ_SLOT( slotCapitalisationChanged( int ) ) ); //Decoratio tab decorationTab = new KoDecorationTab( this ); fontTabWidget->addTab( decorationTab, i18n( "Decoration" ) ); - connect( decorationTab, TQT_SIGNAL( fontColorChanged( const TQColor& ) ), this, TQT_SLOT( slotFontColorChanged( const TQColor& ) ) ); - connect( decorationTab, TQT_SIGNAL( backgroundColorChanged( const TQColor& ) ), this, TQT_SLOT( slotBackgroundColorChanged( const TQColor& ) ) ); - connect( decorationTab, TQT_SIGNAL( shadowColorChanged( const TQColor& ) ), this, TQT_SLOT( slotShadowColorChanged( const TQColor& ) ) ); - connect( decorationTab, TQT_SIGNAL( shadowDistanceChanged( double ) ), this, TQT_SLOT( slotShadowDistanceChanged( double ) ) ); - connect( decorationTab, TQT_SIGNAL( shadowDirectionChanged( int ) ), this, TQT_SLOT( slotShadowDirectionChanged( int ) ) ); + connect( decorationTab, TQ_SIGNAL( fontColorChanged( const TQColor& ) ), this, TQ_SLOT( slotFontColorChanged( const TQColor& ) ) ); + connect( decorationTab, TQ_SIGNAL( backgroundColorChanged( const TQColor& ) ), this, TQ_SLOT( slotBackgroundColorChanged( const TQColor& ) ) ); + connect( decorationTab, TQ_SIGNAL( shadowColorChanged( const TQColor& ) ), this, TQ_SLOT( slotShadowColorChanged( const TQColor& ) ) ); + connect( decorationTab, TQ_SIGNAL( shadowDistanceChanged( double ) ), this, TQ_SLOT( slotShadowDistanceChanged( double ) ) ); + connect( decorationTab, TQ_SIGNAL( shadowDirectionChanged( int ) ), this, TQ_SLOT( slotShadowDirectionChanged( int ) ) ); //Layout tab layoutTab = new KoLayoutTab( true, this ); fontTabWidget->addTab( layoutTab, i18n( "Layout" ) ); - connect( layoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );; - connect( layoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) ); - connect( layoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) ); - connect( layoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) ); + connect( layoutTab, TQ_SIGNAL( subSuperScriptChanged() ), this, TQ_SLOT( slotSubSuperChanged() ) );; + connect( layoutTab, TQ_SIGNAL( offsetChanged( int ) ), this, TQ_SLOT( slotOffsetChanged( int ) ) ); + connect( layoutTab, TQ_SIGNAL( relativeSizeChanged( double ) ), this, TQ_SLOT( slotRelativeSizeChanged( double ) ) ); + connect( layoutTab, TQ_SIGNAL( hyphenationChanged( bool ) ), this, TQ_SLOT( slotHyphenationChanged( bool ) ) ); //Language tab languageTab = new KoLanguageTab( broker, this ); fontTabWidget->addTab( languageTab, i18n( "Language" ) ); - connect( languageTab, TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( slotLanguageChanged() ) ); + connect( languageTab, TQ_SIGNAL( languageChanged() ), this, TQ_SLOT( slotLanguageChanged() ) ); //Related properties List View //relatedPropertiesListView = new TDEListView( mainHBox ); @@ -115,7 +115,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, void KoFontDia::init() { - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset()) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotReset()) ); slotReset(); } diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp index 78a9f67fd..fcf70a931 100644 --- a/lib/kotext/KoFontTab.cpp +++ b/lib/kotext/KoFontTab.cpp @@ -28,7 +28,7 @@ KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, characterFont->setFamilyList( list ); characterFont->setSampleBoxVisible(false); comparisonFont = characterFont->font(); - connect( characterFont, TQT_SIGNAL( fontSelected( const TQFont & ) ), this, TQT_SLOT( slotFontChanged( const TQFont & ) ) ); + connect( characterFont, TQ_SIGNAL( fontSelected( const TQFont & ) ), this, TQ_SLOT( slotFontChanged( const TQFont & ) ) ); } KoFontTab::~KoFontTab() diff --git a/lib/kotext/KoHighlightingTab.cpp b/lib/kotext/KoHighlightingTab.cpp index 405887bf8..9f22ca637 100644 --- a/lib/kotext/KoHighlightingTab.cpp +++ b/lib/kotext/KoHighlightingTab.cpp @@ -46,13 +46,13 @@ KoHighlightingTab::KoHighlightingTab( TQWidget* parent, const char* name, WFlags } capitalisationButtonGroup->setButton( 0 ); - connect( underlineStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUnderlineChanged( int ) ) ); - connect( underlineLineStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( underlineStyleChanged( int ) ) ); - connect( underlineKColorButton, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SIGNAL( underlineColorChanged( const TQColor & ) ) ); - connect( strikethroughStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotStrikethroughChanged( int ) ) ); - connect( strikethroughLineStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( strikethroughStyleChanged( int ) ) ); - connect( underlineWordByWordCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( wordByWordChanged( bool ) ) ); - connect( capitalisationButtonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SIGNAL( capitalisationChanged( int ) ) ); + connect( underlineStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUnderlineChanged( int ) ) ); + connect( underlineLineStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SIGNAL( underlineStyleChanged( int ) ) ); + connect( underlineKColorButton, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SIGNAL( underlineColorChanged( const TQColor & ) ) ); + connect( strikethroughStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotStrikethroughChanged( int ) ) ); + connect( strikethroughLineStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SIGNAL( strikethroughStyleChanged( int ) ) ); + connect( underlineWordByWordCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( wordByWordChanged( bool ) ) ); + connect( capitalisationButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SIGNAL( capitalisationChanged( int ) ) ); } KoHighlightingTab::~KoHighlightingTab() diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 1e048939e..1b330200d 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -39,7 +39,7 @@ KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidg m_listStyleName->setSelectionMode( TQListBox::Multi ); enableButtonOK( m_listStyleName->count() != 0 ); setButtonText( KDialogBase::User1, i18n("Load...") ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotLoadFile())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotLoadFile())); setInitialSize( TQSize( 300, 400 ) ); setFocus(); } diff --git a/lib/kotext/KoLanguageTab.cpp b/lib/kotext/KoLanguageTab.cpp index b5b6e0dd6..e7d84953c 100644 --- a/lib/kotext/KoLanguageTab.cpp +++ b/lib/kotext/KoLanguageTab.cpp @@ -47,7 +47,7 @@ KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* parent, con else languageKComboBox->insertItem( *itName ); } - connect( languageKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( languageChanged() ) ); + connect( languageKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SIGNAL( languageChanged() ) ); } KoLanguageTab::~KoLanguageTab() diff --git a/lib/kotext/KoLayoutTab.cpp b/lib/kotext/KoLayoutTab.cpp index 9a2d4e18d..c587b1b48 100644 --- a/lib/kotext/KoLayoutTab.cpp +++ b/lib/kotext/KoLayoutTab.cpp @@ -33,10 +33,10 @@ KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* parent, const char* { if ( !withSubSuperScript ) positionButtonGroup->hide(); - connect( positionButtonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotSubSuperScriptChanged( int ) ) ); - connect( offsetSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SIGNAL( offsetChanged( int ) ) ); - connect( relativeSizeKDoubleSpinBox, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) ); - connect( hyphenateCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( hyphenationChanged( bool ) ) ); + connect( positionButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotSubSuperScriptChanged( int ) ) ); + connect( offsetSpinBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SIGNAL( offsetChanged( int ) ) ); + connect( relativeSizeKDoubleSpinBox, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotRelativeSizeChanged( double ) ) ); + connect( hyphenateCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( hyphenationChanged( bool ) ) ); } KoLayoutTab::~KoLayoutTab() diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 826c44a5f..c9ed078bd 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -71,7 +71,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp lstStyle = new TQListBox( gStyle, "styleListBox" ); grid->addMultiCellWidget( lstStyle, 1, 11, 0, 0); fillStyleCombo(); - connect( lstStyle, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( numStyleChanged() ) ); + connect( lstStyle, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( numStyleChanged() ) ); TQLabel *lPrefix = new TQLabel( gStyle, "lPrefix" ); @@ -116,7 +116,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp bCustom = new TQPushButton( "", gStyle, "bCustom" ); lCustom->setBuddy( bCustom ); customCharBox->addWidget( bCustom ); - connect( bCustom, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectCustomBullet() ) ); + connect( bCustom, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectCustomBullet() ) ); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); customCharBox->addItem( spacer_2 ); @@ -166,14 +166,14 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp } - connect( cbRestart, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( restartChanged(bool) ) ); + connect( cbRestart, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( restartChanged(bool) ) ); - connect( sSuffix, TQT_SIGNAL( textChanged (const TQString &) ), this, TQT_SLOT( suffixChanged(const TQString &) ) ); - connect( sPrefix, TQT_SIGNAL( textChanged (const TQString &) ), this, TQT_SLOT( prefixChanged(const TQString &) ) ); - connect( spnStart, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( startChanged(int) ) ); - connect( spnDepth, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( depthChanged(int) ) ); - connect( spnDisplayLevels, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) ); - connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( alignmentChanged(const TQString&) ) ); + connect( sSuffix, TQ_SIGNAL( textChanged (const TQString &) ), this, TQ_SLOT( suffixChanged(const TQString &) ) ); + connect( sPrefix, TQ_SIGNAL( textChanged (const TQString &) ), this, TQ_SLOT( prefixChanged(const TQString &) ) ); + connect( spnStart, TQ_SIGNAL( valueChanged (int) ), this, TQ_SLOT( startChanged(int) ) ); + connect( spnDepth, TQ_SIGNAL( valueChanged (int) ), this, TQ_SLOT( depthChanged(int) ) ); + connect( spnDisplayLevels, TQ_SIGNAL( valueChanged (int) ), this, TQ_SLOT( displayLevelsChanged(int) ) ); + connect( cbAlignment, TQ_SIGNAL( activated (const TQString&) ), this, TQ_SLOT( alignmentChanged(const TQString&) ) ); noSignals = false; if ( disableAll ) { @@ -899,7 +899,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eLeft = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); lLeft->setBuddy( eLeft ); indentGrid->addWidget( eLeft, 1, 1 ); - connect( eLeft, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( leftChanged( double ) ) ); + connect( eLeft, TQ_SIGNAL( valueChangedPt(double ) ), this, TQ_SLOT( leftChanged( double ) ) ); TQLabel * lRight = new TQLabel( i18n("&Right:"), indentFrame ); lRight->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); @@ -908,7 +908,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eRight = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); lRight->setBuddy( eRight ); indentGrid->addWidget( eRight, 2, 1 ); - connect( eRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); + connect( eRight, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( rightChanged( double ) ) ); TQLabel * lFirstLine = new TQLabel( i18n("&First line:"), indentFrame ); lFirstLine->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); @@ -916,7 +916,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eFirstLine = new KoUnitDoubleSpinBox( indentFrame, -9999, 9999, 1, 0.0, m_unit ); lFirstLine->setBuddy( eFirstLine ); - connect( eFirstLine, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( firstChanged( double ) ) ); + connect( eFirstLine, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( firstChanged( double ) ) ); indentGrid->addWidget( eFirstLine, 3, 1 ); // grid row spacing @@ -940,7 +940,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW cSpacing->insertItem( i18n( "At Least (%1)" ).arg(unitName) ); cSpacing->insertItem( i18n( "Fixed (%1)").arg(unitName) ); // LS_FIXED - connect( cSpacing, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( spacingActivated( int ) ) ); + connect( cSpacing, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( spacingActivated( int ) ) ); spacingGrid->addWidget( cSpacing, 1, 0 ); sSpacingStack = new TQWidgetStack( spacingFrame ); @@ -948,11 +948,11 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eSpacing = new KoUnitDoubleSpinBox( spacingFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit ); eSpacing->setRange( 0, 9999, 1, false); - connect( eSpacing, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( spacingChanged( double ) ) ); + connect( eSpacing, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( spacingChanged( double ) ) ); eSpacingPercent = new KIntNumInput( 100, spacingFrame ); eSpacingPercent->setRange( 0, 1000, 10, false ); eSpacingPercent->setSuffix( " %" ); - connect( eSpacingPercent, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( spacingChanged( int ) ) ); + connect( eSpacingPercent, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( spacingChanged( int ) ) ); sSpacingStack->addWidget( eSpacing ); sSpacingStack->addWidget( eSpacingPercent ); @@ -977,7 +977,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eBefore = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit ); eBefore->setRange( 0 , 9999, 1, false); - connect( eBefore, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( beforeChanged( double ) ) ); + connect( eBefore, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( beforeChanged( double ) ) ); pSpaceGrid->addWidget( eBefore, 1, 1 ); TQLabel * lAfter = new TQLabel( i18n("After:"), pSpaceFrame ); @@ -986,7 +986,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eAfter = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, 1, 0.0, m_unit ); eAfter->setRange( 0, 9999, 1, false); - connect( eAfter, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( afterChanged( double ) ) ); + connect( eAfter, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( afterChanged( double ) ) ); pSpaceGrid->addWidget( eAfter, 2, 1 ); // grid row spacing @@ -1211,16 +1211,16 @@ KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * parent, const TQVGroupBox * AlignGroup = new TQVGroupBox( i18n( "Alignment" ), this ); rLeft = new TQRadioButton( i18n( "&Left" ), AlignGroup ); - connect( rLeft, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignLeft() ) ); + connect( rLeft, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignLeft() ) ); rCenter = new TQRadioButton( i18n( "C&enter" ), AlignGroup ); - connect( rCenter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignCenter() ) ); + connect( rCenter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignCenter() ) ); rRight = new TQRadioButton( i18n( "&Right" ), AlignGroup ); - connect( rRight, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignRight() ) ); + connect( rRight, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignRight() ) ); rJustify = new TQRadioButton( i18n( "&Justify" ), AlignGroup ); - connect( rJustify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignJustify() ) ); + connect( rJustify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignJustify() ) ); clearAligns(); rLeft->setChecked( true ); @@ -1376,23 +1376,23 @@ KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * parent, wDeco->cbBorderWidth->insertItem(TQString::number(i)); // Setup the border toggle buttons, and merge checkbox - connect( wDeco->bBorderLeft, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdLeftToggled( bool ) ) ); - connect( wDeco->bBorderRight, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdRightToggled( bool ) ) ); - connect( wDeco->bBorderTop, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdTopToggled( bool ) ) ); - connect( wDeco->bBorderBottom, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdBottomToggled( bool ) ) ); - connect( wDeco->cbJoinBorder, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdJoinToggled( bool ) ) ); + connect( wDeco->bBorderLeft, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdLeftToggled( bool ) ) ); + connect( wDeco->bBorderRight, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdRightToggled( bool ) ) ); + connect( wDeco->bBorderTop, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdTopToggled( bool ) ) ); + connect( wDeco->bBorderBottom, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdBottomToggled( bool ) ) ); + connect( wDeco->cbJoinBorder, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdJoinToggled( bool ) ) ); // Set up Border preview widget wPreview = new KoBorderPreview( wDeco->borderPreview ); TQVBoxLayout *previewLayout = new TQVBoxLayout( wDeco->borderPreview ); previewLayout->addWidget( wPreview ); - connect( wPreview, TQT_SIGNAL( choosearea(TQMouseEvent * ) ), - this, TQT_SLOT( slotPressEvent(TQMouseEvent *) ) ); + connect( wPreview, TQ_SIGNAL( choosearea(TQMouseEvent * ) ), + this, TQ_SLOT( slotPressEvent(TQMouseEvent *) ) ); } /////// @@ -1625,21 +1625,21 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering->insert( rChapter , KoParagCounter::NUM_CHAPTER); numberingGroupLayout->addWidget( rChapter ); Form1Layout->addWidget( gNumbering ); - connect( gNumbering, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( numTypeChanged( int ) ) ); + connect( gNumbering, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( numTypeChanged( int ) ) ); m_styleWidget = new KoCounterStyleWidget( true, false, disableAll, this ); - connect( m_styleWidget, TQT_SIGNAL( sig_suffixChanged (const TQString &) ), this, TQT_SLOT( suffixChanged(const TQString &) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_prefixChanged (const TQString &) ), this, TQT_SLOT( prefixChanged(const TQString &) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_startChanged(int) ), this, TQT_SLOT( startChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_restartChanged(bool) ), this, TQT_SLOT( restartChanged(bool) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_depthChanged (int) ), this, TQT_SLOT( depthChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_displayLevelsChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_alignmentChanged (int) ), this, TQT_SLOT( alignmentChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( changeCustomBullet( const TQString & , TQChar ) ), this, TQT_SLOT( slotChangeCustomBullet( const TQString & , TQChar ) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_suffixChanged (const TQString &) ), this, TQ_SLOT( suffixChanged(const TQString &) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_prefixChanged (const TQString &) ), this, TQ_SLOT( prefixChanged(const TQString &) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_startChanged(int) ), this, TQ_SLOT( startChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_restartChanged(bool) ), this, TQ_SLOT( restartChanged(bool) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_depthChanged (int) ), this, TQ_SLOT( depthChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_displayLevelsChanged (int) ), this, TQ_SLOT( displayLevelsChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_alignmentChanged (int) ), this, TQ_SLOT( alignmentChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( changeCustomBullet( const TQString & , TQChar ) ), this, TQ_SLOT( slotChangeCustomBullet( const TQString & , TQChar ) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_numTypeChanged( int ) ), this, TQT_SLOT( numTypeChanged(int ) ) ); - connect( m_styleWidget, TQT_SIGNAL( changeStyle( KoParagCounter::Style ) ), this, TQT_SLOT( styleChanged (KoParagCounter::Style ) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_numTypeChanged( int ) ), this, TQ_SLOT( numTypeChanged(int ) ) ); + connect( m_styleWidget, TQ_SIGNAL( changeStyle( KoParagCounter::Style ) ), this, TQ_SLOT( styleChanged (KoParagCounter::Style ) ) ); Form1Layout->addWidget( m_styleWidget ); @@ -1898,16 +1898,16 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram //signal valueChanged passes value which the user see (unlike the value() function) //so fromUserValue has to be used in slotTabValueChanged - connect(sTabPos,TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotTabValueChanged(double ))); - connect(sTabPos,TQT_SIGNAL( keyReturnPressed()),this,TQT_SLOT(newClicked())); - connect(sAlignChar,TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotAlignCharChanged( const TQString & ))); - connect(bNew,TQT_SIGNAL(clicked ()),this,TQT_SLOT(newClicked())); - connect(bDelete,TQT_SIGNAL(clicked ()),this,TQT_SLOT(deleteClicked())); - connect(bDeleteAll,TQT_SIGNAL(clicked ()),this,TQT_SLOT(deleteAllClicked())); - connect(bgAlign,TQT_SIGNAL(clicked (int)),this,TQT_SLOT(updateAlign(int))); - connect(cFilling,TQT_SIGNAL(activated (int)),this,TQT_SLOT(updateFilling(int))); - connect(eWidth,TQT_SIGNAL(valueChangedPt( double ) ),this,TQT_SLOT(updateWidth())); - connect(lstTabs,TQT_SIGNAL(highlighted (int)),this,TQT_SLOT(setActiveItem(int))); + connect(sTabPos,TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotTabValueChanged(double ))); + connect(sTabPos,TQ_SIGNAL( keyReturnPressed()),this,TQ_SLOT(newClicked())); + connect(sAlignChar,TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotAlignCharChanged( const TQString & ))); + connect(bNew,TQ_SIGNAL(clicked ()),this,TQ_SLOT(newClicked())); + connect(bDelete,TQ_SIGNAL(clicked ()),this,TQ_SLOT(deleteClicked())); + connect(bDeleteAll,TQ_SIGNAL(clicked ()),this,TQ_SLOT(deleteAllClicked())); + connect(bgAlign,TQ_SIGNAL(clicked (int)),this,TQ_SLOT(updateAlign(int))); + connect(cFilling,TQ_SIGNAL(activated (int)),this,TQ_SLOT(updateFilling(int))); + connect(eWidth,TQ_SIGNAL(valueChangedPt( double ) ),this,TQ_SLOT(updateWidth())); + connect(lstTabs,TQ_SIGNAL(highlighted (int)),this,TQ_SLOT(setActiveItem(int))); noSignals=false; } @@ -2182,7 +2182,7 @@ KoParagDia::KoParagDia( TQWidget* parent, const char* name, m_tabulatorsWidget->layout()->setMargin(0); } - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotReset())); setInitialSize( TQSize(630, 500) ); } diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 4e81463d5..554a68058 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -67,7 +67,7 @@ KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent ) { m_bOptionsShown = false; m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), parent ); - connect( m_btnShowOptions, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowOptions() ) ); + connect( m_btnShowOptions, TQ_SIGNAL( clicked() ), TQ_SLOT( slotShowOptions() ) ); m_grid = new TQGridLayout( m_parent, 1, 1, 0, 6 ); m_grid->addWidget( m_btnShowOptions, 0, 0 ); @@ -174,30 +174,30 @@ KoFindReplace::KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQ m_lastTextObjectHighlighted( 0 ) { connectFind( m_replace ); - connect( m_replace, TQT_SIGNAL( replace( const TQString &, int , int, int ) ), - this, TQT_SLOT( replace( const TQString &, int , int,int ) ) ); + connect( m_replace, TQ_SIGNAL( replace( const TQString &, int , int, int ) ), + this, TQ_SLOT( replace( const TQString &, int , int,int ) ) ); } void KoFindReplace::connectFind( KFind* find ) { - connect( find, TQT_SIGNAL( optionsChanged() ), - this, TQT_SLOT( optionsChanged() ) ); - connect( find, TQT_SIGNAL( dialogClosed() ), - this, TQT_SLOT( dialogClosed() ) ); + connect( find, TQ_SIGNAL( optionsChanged() ), + this, TQ_SLOT( optionsChanged() ) ); + connect( find, TQ_SIGNAL( dialogClosed() ), + this, TQ_SLOT( dialogClosed() ) ); // Connect highlight signal to code which handles highlighting // of found text. - connect( find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( highlight( const TQString &, int, int ) ) ); + connect( find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( highlight( const TQString &, int, int ) ) ); // Connect findNext signal - called when pressing the button in the dialog - connect( find, TQT_SIGNAL( findNext() ), - this, TQT_SLOT( slotFindNext() ) ); + connect( find, TQ_SIGNAL( findNext() ), + this, TQ_SLOT( slotFindNext() ) ); m_bInit = true; m_currentParagraphModified = false; m_matchingIndex = -1; // Also connect to the textiterator - connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ), - this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); + connect( &m_textIterator, TQ_SIGNAL( currentParagraphModified( int, int, int ) ), + this, TQ_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); } KoFindReplace::~KoFindReplace() @@ -389,16 +389,16 @@ void KoFindReplace::replace( const TQString &text, int matchingIndex, TQString rep = text.mid( matchingIndex, replacementLength ); // Don't let the replacement set the paragraph to "modified by user" - disconnect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ), - this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); + disconnect( &m_textIterator, TQ_SIGNAL( currentParagraphModified( int, int, int ) ), + this, TQ_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); KCommand *cmd = currentTextObj->replaceSelectionCommand( &cursor, rep, TQString(), KoTextDocument::HighlightSelection, repaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint ); - connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ), - this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); + connect( &m_textIterator, TQ_SIGNAL( currentParagraphModified( int, int, int ) ), + this, TQ_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); if( cmd ) macroCommand()->addCommand(cmd); @@ -549,8 +549,8 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC setButtonText( KDialogBase::User1, i18n("Reset") ); setButtonText( KDialogBase::User2, i18n("Clear") ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset())); - connect( this, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT(slotClear())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotReset())); + connect( this, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT(slotClear())); TQGridLayout *m_grid = new TQGridLayout( page, 15, 2, 0, 6 ); m_checkFamily = new TQCheckBox( i18n( "Family:" ),page ); @@ -670,29 +670,29 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC m_grid->addMultiCellWidget( tmpSep, 14, 14, 0, 1 ); // signals and slots connections - TQObject::connect( m_checkFamily, TQT_SIGNAL( toggled( bool ) ), m_familyItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkSize, TQT_SIGNAL( toggled( bool ) ), m_sizeItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkColor, TQT_SIGNAL( toggled( bool ) ), m_colorItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkBgColor, TQT_SIGNAL( toggled( bool ) ), m_bgColorItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkFamily, TQ_SIGNAL( toggled( bool ) ), m_familyItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkSize, TQ_SIGNAL( toggled( bool ) ), m_sizeItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkColor, TQ_SIGNAL( toggled( bool ) ), m_colorItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkBgColor, TQ_SIGNAL( toggled( bool ) ), m_bgColorItem, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkBold, TQT_SIGNAL( toggled( bool ) ), m_boldYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkItalic, TQT_SIGNAL( toggled( bool ) ), m_italicYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkStrikeOut, TQT_SIGNAL( toggled( bool ) ), m_strikeOutItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkShadow, TQT_SIGNAL( toggled( bool ) ), m_shadowYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkWordByWord, TQT_SIGNAL( toggled( bool ) ), m_wordByWordYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkFontAttribute, TQT_SIGNAL( toggled( bool ) ), m_fontAttributeItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkLanguage, TQT_SIGNAL( toggled( bool ) ), m_languageItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkBold, TQ_SIGNAL( toggled( bool ) ), m_boldYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkItalic, TQ_SIGNAL( toggled( bool ) ), m_italicYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkStrikeOut, TQ_SIGNAL( toggled( bool ) ), m_strikeOutItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkShadow, TQ_SIGNAL( toggled( bool ) ), m_shadowYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkWordByWord, TQ_SIGNAL( toggled( bool ) ), m_wordByWordYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkFontAttribute, TQ_SIGNAL( toggled( bool ) ), m_fontAttributeItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkLanguage, TQ_SIGNAL( toggled( bool ) ), m_languageItem, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkBold, TQT_SIGNAL( toggled( bool ) ), m_boldNo, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkItalic, TQT_SIGNAL( toggled( bool ) ), m_italicNo, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkShadow, TQT_SIGNAL( toggled( bool ) ), m_shadowNo, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkWordByWord, TQT_SIGNAL( toggled( bool ) ), m_wordByWordNo, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkBold, TQ_SIGNAL( toggled( bool ) ), m_boldNo, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkItalic, TQ_SIGNAL( toggled( bool ) ), m_italicNo, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkShadow, TQ_SIGNAL( toggled( bool ) ), m_shadowNo, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkWordByWord, TQ_SIGNAL( toggled( bool ) ), m_wordByWordNo, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkVertAlign, TQT_SIGNAL( toggled( bool ) ), m_vertAlignItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkVertAlign, TQ_SIGNAL( toggled( bool ) ), m_vertAlignItem, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkUnderline, TQT_SIGNAL( toggled( bool ) ), m_underlineItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkUnderline, TQ_SIGNAL( toggled( bool ) ), m_underlineItem, TQ_SLOT( setEnabled( bool ) ) ); slotReset(); } diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index 8e96a44f5..0f90443bd 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -74,7 +74,7 @@ bool KoSpell::check( KoTextIterator *itr, bool dialog ) return ret; d->itr = itr; - connect( d->itr, TQT_SIGNAL( currentParagraphDeleted() ), TQT_SLOT( slotCurrentParagraphDeleted() ) ); + connect( d->itr, TQ_SIGNAL( currentParagraphDeleted() ), TQ_SLOT( slotCurrentParagraphDeleted() ) ); d->lastTxtDocument = d->itr->currentTextObject()->textDocument(); d->needsIncrement = false; ret = !d->itr->atEnd(); diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 3ec2e5c1c..f00fe0f1e 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -149,32 +149,32 @@ void KoStyleManager::setupWidget(const KoStyleCollection& styleCollection) m_moveUpButton = new TQPushButton( frame1, "moveUpButton" ); m_moveUpButton->setIconSet( SmallIconSet( "go-up" ) ); - connect( m_moveUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUpStyle() ) ); + connect( m_moveUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveUpStyle() ) ); frame1Layout->addWidget( m_moveUpButton, 1, 1 ); m_moveDownButton = new TQPushButton( frame1, "moveDownButton" ); m_moveDownButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( m_moveDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDownStyle() ) ); + connect( m_moveDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveDownStyle() ) ); frame1Layout->addWidget( m_moveDownButton, 1, 0 ); m_deleteButton = new TQPushButton( frame1, "deleteButton" ); m_deleteButton->setText( i18n( "&Delete" ) ); - connect( m_deleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteStyle() ) ); + connect( m_deleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteStyle() ) ); frame1Layout->addWidget( m_deleteButton, 2, 1 ); m_newButton = new TQPushButton( frame1, "newButton" ); m_newButton->setText( i18n( "New" ) ); - connect( m_newButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addStyle() ) ); + connect( m_newButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addStyle() ) ); frame1Layout->addWidget( m_newButton, 2, 0 ); m_tabs = new TQTabWidget( frame1 ); frame1Layout->addMultiCellWidget( m_tabs, 0, 2, 2, 2 ); - connect( m_stylesList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( switchStyle() ) ); - connect( m_tabs, TQT_SIGNAL( currentChanged ( TQWidget * ) ), this, TQT_SLOT( switchTabs() ) ); + connect( m_stylesList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( switchStyle() ) ); + connect( m_tabs, TQ_SIGNAL( currentChanged ( TQWidget * ) ), this, TQ_SLOT( switchTabs() ) ); } void KoStyleManager::addGeneralTab( int flags ) { @@ -186,7 +186,7 @@ void KoStyleManager::addGeneralTab( int flags ) { m_nameString = new TQLineEdit( tab ); m_nameString->resize(m_nameString->sizeHint() ); - connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); + connect( m_nameString, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); diff --git a/lib/kotext/KoTextIterator.cpp b/lib/kotext/KoTextIterator.cpp index 8ac76173d..ca3311ae9 100644 --- a/lib/kotext/KoTextIterator.cpp +++ b/lib/kotext/KoTextIterator.cpp @@ -163,10 +163,10 @@ void KoTextIterator::connectTextObjects() { TQValueList<KoTextObject *>::Iterator it = m_lstObjects.begin(); for( ; it != m_lstObjects.end(); ++it ) { - connect( (*it), TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ), - this, TQT_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); - connect( (*it), TQT_SIGNAL( paragraphModified( KoTextParag*, int, int, int ) ), - this, TQT_SLOT( slotParagraphModified( KoTextParag*, int, int, int ) ) ); + connect( (*it), TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ), + this, TQ_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); + connect( (*it), TQ_SIGNAL( paragraphModified( KoTextParag*, int, int, int ) ), + this, TQ_SLOT( slotParagraphModified( KoTextParag*, int, int, int ) ) ); // We don't connect to destroyed(), because for undo/redo purposes, // we never really delete textdocuments nor textobjects. // So this is never called. diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index cae6e9e40..01eea0fab 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -88,30 +88,30 @@ void KoTextObject::init() m_highlightSelectionAdded = false; interval = 0; changeIntervalTimer = new TQTimer( this ); - connect( changeIntervalTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doChangeInterval() ) ); + connect( changeIntervalTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doChangeInterval() ) ); formatTimer = new TQTimer( this ); - connect( formatTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( formatMore() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( formatMore() ) ); // Apply default style to initial paragraph if ( m_lastFormatted && m_defaultStyle ) m_lastFormatted->applyStyle( m_defaultStyle ); - connect( textdoc, TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ), - this, TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ) ); - connect( textdoc, TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ), - this, TQT_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); - connect( textdoc, TQT_SIGNAL( newCommand( KCommand* ) ), - this, TQT_SIGNAL( newCommand( KCommand* ) ) ); - connect( textdoc, TQT_SIGNAL( repaintChanged() ), - this, TQT_SLOT( emitRepaintChanged() ) ); + connect( textdoc, TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ), + this, TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ) ); + connect( textdoc, TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ), + this, TQ_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); + connect( textdoc, TQ_SIGNAL( newCommand( KCommand* ) ), + this, TQ_SIGNAL( newCommand( KCommand* ) ) ); + connect( textdoc, TQ_SIGNAL( repaintChanged() ), + this, TQ_SLOT( emitRepaintChanged() ) ); - connect( this, TQT_SIGNAL(paragraphModified( KoTextParag*, int, int , int ) ), - this, TQT_SLOT(slotParagraphModified(KoTextParag *, int, int , int))); - connect( this, TQT_SIGNAL(paragraphCreated( KoTextParag* )), - this, TQT_SLOT(slotParagraphCreated(KoTextParag *))); + connect( this, TQ_SIGNAL(paragraphModified( KoTextParag*, int, int , int ) ), + this, TQ_SLOT(slotParagraphModified(KoTextParag *, int, int , int))); + connect( this, TQ_SIGNAL(paragraphCreated( KoTextParag* )), + this, TQ_SLOT(slotParagraphCreated(KoTextParag *))); } KoTextObject::~KoTextObject() @@ -231,7 +231,7 @@ void KoTextObject::undo() emit setCursor( c ); setLastFormattedParag( textdoc->firstParag() ); delete cursor; - TQTimer::singleShot( 0, this, TQT_SLOT( slotAfterUndoRedo() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAfterUndoRedo() ) ); } void KoTextObject::redo() @@ -248,7 +248,7 @@ void KoTextObject::redo() emit setCursor( c ); // see undo setLastFormattedParag( textdoc->firstParag() ); delete cursor; - TQTimer::singleShot( 0, this, TQT_SLOT( slotAfterUndoRedo() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAfterUndoRedo() ) ); } KoTextObject::UndoRedoInfo::UndoRedoInfo( KoTextObject *to ) diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index d70f9f722..86f87a54d 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -68,12 +68,12 @@ KoTextView::KoTextView( KoTextObject *textobj ) m_bReadWrite = true; m_textobj = textobj; dcop=0; - connect( m_textobj, TQT_SIGNAL( hideCursor() ), this, TQT_SLOT( hideCursor() ) ); - connect( m_textobj, TQT_SIGNAL( showCursor() ), this, TQT_SLOT( showCursor() ) ); - connect( m_textobj, TQT_SIGNAL( setCursor( KoTextCursor * ) ), this, TQT_SLOT( setCursor( KoTextCursor * ) ) ); - connect( m_textobj, TQT_SIGNAL( updateUI(bool, bool) ), this, TQT_SLOT( updateUI(bool, bool) ) ); - connect( m_textobj, TQT_SIGNAL( showCurrentFormat() ), this, TQT_SLOT( showCurrentFormat() ) ); - connect( m_textobj, TQT_SIGNAL( ensureCursorVisible() ), this, TQT_SLOT( ensureCursorVisible() ) ); + connect( m_textobj, TQ_SIGNAL( hideCursor() ), this, TQ_SLOT( hideCursor() ) ); + connect( m_textobj, TQ_SIGNAL( showCursor() ), this, TQ_SLOT( showCursor() ) ); + connect( m_textobj, TQ_SIGNAL( setCursor( KoTextCursor * ) ), this, TQ_SLOT( setCursor( KoTextCursor * ) ) ); + connect( m_textobj, TQ_SIGNAL( updateUI(bool, bool) ), this, TQ_SLOT( updateUI(bool, bool) ) ); + connect( m_textobj, TQ_SIGNAL( showCurrentFormat() ), this, TQ_SLOT( showCurrentFormat() ) ); + connect( m_textobj, TQ_SIGNAL( ensureCursorVisible() ), this, TQ_SLOT( ensureCursorVisible() ) ); m_cursor = new KoTextCursor( m_textobj->textDocument() ); @@ -81,14 +81,14 @@ KoTextView::KoTextView( KoTextObject *textobj ) showCursor(); blinkTimer = new TQTimer( this ); - connect( blinkTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( blinkCursor() ) ); + connect( blinkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( blinkCursor() ) ); if ( TQApplication::cursorFlashTime() > 0 ) blinkTimer->start( TQApplication::cursorFlashTime() / 2 ); dragStartTimer = new TQTimer( this ); - connect( dragStartTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( startDrag() ) ); + connect( dragStartTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startDrag() ) ); m_textobj->formatMore( 2 ); @@ -837,7 +837,7 @@ void KoTextView::handleMouseDoubleClickEvent( TQMouseEvent*ev, const TQPoint& i possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void KoTextView::tripleClickTimeout() @@ -855,7 +855,7 @@ void KoTextView::handleMouseTripleClickEvent( TQMouseEvent*ev, const TQPoint& /* afterTripleClick= true; inDoubleClick = FALSE; *m_cursor = selectParagUnderCursor( *m_cursor ); - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(afterTripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(afterTripleClickTimeout())); } void KoTextView::afterTripleClickTimeout() @@ -1133,7 +1133,7 @@ TQPtrList<TDEAction> KoTextView::dataToolActionList(TDEInstance * instance, cons // Maybe one day we'll have tools that use libkotext (or qt3's qrt), to act on formatted text tools += KDataToolInfo::query( "KoTextString", "application/x-qrichtext", instance ); - return KDataToolAction::dataToolActionList( tools, this, TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); + return KDataToolAction::dataToolActionList( tools, this, TQ_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); } TQString KoTextView::currentWordOrSelection() const diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 0c55f52e4..981c0f03a 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -584,7 +584,7 @@ TQPtrList<TDEAction> KoVariableCollection::popupActionList() const // We store the subtype number as the action name TQCString name; name.setNum(i); TDEToggleAction * act = new TDEToggleAction( *it, TDEShortcut(), 0, name ); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeSubType()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotChangeSubType()) ); if ( i == m_varSelected->subType() ) act->setChecked( true ); //m_subTextMap.insert( act, i ); @@ -608,7 +608,7 @@ TQPtrList<TDEAction> KoVariableCollection::popupActionList() const TQString text = format->convert( m_varSelected->varValue() ); // We store the raw format as the action name TDEToggleAction * act = new TDEToggleAction(text, TDEShortcut(), 0, (*it).utf8()); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeFormat()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotChangeFormat()) ); if ( (*it) == currentFormat ) act->setChecked( true ); listAction.append( act ); diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 5bbd3d1fc..b022cce86 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -38,10 +38,10 @@ TimeFormatWidget::TimeFormatWidget( TQWidget* parent, const char* name, WFlags combo2->setCurrentItem( 0 ); label_correction->setText(i18n("Correct in Minutes")); - connect( CheckBox1, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(slotPersonalizeChanged(bool))); - connect( combo1, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( combo1, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( KIntNumInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT( slotOffsetChanged(int))); + connect( CheckBox1, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(slotPersonalizeChanged(bool))); + connect( combo1, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( combo1, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( KIntNumInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT( slotOffsetChanged(int))); slotPersonalizeChanged(false); } diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index 9e07eed11..32537a684 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -51,7 +51,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, TDESharedPtr<List> argum TQString n = m_signal; - if(n.startsWith("2")) // Remove prefix of SIGNAL-macros + if(n.startsWith("2")) // Remove prefix of TQ_SIGNAL-macros n.remove(0,1); int signalid = m_sender->metaObject()->findSignal(n.latin1(), false); diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index cffe5ae86..5e655cdb3 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -51,7 +51,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) TQString n = m_slot; //TODO name; //Variant::toString(args->item(0)); - if(n.startsWith("1")) // Remove prefix of SLOT-macros + if(n.startsWith("1")) // Remove prefix of TQ_SLOT-macros n.remove(0,1); int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false); @@ -98,7 +98,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) krossdebug( TQString("signal=%1 slot=%2 slotid=%3 params=%4 mdname=%5") .arg(signal).arg(slot).arg(slotid).arg(params).arg(md->name) ); - return TQCString("1" + slot); // Emulate the TQT_SLOT(...) macro by adding as first char a "1". + return TQCString("1" + slot); // Emulate the TQ_SLOT(...) macro by adding as first char a "1". } bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const TQCString& signal, TQString function, const TQCString& slot) diff --git a/lib/kross/api/qtobject.h b/lib/kross/api/qtobject.h index 22829f027..25e0f153c 100644 --- a/lib/kross/api/qtobject.h +++ b/lib/kross/api/qtobject.h @@ -39,7 +39,7 @@ namespace Kross { namespace Api { /** * Class to wrap \a TQObject or inherited instances. * - * This class publishs all SIGNAL's, SLOT's and TQ_PROPERTY's + * This class publishs all TQ_SIGNAL's, TQ_SLOT's and TQ_PROPERTY's * the TQObject has. */ class QtObject : public Kross::Api::Class<QtObject> diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp index 2e775fcbb..e8cbd4a6b 100644 --- a/lib/kross/main/scriptaction.cpp +++ b/lib/kross/main/scriptaction.cpp @@ -164,7 +164,7 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& TDEAction::setIcon(icon); // connect signal - connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activate())); + connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(activate())); } ScriptAction::~ScriptAction() diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index e96c4a900..75e2c2b04 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -76,10 +76,10 @@ ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent) setInstance( ScriptGUIClient::instance() ); // action to execute a scriptfile. - new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); // acion to show the ScriptManagerGUI dialog. - new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts"); // The predefined ScriptActionCollection's this ScriptGUIClient provides. d->collections.replace("installedscripts", @@ -250,11 +250,11 @@ bool ScriptGUIClient::loadScriptConfigDocument(const TQString& scriptconfigfile, installedcollection->attach( action ); } - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); } emit collectionChanged(installedcollection); return true; @@ -329,11 +329,11 @@ bool ScriptGUIClient::loadScriptFile() ScriptActionCollection* loadedcollection = d->collections["loadedscripts"]; if(loadedcollection) { ScriptAction::Ptr action = new ScriptAction( url.path() ); - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); loadedcollection->detach(action); loadedcollection->attach(action); @@ -361,11 +361,11 @@ bool ScriptGUIClient::executeScriptFile(const TQString& file) bool ScriptGUIClient::executeScriptAction(ScriptAction::Ptr action) { - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); action->activate(); bool ok = action->hadException(); action->finalize(); // execution is done. diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 50a0101f9..d04f8d9dc 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -135,45 +135,45 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con slotFillScriptsList(); slotSelectionChanged(0); - connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(scriptsList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "application-x-executable", TDEIcon::MainToolbar, 16 )); - connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); + connect(btnExec, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript())); btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "document-open", TDEIcon::MainToolbar, 16 )); - connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); + connect(btnLoad, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript())); btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); - connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); + connect(btnUnload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript())); btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", TDEIcon::MainToolbar, 16 )); - connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); + connect(btnInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript())); btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); - connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); + connect(btnUninstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 )); - connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); + connect(btnNewStuff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript())); #endif /* toolBar->setIconText( TDEToolBar::IconTextRight ); toolBar->insertButton("application-x-executable", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute")); - toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript())); toolBar->insertLineSeparator(); toolBar->insertButton("document-open", WdgScriptsManagerPrivate::LoadBtn, true, i18n("Load")); - toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript())); toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UnloadBtn, false, i18n("Unload")); - toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript())); toolBar->insertLineSeparator(); toolBar->insertButton("fileimport", WdgScriptsManagerPrivate::InstallBtn, true, i18n("Install")); - toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript())); toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall")); - toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF toolBar->insertLineSeparator(); toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts")); - toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript())); #endif */ - connect(scr, TQT_SIGNAL( collectionChanged(ScriptActionCollection*) ), - this, TQT_SLOT( slotFillScriptsList() )); + connect(scr, TQ_SIGNAL( collectionChanged(ScriptActionCollection*) ), + this, TQ_SLOT( slotFillScriptsList() )); } WdgScriptsManager::~WdgScriptsManager() @@ -325,7 +325,7 @@ void WdgScriptsManager::slotGetNewScript() if(! d->newstuff) { d->newstuff = new ScriptNewStuff(d->m_scripguiclient, type); - connect(d->newstuff, TQT_SIGNAL(installFinished()), this, TQT_SLOT(slotResourceInstalled())); + connect(d->newstuff, TQ_SIGNAL(installFinished()), this, TQ_SLOT(slotResourceInstalled())); } KNS::Engine *engine = new KNS::Engine(d->newstuff, type, this); @@ -333,8 +333,8 @@ void WdgScriptsManager::slotGetNewScript() d->setType(type); KNS::ProviderLoader *p = new KNS::ProviderLoader(this); - TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)), - d, TQT_SLOT(slotProviders(Provider::List*))); + TQObject::connect(p, TQ_SIGNAL(providersLoaded(Provider::List*)), + d, TQ_SLOT(slotProviders(Provider::List*))); p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml"); d->exec(); diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index aa4dc986a..19a51ce46 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -224,7 +224,7 @@ class TQtDialog: tqt.TQPushButton.__init__(self, parent) self.commandmethod = commandmethod self.setText(caption) - tqt.TQObject.connect(self, tqt.SIGNAL("clicked()"), self.commandmethod) + tqt.TQObject.connect(self, tqt.TQ_SIGNAL("clicked()"), self.commandmethod) class CheckBox(tqt.TQCheckBox): @@ -268,7 +268,7 @@ class TQtDialog: label.setBuddy(self.edit) browsebutton = Button(dialog, self, "...", self.browseButtonClicked) - #tqt.TQObject.connect(browsebutton, tqt.SIGNAL("clicked()"), self.browseButtonClicked) + #tqt.TQObject.connect(browsebutton, tqt.TQ_SIGNAL("clicked()"), self.browseButtonClicked) def get(self): return self.edit.text() diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp index 90665a722..146e0c200 100644 --- a/lib/kross/test/main.cpp +++ b/lib/kross/test/main.cpp @@ -114,8 +114,8 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode) /* // Connect TQObject signal with scriptfunction. - scriptcontainer->connect(testobject, TQT_SIGNAL(testSignal()), "testobjectCallback"); - scriptcontainer->connect(testobject, TQT_SIGNAL(testSignalString(const TQString&)), "testobjectCallbackWithParams"); + scriptcontainer->connect(testobject, TQ_SIGNAL(testSignal()), "testobjectCallback"); + scriptcontainer->connect(testobject, TQ_SIGNAL(testSignalString(const TQString&)), "testobjectCallbackWithParams"); // Call the testSlot to emit the testSignal. testobject->testSlot(); */ diff --git a/lib/kross/test/testaction.cpp b/lib/kross/test/testaction.cpp index 429639046..8dd436472 100644 --- a/lib/kross/test/testaction.cpp +++ b/lib/kross/test/testaction.cpp @@ -24,11 +24,11 @@ TestAction::TestAction(Kross::Api::ScriptContainer::Ptr scriptcontainer) { m_actioncollection = new TDEActionCollection(this, this); - m_action1 = new TDEAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); + m_action1 = new TDEAction("Action1_Text", 0, this, TQ_SLOT(activatedAction1()), m_actioncollection, "Action1"); m_actionlist.append(m_action1); scriptcontainer->addTDEAction(m_action1); - m_action2 = new TDEAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); + m_action2 = new TDEAction("Action2_Text", 0, this, TQ_SLOT(activatedAction2()), m_actioncollection, "Action2"); m_actionlist.append(m_action2); scriptcontainer->addTDEAction(m_action2); } diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index 9c2747e8c..c42f4f752 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -67,7 +67,7 @@ class TQtTest: label.setBuddy(self.edit) browsebutton = Button("...", self) - tqt.TQObject.connect(browsebutton, tqt.SIGNAL("clicked()"), self.browseButtonClicked) + tqt.TQObject.connect(browsebutton, tqt.TQ_SIGNAL("clicked()"), self.browseButtonClicked) def file(self): return self.edit.text() @@ -112,11 +112,11 @@ class TQtTest: self.layout.addWidget(buttonbox) savebutton = Button("Save", buttonbox) - tqt.TQObject.connect(savebutton, tqt.SIGNAL("clicked()"), self, tqt.SLOT("accept()")) - #tqt.TQObject.connect(savebutton, tqt.SIGNAL("clicked()"), self.exportButtonClicked) + tqt.TQObject.connect(savebutton, tqt.TQ_SIGNAL("clicked()"), self, tqt.TQ_SLOT("accept()")) + #tqt.TQObject.connect(savebutton, tqt.TQ_SIGNAL("clicked()"), self.exportButtonClicked) cancelbutton = Button("Cancel", buttonbox) - tqt.TQObject.connect(cancelbutton, tqt.SIGNAL("clicked()"), self, tqt.SLOT("close()")) + tqt.TQObject.connect(cancelbutton, tqt.TQ_SIGNAL("clicked()"), self, tqt.TQ_SLOT("close()")) def accept(self): print("ACCEPTTTTTTTT !!!!!!!!!!!!!!!!!!!!!!!!!!!!") diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp index 884e7e370..30385edd1 100644 --- a/lib/kross/test/testobject.cpp +++ b/lib/kross/test/testobject.cpp @@ -29,17 +29,17 @@ TestObject::TestObject() TestObject::TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer) : TQObject(parent, "TestObject") { - connect(this, TQT_SIGNAL(testSignal()), this, TQT_SLOT(testSignalSlot())); - connect(this, TQT_SIGNAL(stdoutSignal(const TQString&)), this, TQT_SLOT(stdoutSlot(const TQString&))); - connect(this, TQT_SIGNAL(stderrSignal(const TQString&)), this, TQT_SLOT(stderrSlot(const TQString&))); + connect(this, TQ_SIGNAL(testSignal()), this, TQ_SLOT(testSignalSlot())); + connect(this, TQ_SIGNAL(stdoutSignal(const TQString&)), this, TQ_SLOT(stdoutSlot(const TQString&))); + connect(this, TQ_SIGNAL(stderrSignal(const TQString&)), this, TQ_SLOT(stderrSlot(const TQString&))); scriptcontainer->addTQObject(this); -//scriptcontainer->addSignal("stdout", this, TQT_SIGNAL(stdoutSignal(const TQString&))); -//scriptcontainer->addSlot("stderr", this, TQT_SLOT(stderrSlot(const TQString&))); +//scriptcontainer->addSignal("stdout", this, TQ_SIGNAL(stdoutSignal(const TQString&))); +//scriptcontainer->addSlot("stderr", this, TQ_SLOT(stderrSlot(const TQString&))); - //scriptcontainer->addSignal("myTestSignal", this, TQT_SIGNAL(testSignal())); - //scriptcontainer->addSlot("myTestSlot", this, TQT_SLOT(testSlot())); + //scriptcontainer->addSignal("myTestSignal", this, TQ_SIGNAL(testSignal())); + //scriptcontainer->addSlot("myTestSlot", this, TQ_SLOT(testSlot())); } TestObject::~TestObject() diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index 4d9c90e3e..9e6908f57 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -83,7 +83,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco TQHBox* btnbox = new TQHBox(mainbox); KPushButton* execbtn = new KPushButton("Execute", btnbox); - connect(execbtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(execute())); + connect(execbtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(execute())); setCentralWidget(mainbox); setMinimumSize(600,420); diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index bc7dec00b..e522e9a4e 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -32,7 +32,7 @@ int main( int argc, char** argv ) window->resize( 500, 500 ); window->show(); - TQObject::connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); return app.exec(); } diff --git a/plugins/scan/scan.cpp b/plugins/scan/scan.cpp index 3401f3e4f..2d115ebee 100644 --- a/plugins/scan/scan.cpp +++ b/plugins/scan/scan.cpp @@ -38,7 +38,7 @@ Scan::Scan(TQObject *parent, const char *name, const TQStringList &) { setInstance(ScanFactory::instance()); - (void) new TDEAction(i18n("&Scan Image..."), SmallIcon("scanner"), 0, this, TQT_SLOT(slotScan()), actionCollection(), "scan_image"); + (void) new TDEAction(i18n("&Scan Image..."), SmallIcon("scanner"), 0, this, TQ_SLOT(slotScan()), actionCollection(), "scan_image"); } Scan::~Scan() @@ -55,8 +55,8 @@ void Scan::slotScan() { scanDialog->setMinimumSize(300, 300); - connect(scanDialog, TQT_SIGNAL(finalImage(const TQImage &, int)), - this, TQT_SLOT(slotShowImage(const TQImage &))); + connect(scanDialog, TQ_SIGNAL(finalImage(const TQImage &, int)), + this, TQ_SLOT(slotShowImage(const TQImage &))); } else { diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 86063f4e0..172f4857f 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -51,7 +51,7 @@ bool convert( const KURL & uIn, const TQString & /*inputFormat*/, const KURL & u KoFilterManager* manager = new KoFilterManager( uIn.path() ); ProgressObject progressObj; - TQObject::connect(manager, TQT_SIGNAL(sigProgress(int)), &progressObj, TQT_SLOT(slotProgress(int))); + TQObject::connect(manager, TQ_SIGNAL(sigProgress(int)), &progressObj, TQ_SLOT(slotProgress(int))); manager->setBatchMode( batch ); diff --git a/tools/thesaurus/main.cpp b/tools/thesaurus/main.cpp index 2cad33205..622314c5b 100644 --- a/tools/thesaurus/main.cpp +++ b/tools/thesaurus/main.cpp @@ -91,8 +91,8 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) m_edit = new KHistoryCombo(m_page); m_edit_label = new TQLabel(m_edit, i18n("&Search for:"), m_page); m_search = new KPushButton(i18n("S&earch"), m_page); - connect(m_search, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFindTerm())); + connect(m_search, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFindTerm())); row1->addWidget(m_edit_label, 0); row1->addWidget(m_edit, 1); row1->addWidget(m_search, 0); @@ -105,11 +105,11 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) TQToolTip::add(m_forward, i18n("Forward")); row1->addWidget(m_forward, 0); m_lang = new KPushButton(i18n("Change Language..."), m_page); - connect(m_lang, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChangeLanguage())); + connect(m_lang, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeLanguage())); row1->addWidget(m_lang, 0); - connect(m_back, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBack())); - connect(m_forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotForward())); + connect(m_back, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBack())); + connect(m_forward, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotForward())); m_tab = new TQTabWidget(m_page); m_top_layout->addWidget(m_tab); @@ -137,28 +137,28 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) // single click -- keep display unambiguous by removing other selections: - connect(m_thes_syn, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQT_SLOT(clearSelection())); - connect(m_thes_syn, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQT_SLOT(clearSelection())); - connect(m_thes_syn, TQT_SIGNAL(selectionChanged(TQListBoxItem *)), - this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *))); + connect(m_thes_syn, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQ_SLOT(clearSelection())); + connect(m_thes_syn, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQ_SLOT(clearSelection())); + connect(m_thes_syn, TQ_SIGNAL(selectionChanged(TQListBoxItem *)), + this, TQ_SLOT(slotSetReplaceTerm(TQListBoxItem *))); - connect(m_thes_hyper, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQT_SLOT(clearSelection())); - connect(m_thes_hyper, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQT_SLOT(clearSelection())); - connect(m_thes_hyper, TQT_SIGNAL(selectionChanged(TQListBoxItem *)), - this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *))); + connect(m_thes_hyper, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQ_SLOT(clearSelection())); + connect(m_thes_hyper, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQ_SLOT(clearSelection())); + connect(m_thes_hyper, TQ_SIGNAL(selectionChanged(TQListBoxItem *)), + this, TQ_SLOT(slotSetReplaceTerm(TQListBoxItem *))); - connect(m_thes_hypo, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQT_SLOT(clearSelection())); - connect(m_thes_hypo, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQT_SLOT(clearSelection())); - connect(m_thes_hypo, TQT_SIGNAL(selectionChanged(TQListBoxItem *)), - this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *))); + connect(m_thes_hypo, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQ_SLOT(clearSelection())); + connect(m_thes_hypo, TQ_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQ_SLOT(clearSelection())); + connect(m_thes_hypo, TQ_SIGNAL(selectionChanged(TQListBoxItem *)), + this, TQ_SLOT(slotSetReplaceTerm(TQListBoxItem *))); // double click: - connect(m_thes_syn, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(slotFindTerm(const TQString &))); - connect(m_thes_hyper, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(slotFindTerm(const TQString &))); - connect(m_thes_hypo, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(slotFindTerm(const TQString &))); + connect(m_thes_syn, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(slotFindTerm(const TQString &))); + connect(m_thes_hyper, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(slotFindTerm(const TQString &))); + connect(m_thes_hypo, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(slotFindTerm(const TQString &))); // // WordNet Tab @@ -171,18 +171,18 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) m_combobox = new TQComboBox(vbox2); m_combobox->setEditable(false); - connect(m_combobox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFindTerm())); + connect(m_combobox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFindTerm())); m_resultbox = new TQTextBrowser(vbox2); m_resultbox->setTextFormat(TQt::RichText); // TODO?: m_resultbox->setMimeSourceFactory(...); to avoid warning - connect(m_resultbox, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(slotFindTerm(const TQString &))); + connect(m_resultbox, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(slotFindTerm(const TQString &))); // Connect for the history box m_edit->setTrapReturnKey(true); // Do not use Return as default key... - connect(m_edit, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotFindTerm(const TQString&))); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotGotoHistory(int))); + connect(m_edit, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotFindTerm(const TQString&))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotGotoHistory(int))); TQHBoxLayout *row2 = new TQHBoxLayout( m_top_layout ); m_replace = new KLineEdit(m_page); @@ -200,19 +200,19 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) // calling the 'wn' binary m_wnproc = new TDEProcess; - connect(m_wnproc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(wnExited(TDEProcess*))); - connect(m_wnproc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedWnStdout(TDEProcess*, char*, int))); - connect(m_wnproc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedWnStderr(TDEProcess*, char*, int))); + connect(m_wnproc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(wnExited(TDEProcess*))); + connect(m_wnproc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedWnStdout(TDEProcess*, char*, int))); + connect(m_wnproc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedWnStderr(TDEProcess*, char*, int))); // grep'ing the text file m_thesproc = new TDEProcess; - connect(m_thesproc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(thesExited(TDEProcess*))); - connect(m_thesproc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedThesStdout(TDEProcess*, char*, int))); - connect(m_thesproc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedThesStderr(TDEProcess*, char*, int))); + connect(m_thesproc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(thesExited(TDEProcess*))); + connect(m_thesproc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedThesStdout(TDEProcess*, char*, int))); + connect(m_thesproc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedThesStderr(TDEProcess*, char*, int))); } diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp index 281f04308..3e298186e 100644 --- a/tools/thumbnail/kofficecreator.cpp +++ b/tools/thumbnail/kofficecreator.cpp @@ -75,7 +75,7 @@ bool KOfficeCreator::create(const TQString &path, int width, int height, TQImage if (!m_doc) return false; - connect(m_doc, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted())); + connect(m_doc, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted())); KURL url; url.setPath( path ); |