diff options
| author | Michele Calgaro <[email protected]> | 2023-12-14 21:19:12 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-12-24 16:56:48 +0900 |
| commit | 757d80a919132cf72773928d53d100d22358de34 (patch) | |
| tree | 78f1145fbd227d1135514b40e66e2e4bcbe3fcce | |
| parent | 9abcf51de91242d1ab70230ba46abd2108416edf (diff) | |
| download | koffice-757d80a919132cf72773928d53d100d22358de34.tar.gz koffice-757d80a919132cf72773928d53d100d22358de34.zip | |
Remove various '#define' strings - part 6
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3aab8aa05b954b80e336517f93463a9b5f50f3d6)
102 files changed, 1333 insertions, 1333 deletions
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp index f58f7816..ba5c4859 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, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); - (void) new TDEAction(i18n("Rotate Image CW"), "object-rotate-right", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); - (void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); - (void) new TDEAction(i18n("Rotate Image CCW"), "object-rotate-left", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); + (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 Layer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); + (void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, this, TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); - (void)new TDEAction(i18n("Rotate 1&80"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); - (void)new TDEAction(i18n("Rotate CCW"), "object-rotate-left", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); - (void)new TDEAction(i18n("Rotate CW"), "object-rotate-right", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); + (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"); } } diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 24b239b3..dd28d925 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -101,12 +101,12 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name) TDEAccel* accel = new TDEAccel(this); TQ_CHECK_PTR(accel); - accel->insert(TDEStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); - accel->insert(TDEStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); + accel->insert(TDEStdAccel::Print, this, TQT_SLOT(slotPrint())); + accel->insert(TDEStdAccel::New, this, TQT_SLOT(slotGrab())); - accel->insert( "Print2", TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); - accel->insert( "New2", TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); - accel->insert( "New3", TQt::Key_Space, TQT_TQOBJECT(this), TQT_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())); mainWidget->btnNew->setFocus(); diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp index 207bc0ce..5c317ad2 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cpp +++ b/chalk/plugins/viewplugins/scripting/scripting.cpp @@ -81,7 +81,7 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) KisScriptMonitor::instance()->monitor( m_scriptguiclient ); Kross::Api::Manager::scriptManager()->addTQObject(m_view->canvasSubject()->document(), "ChalkDocument"); - Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_view), "ChalkView"); + Kross::Api::Manager::scriptManager()->addTQObject(m_view, "ChalkView"); m_scriptProgress = new KisScriptProgress(m_view); Kross::Api::Manager::scriptManager()->addTQObject(m_scriptProgress, "ChalkScriptProgress"); diff --git a/chalk/ui/kis_controlframe.cpp b/chalk/ui/kis_controlframe.cpp index 85f30454..9c90c68f 100644 --- a/chalk/ui/kis_controlframe.cpp +++ b/chalk/ui/kis_controlframe.cpp @@ -105,7 +105,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co TDEAction * action = new KWidgetAction(m_brushWidget, i18n("&Brush"), 0, - TQT_TQOBJECT(view), + view, 0, view->actionCollection(), "brushes"); @@ -116,7 +116,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co action = new KWidgetAction(m_patternWidget, i18n("&Patterns"), 0, - TQT_TQOBJECT(view), + view, 0, view->actionCollection(), "patterns"); @@ -126,7 +126,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co action = new KWidgetAction(m_gradientWidget, i18n("&Gradients"), 0, - TQT_TQOBJECT(view), + view, 0, view->actionCollection(), "gradients"); @@ -135,7 +135,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co action = new KWidgetAction(m_paintopBox, i18n("&Painter's Tools"), 0, - TQT_TQOBJECT(view), + view, 0, view->actionCollection(), "paintops"); @@ -290,10 +290,10 @@ void KisControlFrame::createPatternsChooser(KisView * view) m_patternsTab->addTab( customPatterns, i18n("Custom Pattern")); - m_patternMediator = new KisResourceMediator( chooser, TQT_TQOBJECT(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*)), - TQT_TQOBJECT(view), TQT_SLOT(patternActivated(KisResource*))); + view, TQT_SLOT(patternActivated(KisResource*))); KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("PatternServer"); @@ -326,7 +326,7 @@ void KisControlFrame::createGradientsChooser(KisView * view) m_gradientChooser->setMinimumSize(200, 150); m_gradientTab->addTab( m_gradientChooser, i18n("Gradients")); - m_gradientMediator = new KisResourceMediator( m_gradientChooser, TQT_TQOBJECT(view)); + m_gradientMediator = new KisResourceMediator( m_gradientChooser, view); connect(m_gradientMediator, TQT_SIGNAL(activatedResource(KisResource*)), view, TQT_SLOT(gradientActivated(KisResource*))); KisResourceServerBase* rServer; diff --git a/chalk/ui/kis_custom_palette.cpp b/chalk/ui/kis_custom_palette.cpp index 631b9abe..8fb2a9db 100644 --- a/chalk/ui/kis_custom_palette.cpp +++ b/chalk/ui/kis_custom_palette.cpp @@ -91,7 +91,7 @@ void KisCustomPalette::slotAddNew() { return; bool ok; - TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); + TQRegExpValidator validator(TQRegExp(".*"), this); TQString name = KInputDialog::getText(i18n("Add Color to Palette"), i18n("Color name (optional):"), TQString(), &ok, diff --git a/chalk/ui/kis_layerbox.cpp b/chalk/ui/kis_layerbox.cpp index 1d769fb4..7e924f5a 100644 --- a/chalk/ui/kis_layerbox.cpp +++ b/chalk/ui/kis_layerbox.cpp @@ -123,7 +123,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char m_newLayerMenu->insertItem( SmallIconSet( "document-new" ), i18n( "&New Layer..." ), PAINT_LAYER ); m_newLayerMenu->insertItem( SmallIconSet( "folder" ), i18n( "New &Group Layer..." ), GROUP_LAYER ); m_newLayerMenu->insertItem( SmallIconSet( "tool_filter" ), i18n( "New &Adjustment Layer..." ), ADJUSTMENT_LAYER ); - m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) ); + 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))); diff --git a/chalk/ui/kis_layerlist.cpp b/chalk/ui/kis_layerlist.cpp index 5839634d..38032f0d 100644 --- a/chalk/ui/kis_layerlist.cpp +++ b/chalk/ui/kis_layerlist.cpp @@ -38,7 +38,7 @@ KisLayerList::KisLayerList( TQWidget *parent, const char *name ) : super( parent, name ) { - m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) ); + m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", this ); } static const int ADJUSTMENT_LAYER = 5384; //hack? diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp index 3a810538..08cbcd05 100644 --- a/chalk/ui/kis_view.cpp +++ b/chalk/ui/kis_view.cpp @@ -302,7 +302,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c dcopObject(); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(autoScroll(const TQPoint &)), TQT_SLOT(slotAutoScroll(const TQPoint &))); + connect(this, TQT_SIGNAL(autoScroll(const TQPoint &)), TQT_SLOT(slotAutoScroll(const TQPoint &))); setMouseTracking(true); @@ -322,7 +322,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c KService::Ptr service = *iter; int errCode = 0; KParts::Plugin* plugin = - KParts::ComponentFactory::createInstanceFromService<KParts::Plugin> ( service, TQT_TQOBJECT(this), 0, TQStringList(), &errCode); + KParts::ComponentFactory::createInstanceFromService<KParts::Plugin> ( service, this, 0, TQStringList(), &errCode); if ( plugin ) { kdDebug(41006) << "found plugin " << service->property("Name").toString() << "\n"; insertChildClient(plugin); @@ -340,7 +340,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c { slotLoadingFinished(); } else { - connect(doc, TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished())); + connect(doc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); } setFocus(); @@ -427,19 +427,19 @@ void KisView::createLayerBox() m_layerBox->setCaption(i18n("Layers")); connect(m_layerBox, TQT_SIGNAL(sigRequestLayer(KisGroupLayerSP, KisLayerSP)), - TQT_TQOBJECT(this), TQT_SLOT(addLayer(KisGroupLayerSP, KisLayerSP))); + this, TQT_SLOT(addLayer(KisGroupLayerSP, KisLayerSP))); connect(m_layerBox, TQT_SIGNAL(sigRequestGroupLayer(KisGroupLayerSP, KisLayerSP)), - TQT_TQOBJECT(this), TQT_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP))); + this, TQT_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP))); connect(m_layerBox, TQT_SIGNAL(sigRequestAdjustmentLayer(KisGroupLayerSP, KisLayerSP)), - TQT_TQOBJECT(this), TQT_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP))); + this, TQT_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP))); connect(m_layerBox, TQT_SIGNAL(sigRequestPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)), - TQT_TQOBJECT(this), TQT_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&))); + this, TQT_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&))); connect(m_layerBox, TQT_SIGNAL(sigRequestLayerProperties(KisLayerSP)), - TQT_TQOBJECT(this), TQT_SLOT(showLayerProperties(KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigOpacityChanged(int, bool)), TQT_TQOBJECT(this), TQT_SLOT(layerOpacity(int, bool))); + 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)), - TQT_TQOBJECT(this), TQT_SLOT(layerOpacityFinishedChanging(int, int))); - connect(m_layerBox, TQT_SIGNAL(sigItemComposite(const KisCompositeOp&)), TQT_TQOBJECT(this), TQT_SLOT(layerCompositeOp(const KisCompositeOp&))); + this, TQT_SLOT(layerOpacityFinishedChanging(int, int))); + connect(m_layerBox, TQT_SIGNAL(sigItemComposite(const KisCompositeOp&)), this, TQT_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)), TQT_TQOBJECT(this), TQT_SLOT(scrollV(int))); - TQObject::connect(m_hScroll, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(scrollH(int))); + 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))); } 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 )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); - m_imgProperties = new TDEAction(i18n("Image Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties"); + m_imgProperties = new TDEAction(i18n("Image Properties"), 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); + m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, this, TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); // view actions - m_zoomIn = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); - m_zoomOut = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); - m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", TQT_TQOBJECT(this), TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels"); - m_actualSize = KStdAction::actualSize(TQT_TQOBJECT(this), TQT_SLOT(slotActualSize()), actionCollection(), "actual_size"); + 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_actualSize->setEnabled(false); - m_fitToCanvas = KStdAction::fitToPage(TQT_TQOBJECT(this), TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas"); + m_fitToCanvas = KStdAction::fitToPage(this, TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas"); // layer actions - m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", TQT_TQOBJECT(this), TQT_SLOT(layerAdd()), actionCollection(), "insert_layer"); + m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", this, TQT_SLOT(layerAdd()), actionCollection(), "insert_layer"); m_actionPartLayer = new KoPartSelectAction( i18n( "&Object Layer" ), "frame_query", - TQT_TQOBJECT(this), TQT_SLOT( addPartLayer() ), + this, TQT_SLOT( addPartLayer() ), actionCollection(), "insert_part_layer" ); m_actionAdjustmentLayer = new TDEAction( i18n( "&Adjustment Layer" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( addAdjustmentLayer() ), + this, TQT_SLOT( addAdjustmentLayer() ), actionCollection(), "insert_adjustment_layer" ); - m_layerRm = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerRemove()), actionCollection(), "remove_layer"); - m_layerDup = new TDEAction(i18n("Duplicate"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); - m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_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_layerHide->setCheckedState(KGuiItem(i18n("&Show"))); m_layerHide->setChecked(false); - m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", TQT_TQOBJECT(this), TQT_SLOT(layerRaise()), actionCollection(), "raiselayer"); - m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", TQT_TQOBJECT(this), TQT_SLOT(layerLower()), actionCollection(), "lowerlayer"); - m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", TQT_TQOBJECT(this), TQT_SLOT(layerFront()), actionCollection(), "toplayer"); - m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", TQT_TQOBJECT(this), TQT_SLOT(layerBack()), actionCollection(), "bottomlayer"); - m_layerProperties = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerProperties()), actionCollection(), "layer_properties"); - (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); - m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); - (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); - (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); - - m_createMask = new TDEAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this), + 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_createMask = new TDEAction(i18n("Create Mask"), 0, this, TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask"); - m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), + m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, this, TQT_SLOT(slotMaskFromSelection()), actionCollection(), "mask_fromsel"); - m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), + m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, this, TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); - m_applyMask = new TDEAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()), + m_applyMask = new TDEAction(i18n("Apply Mask"), 0, this, TQT_SLOT(slotApplyMask()), actionCollection(), "apply_mask"); - m_removeMask = new TDEAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this), + m_removeMask = new TDEAction(i18n("Remove Mask"), 0, this, TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); - m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this), + m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, this, TQT_SLOT(slotShowMask()), actionCollection(), "show_mask"); - m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this), + m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, this, TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask"); // image actions - m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image"); - m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", TQT_TQOBJECT(this), TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer"); + 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"); // setting actions - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection(), "preferences"); + KStdAction::preferences(this, TQT_SLOT(preferences()), actionCollection(), "preferences"); - m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" ); + m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); + //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, this, TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); // Add new palette - new TDEAction(i18n("Add New Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPalette()), + new TDEAction(i18n("Add New Palette..."), 0, this, TQT_SLOT(slotAddPalette()), actionCollection(), "add_palette"); - new TDEAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()), + new TDEAction(i18n("Edit Palette..."), 0, this, TQT_SLOT(slotEditPalette()), actionCollection(), "edit_palette"); // XXX: This triggers a repaint of the image, but way too early @@ -2803,11 +2803,11 @@ void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDoc m_partHandler, TQT_SLOT(gotKeyPressEvent(TQKeyEvent*))); connect(m_partHandler, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); connect(m_partHandler, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); connect(m_partHandler, TQT_SIGNAL(handlerDone()), - TQT_TQOBJECT(this), TQT_SLOT(reconnectAfterPartInsert())); + this, TQT_SLOT(reconnectAfterPartInsert())); } void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, @@ -2836,13 +2836,13 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, void KisView::reconnectAfterPartInsert() { connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); + this, TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); + this, TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); delete m_partHandler; m_partHandler = 0; @@ -3162,26 +3162,26 @@ void KisView::setupCanvas() { m_canvas = new KisCanvas(this, "kis_canvas"); m_canvas->setFocusPolicy( TQWidget::StrongFocus ); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotPaintEvent(TQPaintEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotEnterEvent(TQEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotEnterEvent(TQEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotLeaveEvent(TQEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotLeaveEvent(TQEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotMouseWheelEvent(TQWheelEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyReleaseEvent(TQKeyEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDragEnterEvent(TQDragEnterEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDropEvent(TQDropEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDropEvent(TQDropEvent*))); + 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*))); } 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)), TQT_TQOBJECT(this), TQT_SLOT(updateCanvas())); - connect(m_image, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), TQT_TQOBJECT(this), TQT_SLOT(updateStatusBarProfileLabel())); + 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())); @@ -3239,7 +3239,7 @@ void KisView::handlePartLayerAdded(KisLayerSP layer) if (!l) return; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(childActivated(KoDocumentChild*)), + connect(this, TQT_SIGNAL(childActivated(KoDocumentChild*)), layer, TQT_SLOT(childActivated(KoDocumentChild*))); } @@ -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 &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_hsvwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setBgColor(const TQColor &))); + 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 &))); 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 &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_rgbwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setBgColor(const TQColor &))); + 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 &))); 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 &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_graywidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setBgColor(const TQColor &))); + 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 &))); m_paletteManager->addWidget( m_graywidget, "graywidget", chalk::COLORBOX); //make sure the color chooser get right default values @@ -3840,7 +3840,7 @@ void KisView::createDockers() m_palettewidget = new KisPaletteWidget(this); m_palettewidget->setCaption(i18n("Palettes")); connect(m_palettewidget, TQT_SIGNAL(colorSelected(const TQColor &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &))); + this, TQT_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 &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGColor(const KisColor &))); + connect(m_palettewidget, TQT_SIGNAL(colorSelected(const KisColor &)), this, TQT_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(TQT_TQOBJECT(this), TQT_SIGNAL(viewTransformationsChanged()), child, TQT_SLOT(reposition())); + connect(this, TQT_SIGNAL(viewTransformationsChanged()), child, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished())); + disconnect(document(), TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); m_imageLoaded = true; startInitialZoomTimerIfReady(); diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index b096725e..683caeba 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -71,8 +71,8 @@ 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, TQT_TQOBJECT(this), TQT_SLOT(zoomPlus()), TQT_TQOBJECT(this), "zoomIn" ); - m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomMinus()), TQT_TQOBJECT(this), "zoomOut" ); + 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" ); l->addWidget(m_page); diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index fe1a7c80..3b95ef5d 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -76,7 +76,7 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent ) // - Quotes // - CR,LF,Vetical-tab,Formfeed,ASCII bel TQRegExp rx( "^[^\"'\r\n\v\f\a]{0,1}$" ); - m_delimiterValidator = new TQRegExpValidator( rx, TQT_TQOBJECT(m_dialog->m_delimiterBox) ); + 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) ), diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp index 64fc0e53..c5c02d66 100644 --- a/karbon/karbon_view.cpp +++ b/karbon/karbon_view.cpp @@ -159,7 +159,7 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) reorganizeGUI(); - connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), TQT_TQOBJECT(this), TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); // widgets: m_horizRuler = new VRuler( TQt::Horizontal, this ); @@ -171,7 +171,7 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_vertRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); m_canvas = new VCanvas( this, this, p ); - connect( m_canvas, TQT_SIGNAL( contentsMoving( int, int ) ), TQT_TQOBJECT(this), TQT_SLOT( canvasContentsMoving( int, int ) ) ); + connect( m_canvas, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( canvasContentsMoving( int, int ) ) ); m_canvas->show(); @@ -262,7 +262,7 @@ 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 * ) ), TQT_TQOBJECT(this), TQT_SLOT( slotActiveToolChanged( VTool * ) ) ); + //connect( m_toolbox, TQT_SIGNAL( activeToolChanged( VTool * ) ), this, TQT_SLOT( slotActiveToolChanged( VTool * ) ) ); if( shell() ) { @@ -272,17 +272,17 @@ KarbonView::createContainer( TQWidget *parent, int index, const TQDomElement &el 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, TQT_SIGNAL( strokeChanged( const VStroke & ) ), TQT_TQOBJECT(this), TQT_SLOT( slotStrokeChanged( const VStroke & ) ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( fillChanged( const VFill & ) ), TQT_TQOBJECT(this), TQT_SLOT( slotFillChanged( const VFill & ) ) ); + 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, TQT_SIGNAL( strokeSelected() ), m_ColorManager, TQT_SLOT( setStrokeDocker() ) ); connect( m_strokeFillPreview, TQT_SIGNAL( fillSelected( ) ), m_ColorManager, TQT_SLOT( setFillDocker() ) ); - connect( m_part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), TQT_TQOBJECT(this), TQT_SLOT( commandExecuted( VCommand* ) ) ); + connect( m_part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), this, TQT_SLOT( commandExecuted( VCommand* ) ) ); - connect( m_ColorManager, TQT_SIGNAL(modeChanged( KDualColorButton::DualColor)), TQT_TQOBJECT(this), TQT_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); - connect( m_ColorManager, TQT_SIGNAL(bgColorChanged( const TQColor & )), TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); - connect( m_ColorManager, TQT_SIGNAL(fgColorChanged( const TQColor & )), TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); + 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 & )) ); 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* ) ), TQT_TQOBJECT(this), TQT_SLOT( commandExecuted( VCommand* ) ) ); - disconnect( m_ColorManager, TQT_SIGNAL(modeChanged( KDualColorButton::DualColor)), TQT_TQOBJECT(this), TQT_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); - disconnect( m_ColorManager, TQT_SIGNAL(bgColorChanged( const TQColor & )), TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); - disconnect( m_ColorManager, TQT_SIGNAL(fgColorChanged( const TQColor & )), TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); + 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 & )) ); delete m_toolbox; m_toolbox = 0L; m_toolController->youAintGotNoToolBox(); @@ -940,11 +940,11 @@ KarbonView::initActions() { // view -----> m_viewAction = new TDESelectAction( - i18n( "View &Mode" ), 0, TQT_TQOBJECT(this), + i18n( "View &Mode" ), 0, this, TQT_SLOT( viewModeChanged() ), actionCollection(), "view_mode" ); m_zoomAction = new TDESelectAction( - i18n( "&Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), + i18n( "&Zoom" ), "viewmag", 0, this, TQT_SLOT( zoomChanged() ), actionCollection(), "view_zoom" ); TQStringList mstl; @@ -975,8 +975,8 @@ KarbonView::initActions() m_zoomAction->setEditable( true ); m_zoomAction->setCurrentItem( 7 ); - KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT( viewZoomIn() ), actionCollection(), "view_zoom_in" ); - KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( viewZoomOut() ), actionCollection(), "view_zoom_out" ); + KStdAction::zoomIn( this, TQT_SLOT( viewZoomIn() ), actionCollection(), "view_zoom_in" ); + KStdAction::zoomOut( this, TQT_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))); @@ -989,133 +989,133 @@ KarbonView::initActions() return; // edit -----> - KStdAction::cut( TQT_TQOBJECT(this), + KStdAction::cut( this, TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - KStdAction::copy( TQT_TQOBJECT(this), + KStdAction::copy( this, TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - KStdAction::paste( TQT_TQOBJECT(this), + KStdAction::paste( this, TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_select_all" ); - KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( editDeselectAll() ), actionCollection(), "edit_deselect_all" ); + KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_select_all" ); + KStdAction::deselect( this, TQT_SLOT( editDeselectAll() ), actionCollection(), "edit_deselect_all" ); new TDEAction( - i18n( "&Import Graphic..." ), 0, 0, TQT_TQOBJECT(this), + i18n( "&Import Graphic..." ), 0, 0, this, TQT_SLOT( fileImportGraphic() ), actionCollection(), "file_import" ); m_deleteSelectionAction = new TDEAction( - i18n( "D&elete" ), "edit-delete", TQKeySequence( "Del" ), TQT_TQOBJECT(this), + i18n( "D&elete" ), "edit-delete", TQKeySequence( "Del" ), this, TQT_SLOT( editDeleteSelection() ), actionCollection(), "edit_delete" ); new TDEAction( - i18n( "&History" ), 0, 0, TQT_TQOBJECT(this), + i18n( "&History" ), 0, 0, this, TQT_SLOT( editPurgeHistory() ), actionCollection(), "edit_purge_history" ); // edit <----- // object -----> new TDEAction( - i18n( "&Duplicate" ), "duplicate", TQKeySequence( "Ctrl+D" ), TQT_TQOBJECT(this), + i18n( "&Duplicate" ), "duplicate", TQKeySequence( "Ctrl+D" ), this, TQT_SLOT( selectionDuplicate() ), actionCollection(), "object_duplicate" ); new TDEAction( - i18n( "Bring to &Front" ), "bring_forward", TQKeySequence( "Ctrl+Shift+]" ), TQT_TQOBJECT(this), + i18n( "Bring to &Front" ), "bring_forward", TQKeySequence( "Ctrl+Shift+]" ), this, TQT_SLOT( selectionBringToFront() ), actionCollection(), "object_move_totop" ); new TDEAction( - i18n( "&Raise" ), "raise", TQKeySequence( "Ctrl+]" ), TQT_TQOBJECT(this), + i18n( "&Raise" ), "raise", TQKeySequence( "Ctrl+]" ), this, TQT_SLOT( selectionMoveUp() ), actionCollection(), "object_move_up" ); new TDEAction( - i18n( "&Lower" ), "lower", TQKeySequence( "Ctrl+[" ), TQT_TQOBJECT(this), + i18n( "&Lower" ), "lower", TQKeySequence( "Ctrl+[" ), this, TQT_SLOT( selectionMoveDown() ), actionCollection(), "object_move_down" ); new TDEAction( - i18n( "Send to &Back" ), "send_backward", TQKeySequence( "Ctrl+Shift+[" ), TQT_TQOBJECT(this), + i18n( "Send to &Back" ), "send_backward", TQKeySequence( "Ctrl+Shift+[" ), this, TQT_SLOT( selectionSendToBack() ), actionCollection(), "object_move_tobottom" ); new TDEAction( - i18n( "Align Left" ), "aoleft", 0, TQT_TQOBJECT(this), + i18n( "Align Left" ), "aoleft", 0, this, TQT_SLOT( selectionAlignHorizontalLeft() ), actionCollection(), "object_align_horizontal_left" ); new TDEAction( - i18n( "Align Center (Horizontal)" ), "aocenterh", 0, TQT_TQOBJECT(this), + i18n( "Align Center (Horizontal)" ), "aocenterh", 0, this, TQT_SLOT( selectionAlignHorizontalCenter() ), actionCollection(), "object_align_horizontal_center" ); new TDEAction( - i18n( "Align Right" ), "aoright", 0, TQT_TQOBJECT(this), + i18n( "Align Right" ), "aoright", 0, this, TQT_SLOT( selectionAlignHorizontalRight() ), actionCollection(), "object_align_horizontal_right" ); new TDEAction( - i18n( "Align Top" ), "aotop", 0, TQT_TQOBJECT(this), + i18n( "Align Top" ), "aotop", 0, this, TQT_SLOT( selectionAlignVerticalTop() ), actionCollection(), "object_align_vertical_top" ); new TDEAction( - i18n( "Align Middle (Vertical)" ), "aocenterv", 0, TQT_TQOBJECT(this), + i18n( "Align Middle (Vertical)" ), "aocenterv", 0, this, TQT_SLOT( selectionAlignVerticalCenter() ), actionCollection(), "object_align_vertical_center" ); new TDEAction( - i18n( "Align Bottom" ), "aobottom", 0, TQT_TQOBJECT(this), + i18n( "Align Bottom" ), "aobottom", 0, this, TQT_SLOT( selectionAlignVerticalBottom() ), actionCollection(), "object_align_vertical_bottom" ); new TDEAction( - i18n( "Distribute Center (Horizontal)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Center (Horizontal)" ), "", 0, this, TQT_SLOT( selectionDistributeHorizontalCenter() ), actionCollection(), "object_distribute_horizontal_center" ); new TDEAction( - i18n( "Distribute Gaps (Horizontal)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Gaps (Horizontal)" ), "", 0, this, TQT_SLOT( selectionDistributeHorizontalGap() ), actionCollection(), "object_distribute_horizontal_gap" ); new TDEAction( - i18n( "Distribute Left Borders" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Left Borders" ), "", 0, this, TQT_SLOT( selectionDistributeHorizontalLeft() ), actionCollection(), "object_distribute_horizontal_left" ); new TDEAction( - i18n( "Distribute Right Borders" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Right Borders" ), "", 0, this, TQT_SLOT( selectionDistributeHorizontalRight() ), actionCollection(), "object_distribute_horizontal_right" ); new TDEAction( - i18n( "Distribute Center (Vertical)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Center (Vertical)" ), "", 0, this, TQT_SLOT( selectionDistributeVerticalCenter() ), actionCollection(), "object_distribute_vertical_center" ); new TDEAction( - i18n( "Distribute Gaps (Vertical)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Gaps (Vertical)" ), "", 0, this, TQT_SLOT( selectionDistributeVerticalGap() ), actionCollection(), "object_distribute_vertical_gap" ); new TDEAction( - i18n( "Distribute Bottom Borders" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Bottom Borders" ), "", 0, this, TQT_SLOT( selectionDistributeVerticalBottom() ), actionCollection(), "object_distribute_vertical_bottom" ); new TDEAction( - i18n( "Distribute Top Borders" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Top Borders" ), "", 0, this, TQT_SLOT( selectionDistributeVerticalTop() ), actionCollection(), "object_distribute_vertical_top" ); - m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_show_ruler" ); + m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT( showGrid() ), actionCollection(), "view_show_grid" ); + m_showGridAction = new TDEToggleAction( i18n( "Show Grid" ), "view_grid", this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" ); + m_snapGridAction = new TDEToggleAction( i18n( "Snap to Grid" ), 0, this, TQT_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" ), TQT_TQOBJECT(this), + i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), this, TQT_SLOT( groupSelection() ), actionCollection(), "selection_group" ); m_ungroupObjects = new TDEAction( - i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), TQT_TQOBJECT(this), + i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), this, TQT_SLOT( ungroupSelection() ), actionCollection(), "selection_ungroup" ); m_closePath = new TDEAction( - i18n( "&Close Path" ), TQKeySequence( "Ctrl+U" ), TQT_TQOBJECT(this), + i18n( "&Close Path" ), TQKeySequence( "Ctrl+U" ), this, TQT_SLOT( closePath() ), actionCollection(), "close_path" ); // object <----- // line style (dashes) - m_lineStyleAction = new KoLineStyleAction( i18n( "Line Style" ), "linestyle", TQT_TQOBJECT(this), TQT_SLOT( setLineStyle( int ) ), actionCollection(), "setLineStyle" ); + m_lineStyleAction = new KoLineStyleAction( i18n( "Line Style" ), "linestyle", this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( setLineWidth() ), actionCollection(), "setLineWidth" ); + new KWidgetAction( m_setLineWidth, i18n( "Set Line Width" ), 0, this, TQT_SLOT( setLineWidth() ), actionCollection(), "setLineWidth" ); m_setLineWidth->insertItem( 0.25 ); m_setLineWidth->insertItem( 0.5 ); m_setLineWidth->insertItem( 0.75 ); @@ -1126,13 +1126,13 @@ KarbonView::initActions() m_setLineWidth->insertItem( 5.0 ); m_setLineWidth->insertItem( 10.0 ); m_setLineWidth->insertItem( 20.0 ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), TQT_TQOBJECT(this), TQT_SLOT( setLineWidth() ) ); + connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setLineWidth() ) ); m_configureAction = new TDEAction( - i18n( "Configure Karbon..." ), "configure", 0, TQT_TQOBJECT(this), + i18n( "Configure Karbon..." ), "configure", 0, this, TQT_SLOT( configure() ), actionCollection(), "configure" ); - new TDEAction( i18n( "Page &Layout..." ), 0, TQT_TQOBJECT(this), + new TDEAction( i18n( "Page &Layout..." ), 0, this, TQT_SLOT( pageLayout() ), actionCollection(), "page_layout" ); m_contextHelpAction = new KoContextHelpAction( actionCollection(), this ); } diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cpp b/karbon/plugins/flattenpath/flattenpathplugin.cpp index f1453f96..4dbb2b5e 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.cpp +++ b/karbon/plugins/flattenpath/flattenpathplugin.cpp @@ -34,7 +34,7 @@ typedef KGenericFactory<FlattenPathPlugin, KarbonView> FlattenPathPluginFactory; K_EXPORT_COMPONENT_FACTORY( karbon_flattenpathplugin, FlattenPathPluginFactory( "karbonflattenpathplugin" ) ) FlattenPathPlugin::FlattenPathPlugin( KarbonView *parent, const char* name, const TQStringList & ) -: Plugin( TQT_TQOBJECT(parent), name ) +: Plugin( parent, name ) { new TDEAction( i18n( "&Flatten Path..." ), "14_flatten", 0, this, diff --git a/karbon/plugins/insertknots/insertknotsplugin.cpp b/karbon/plugins/insertknots/insertknotsplugin.cpp index 0cde892c..a40b65da 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.cpp +++ b/karbon/plugins/insertknots/insertknotsplugin.cpp @@ -33,7 +33,7 @@ typedef KGenericFactory<InsertKnotsPlugin, KarbonView> InsertKnotsPluginFactory; K_EXPORT_COMPONENT_FACTORY( karbon_insertknotsplugin, InsertKnotsPluginFactory( "karboninsertknotsplugin" ) ) -InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) +InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( parent, name ) { new TDEAction( i18n( "&Insert Knots..." ), "14_insertknots", 0, this, diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cpp b/karbon/plugins/roundcorners/roundcornersplugin.cpp index 71545b9c..f703728f 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.cpp +++ b/karbon/plugins/roundcorners/roundcornersplugin.cpp @@ -32,7 +32,7 @@ typedef KGenericFactory<VRoundCornersPlugin, KarbonView> VRoundCornersPluginFactory; K_EXPORT_COMPONENT_FACTORY( karbon_roundcornersplugin, VRoundCornersPluginFactory( "karbonroundcornersplugin" ) ) -VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) +VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( parent, name ) { new TDEAction( i18n( "&Round Corners..." ), "14_roundcorners", 0, this, diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp index dedd26f3..04d6ae68 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp @@ -38,7 +38,7 @@ typedef KGenericFactory<ShadowEffectPlugin, KarbonView> ShadowEffectPluginFactor K_EXPORT_COMPONENT_FACTORY( karbon_shadoweffectplugin, ShadowEffectPluginFactory( "karbonshadoweffectplugin" ) ) ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *parent, const char* name, const TQStringList & ) -: Plugin( TQT_TQOBJECT(parent), name ) +: Plugin( parent, name ) { new TDEAction( i18n( "&Shadow Effect..." ), "shadowRB", 0, this, diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp index 46ebf530..d4565752 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp @@ -38,7 +38,7 @@ typedef KGenericFactory<WhirlPinchPlugin, KarbonView> WhirlPinchPluginFactory; K_EXPORT_COMPONENT_FACTORY( karbon_whirlpinchplugin, WhirlPinchPluginFactory( "karbonwhirlpinchplugin" ) ) -WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name ) +WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( parent, name ) { new TDEAction( i18n( "&Whirl/Pinch..." ), "14_whirl", 0, this, diff --git a/kchart/kchart_view.cpp b/kchart/kchart_view.cpp index 282c4819..b7b7fba8 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, - TQT_TQOBJECT(this), TQT_SLOT( importData() ), + this, TQT_SLOT( importData() ), actionCollection(), "import_data" ); #if 0 TDEAction * actionExtraCreateTemplate = #endif new TDEAction( i18n( "&Create Template From Document..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), + this, TQT_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); m_wizard = new TDEAction( i18n("Customize with &Wizard..."), "wizard", 0, - TQT_TQOBJECT(this), TQT_SLOT( wizard() ), + this, TQT_SLOT( wizard() ), actionCollection(), "wizard"); m_edit = new TDEAction( i18n("Edit &Data..."), "edit", 0, - TQT_TQOBJECT(this), TQT_SLOT( editData() ), + this, TQT_SLOT( editData() ), actionCollection(), "editdata"); m_config = new TDEAction( i18n( "&Chart..." ), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfig() ), + this, TQT_SLOT( slotConfig() ), actionCollection(), "config" ); // One TDEToggleAction per chart type - m_chartbars = new TDEToggleAction( i18n("&Bar"), "chart_bar_3d", 0, TQT_TQOBJECT(this), + m_chartbars = new TDEToggleAction( i18n("&Bar"), "chart_bar_3d", 0, this, TQT_SLOT( barsChart() ), actionCollection(), "barschart"); m_chartbars->setExclusiveGroup( "charttypes" ); m_chartbars->setChecked( true ); - m_chartline = new TDEToggleAction( i18n("&Line"), "chart_line", 0, TQT_TQOBJECT(this), + m_chartline = new TDEToggleAction( i18n("&Line"), "chart_line", 0, this, TQT_SLOT( lineChart() ), actionCollection(), "linechart"); m_chartline->setExclusiveGroup( "charttypes" ); - m_chartareas = new TDEToggleAction( i18n("&Area"), "chart_area", 0, TQT_TQOBJECT(this), + m_chartareas = new TDEToggleAction( i18n("&Area"), "chart_area", 0, this, TQT_SLOT( areasChart() ), actionCollection(), "areaschart"); m_chartareas->setExclusiveGroup( "charttypes" ); - m_charthilo = new TDEToggleAction( i18n("&HiLo"), "chart_hilo", 0, TQT_TQOBJECT(this), + m_charthilo = new TDEToggleAction( i18n("&HiLo"), "chart_hilo", 0, this, TQT_SLOT( hiLoChart() ), actionCollection(), "hilochart"); m_charthilo->setExclusiveGroup( "charttypes" ); - m_chartbw = new TDEToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, TQT_TQOBJECT(this), + m_chartbw = new TDEToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, this, TQT_SLOT( bwChart() ), actionCollection(), "bwchart"); m_chartbw->setExclusiveGroup( "charttypes" ); - m_chartpie = new TDEToggleAction( i18n("&Pie"), "chart_pie", 0, TQT_TQOBJECT(this), + m_chartpie = new TDEToggleAction( i18n("&Pie"), "chart_pie", 0, this, TQT_SLOT( pieChart() ), actionCollection(), "piechart"); m_chartpie->setExclusiveGroup( "charttypes" ); - m_chartring = new TDEToggleAction( i18n("&Ring"), "chart_ring", 0, TQT_TQOBJECT(this), + m_chartring = new TDEToggleAction( i18n("&Ring"), "chart_ring", 0, this, TQT_SLOT( ringChart() ), actionCollection(), "ringchart"); m_chartring->setExclusiveGroup( "charttypes" ); - m_chartpolar = new TDEToggleAction( i18n("&Polar"), "chart_polar", 0, TQT_TQOBJECT(this), + m_chartpolar = new TDEToggleAction( i18n("&Polar"), "chart_polar", 0, this, TQT_SLOT( polarChart() ), actionCollection(), "polarchart"); m_chartpolar->setExclusiveGroup( "charttypes" ); // Configuration TDEActions m_colorConfig = new TDEAction( i18n( "&Colors..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigColor() ), + this, TQT_SLOT( slotConfigColor() ), actionCollection(), "color_config" ); m_fontConfig = new TDEAction( i18n( "&Font..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigFont() ), + this, TQT_SLOT( slotConfigFont() ), actionCollection(), "font_config" ); m_backConfig = new TDEAction( i18n( "&Background..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigBack() ), + this, TQT_SLOT( slotConfigBack() ), actionCollection(), "back_config" ); m_legendConfig = new TDEAction( i18n( "&Legend..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigLegend() ), + this, TQT_SLOT( slotConfigLegend() ), actionCollection(), "legend_config" ); m_subTypeChartConfig = new TDEAction( i18n( "Chart &Sub-type..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigSubTypeChart() ), + this, TQT_SLOT( slotConfigSubTypeChart() ), actionCollection(), "legend_subtype" ); m_dataFormatConfig = new TDEAction( i18n( "&Data Format..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigDataFormat() ), + this, TQT_SLOT( slotConfigDataFormat() ), actionCollection(), "data_format" ); m_headerFooterConfig = new TDEAction( i18n( "&Header && Footer..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigHeaderFooterChart() ), + this, TQT_SLOT( slotConfigHeaderFooterChart() ), actionCollection(), "headerfooter_subtype" ); m_pageLayoutConfig = new TDEAction( i18n( "Page Layout..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotConfigPageLayout() ), + this, TQT_SLOT( slotConfigPageLayout() ), actionCollection(), "page_layout" ); // initialize the configuration @@ -231,7 +231,7 @@ void KChartView::editData() // Activate the Apply button in the editor. connect(&ed, TQT_SIGNAL(applyClicked(kchartDataEditor *)), - TQT_TQOBJECT(this), TQT_SLOT(applyEdit(kchartDataEditor *))); + this, TQT_SLOT(applyEdit(kchartDataEditor *))); // Execute the data editor. if ( ed.exec() != TQDialog::Accepted ) { @@ -340,7 +340,7 @@ void KChartView::config(int flags) dat ); connect( d, TQT_SIGNAL( dataChanged() ), - TQT_TQOBJECT(this), TQT_SLOT( slotRepaint() ) ); + this, TQT_SLOT( slotRepaint() ) ); d->exec(); delete d; } diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 443eeb74..08ba4929 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -59,7 +59,7 @@ #include <kdebug.h> KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt) - : TQCanvas (TQT_TQOBJECT(parent)) + : TQCanvas (parent) { myGanttView = myGantt; taskLinksVisible = true; diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index 7b57d673..f8067ddd 100644 --- a/kexi/core/kexidialogbase.cpp +++ b/kexi/core/kexidialogbase.cpp @@ -43,7 +43,7 @@ KexiDialogBase::KexiDialogBase(KexiMainWindow *parent, const TQString &caption) : KMdiChildView(caption, parent, "KexiDialogBase") - , KexiActionProxy(TQT_TQOBJECT(this), parent) + , KexiActionProxy(this, parent) , m_isRegistered(false) , m_origCaption(caption) , m_schemaData(0) @@ -100,7 +100,7 @@ void KexiDialogBase::addView(KexiViewBase *view, int mode) // addActionProxyChild( view ); //set focus proxy inside this view - TQWidget *ch = TQT_TQWIDGET(view->child( 0, "TQWidget", false )); + TQWidget *ch = static_cast<TQWidget*>(view->child( 0, "TQWidget", false )); if (ch) view->setFocusProxy(ch); @@ -191,7 +191,7 @@ void KexiDialogBase::closeEvent( TQCloseEvent * e ) TQObjectList *list = m_stack->queryList( "KexiViewBase", 0, false, false); KexiViewBase *view; TQObjectListIt it( *list ); - for ( ;(view = static_cast<KexiViewBase*>(TQT_TQWIDGET(it.current())) ) != 0; ++it ) { + for ( ;(view = static_cast<KexiViewBase*>(it.current()) ) != 0; ++it ) { bool cancel = false; emit view->closing(cancel); if (cancel) { @@ -394,7 +394,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr addActionProxyChild( newView ); //new proxy child m_stack->raiseWidget( newView ); newView->propertySetSwitched(); - m_parentWindow->invalidateSharedActions( TQT_TQOBJECT(newView) ); + m_parentWindow->invalidateSharedActions( newView ); TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok? // setFocus(); return true; @@ -439,7 +439,7 @@ bool KexiDialogBase::eventFilter(TQObject *obj, TQEvent *e) }*/ if ((e->type()==TQEvent::FocusIn && m_parentWindow->activeWindow()==this) || e->type()==TQEvent::MouseButtonPress) { - if (m_stack->visibleWidget() && KexiUtils::hasParent(TQT_TQOBJECT(m_stack->visibleWidget()), obj)) { + if (m_stack->visibleWidget() && KexiUtils::hasParent(m_stack->visibleWidget(), obj)) { //pass the activation activate(); } @@ -625,7 +625,7 @@ void KexiDialogBase::activate() { KexiViewBase *v = selectedView(); //kdDebug() << "focusWidget(): " << focusWidget()->name() << endl; - if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//focusWidget())) + if (KexiUtils::hasParent( v, KMdiChildView::focusedChildWidget()))//focusWidget())) KMdiChildView::activate(); else {//ah, focused widget is not in this view, move focus: if (v) diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index e907110a..48b4f9f0 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -392,7 +392,7 @@ bool Part::remove(KexiMainWindow *win, KexiPart::Item &item) KexiDialogTempData* Part::createTempData(KexiDialogBase* dialog) { - return new KexiDialogTempData(TQT_TQOBJECT(dialog)); + return new KexiDialogTempData(dialog); } TQString Part::i18nMessage(const TQCString& englishMessage, KexiDialogBase* dlg) const diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 20eae6c4..5370ba57 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -202,12 +202,12 @@ TQWidget* KexiSharedActionHost::focusWindow() fw = dynamic_cast<KMdiMainFrm*>(d->mainWin)->activeWindow(); } else { - TQWidget *aw = TQT_TQWIDGET(tqApp->activeWindow()); + TQWidget *aw = tqApp->activeWindow(); if (!aw) aw = d->mainWin; fw = aw->focusWidget(); } - while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw))) + while (fw && !acceptsSharedActions(fw)) fw = fw->parentWidget(); return fw; } diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp index c2a3f2a5..b7f09355 100644 --- a/kexi/core/kexiviewbase.cpp +++ b/kexi/core/kexiviewbase.cpp @@ -32,7 +32,7 @@ KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *parent, const char *name) : TQWidget(parent, name) - , KexiActionProxy(TQT_TQOBJECT(this), mainWin) + , KexiActionProxy(this, mainWin) , m_mainWin(mainWin) , m_viewWidget(0) , m_parentView(0) @@ -214,10 +214,10 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e ) { if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) { // //hp==true if currently focused widget is a child of this table view -// const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget()); +// const bool hp = Kexi::hasParent( o, focusWidget()); // kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl; - if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) { - if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) { + if (KexiUtils::hasParent( this, o)) { + if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( this, focusWidget())) { //focus out: when currently focused widget is not a parent of this view emit focus(false); } else if (e->type()==TQEvent::FocusIn) { @@ -231,9 +231,9 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e ) if (v) { while (v->m_parentView) v = v->m_parentView; - if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->focusWidget()) )) - v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->focusWidget()); -// v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //focusWidget(); + if (KexiUtils::hasParent( this, v->focusWidget() )) + v->m_lastFocusedChildBeforeFocusOut = v->focusWidget(); +// v->m_lastFocusedChildBeforeFocusOut = o; //focusWidget(); } } @@ -286,7 +286,7 @@ void KexiViewBase::setFocus() else setFocusInternal(); } - m_mainWin->invalidateSharedActions(TQT_TQOBJECT(this)); + m_mainWin->invalidateSharedActions(this); } TDEAction* KexiViewBase::sharedAction( const char *action_name ) diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index ae75caa2..d1a4b1b6 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -50,7 +50,7 @@ EventEater::EventEater(TQWidget *widget, TQObject *container) m_widget = widget; m_container = container; - installRecursiveEventFilter(TQT_TQOBJECT(m_widget), this); + installRecursiveEventFilter(m_widget, this); } bool @@ -83,7 +83,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev) EventEater::~EventEater() { if(m_widget) - removeRecursiveEventFilter(TQT_TQOBJECT(m_widget), TQT_TQOBJECT(this)); + removeRecursiveEventFilter(m_widget, this); } // Container itself @@ -161,7 +161,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) << "of type " << s->className() << endl; kdDebug() << "TQEvent::MouseButtonPress this = " << name() << endl; - m_moving = TQT_TQWIDGET(s); + m_moving = static_cast<TQWidget*>(s); TQMouseEvent *mev = static_cast<TQMouseEvent*>(e); m_grab = TQPoint(mev->x(), mev->y()); @@ -217,7 +217,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) tmpy *= gridX; } - m_insertBegin = (TQT_TQWIDGET(s))->mapTo(m_container, TQPoint(tmpx, tmpy)); + m_insertBegin = (static_cast<TQWidget*>(s))->mapTo(m_container, TQPoint(tmpx, tmpy)); if(m_form->formWidget()) m_form->formWidget()->initBuffer(); @@ -268,7 +268,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) return true; if(m_form->formWidget() && (tree->widget() != s)) - m_form->formWidget()->highlightWidgets(tree->widget(), TQT_TQWIDGET(s)); + m_form->formWidget()->highlightWidgets(tree->widget(), static_cast<TQWidget*>(s)); } else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != TQt::ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect { @@ -379,7 +379,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) } else if(kev->key() == FormManager::self()->contextMenuKey()) { - FormManager::self()->createContextMenu(TQT_TQWIDGET(s), this, false); + FormManager::self()->createContextMenu(static_cast<TQWidget*>(s), this, false); return true; } else if (kev->key() == Key_Delete) @@ -448,7 +448,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) case TQEvent::MouseButtonDblClick: // editing { kdDebug() << "Container: Mouse dbl click for widget " << s->name() << endl; - TQWidget *w = TQT_TQWIDGET(s); + TQWidget *w = static_cast<TQWidget*>(s); if(!w) return false; @@ -494,7 +494,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev) } if(mev->button() == TQt::RightButton) // Right-click -> context menu { - FormManager::self()->createContextMenu(TQT_TQWIDGET(s), this); + FormManager::self()->createContextMenu(static_cast<TQWidget*>(s), this); } else if(mev->state() == (TQt::LeftButton|TQt::ControlButton))// && (m_copyRect.isValid())) { @@ -519,7 +519,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev) if(m_form->selectedWidgets()->count() > 1) FormManager::self()->setInsertPoint( mev->pos() ); else - FormManager::self()->setInsertPoint( TQT_TQWIDGET(s)->mapTo(m_container, mev->pos() - m_grab) ); + FormManager::self()->setInsertPoint( static_cast<TQWidget*>(s)->mapTo(m_container, mev->pos() - m_grab) ); FormManager::self()->pasteWidget(); m_form->setInteractiveMode(true); @@ -1020,7 +1020,7 @@ void Container::drawInsertRect(TQMouseEvent *mev, TQObject *s) { int tmpx, tmpy; - TQPoint pos = TQT_TQWIDGET(s)->mapTo(m_container, mev->pos()); + TQPoint pos = static_cast<TQWidget*>(s)->mapTo(m_container, mev->pos()); int gridX = m_form->gridSize(); int gridY = m_form->gridSize(); if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) ) @@ -1175,7 +1175,7 @@ void DesignTimeDynamicChildWidgetHandler::childWidgetAdded(TQWidget* w) { if (m_item) { - installRecursiveEventFilter(TQT_TQOBJECT(w), m_item->eventEater()); + installRecursiveEventFilter(w, m_item->eventEater()); } } diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 5dfc176a..55bf34e1 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -106,7 +106,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) // The "item properties" field m_editor = new KoProperty::Editor(m_column, "editcolumn_propeditor"); - m_propSet = new KoProperty::Set(TQT_TQOBJECT(this), "columns"); + m_propSet = new KoProperty::Set(this, "columns"); m_propSet->addProperty(new KoProperty::Property("caption", "Caption", i18n("Caption"),i18n("Caption"))); m_propSet->addProperty(new KoProperty::Property("width", 100, i18n("Width"), i18n("Width"))); m_propSet->addProperty(new KoProperty::Property("clickable", TQVariant(true), i18n("Clickable"), i18n("Clickable") )); diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 164dea27..f2fde913 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -541,7 +541,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, else if(c == "TQWidget" || c=="ContainerWidget") { TQWidget *w = new ContainerWidget(p, n); - new KFormDesigner::Container(container, w, TQT_TQOBJECT(p)); + new KFormDesigner::Container(container, w, p); return w; } else if(c == "TQGroupBox" || c == "GroupBox") @@ -752,7 +752,7 @@ ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQW if((name == "id") && (w->parentWidget()->isA("TQWidgetStack"))) { TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); - int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); + int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), w, name).toInt(); stack->addWidget(w, id); stack->raiseWidget(w); item->addModifiedProperty("id", id); diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 10107333..89326c20 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -747,7 +747,7 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & if((tag == "item") && (classname == "KComboBox")) { KComboBox *combo = (KComboBox*)w; - TQVariant val = KFormDesigner::FormIO::readPropertyValue(node.firstChild().firstChild(), TQT_TQOBJECT(w), name); + TQVariant val = KFormDesigner::FormIO::readPropertyValue(node.firstChild().firstChild(), w, name); if(val.canCast(TQVariant::Pixmap)) combo->insertItem(val.toPixmap()); else @@ -758,7 +758,7 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & if((tag == "item") && (classname == "TDEListBox")) { TDEListBox *listbox = (TDEListBox*)w; - TQVariant val = KFormDesigner::FormIO::readPropertyValue(node.firstChild().firstChild(), TQT_TQOBJECT(w), name); + TQVariant val = KFormDesigner::FormIO::readPropertyValue(node.firstChild().firstChild(), w, name); if(val.canCast(TQVariant::Pixmap)) listbox->insertItem(val.toPixmap()); else @@ -773,7 +773,7 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { TQString prop = n.toElement().attribute("name"); - TQVariant val = KFormDesigner::FormIO::readPropertyValue(n.firstChild(), TQT_TQOBJECT(w), name); + TQVariant val = KFormDesigner::FormIO::readPropertyValue(n.firstChild(), w, name); if(prop == "text") id = listview->addColumn(val.toString()); else if(prop == "width") @@ -833,7 +833,7 @@ StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, TDELi // and column texts else if((tag == "property") && (prop == "text")) { - TQVariant val = KFormDesigner::FormIO::readPropertyValue(n.firstChild(), TQT_TQOBJECT(listview), "item"); + TQVariant val = KFormDesigner::FormIO::readPropertyValue(n.firstChild(), listview, "item"); item->setText(i, val.toString()); i++; } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 58fdf6c0..349210f1 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -536,15 +536,15 @@ Form::autoAssignTabStops() ++it; TQWidget *nextw = it.current(); TQObject *page_w = 0; - KFormDesigner::TabWidget *tab_w = KFormDesigner::findParent<KFormDesigner::TabWidget>(TQT_TQOBJECT(w), "KFormDesigner::TabWidget", page_w); + KFormDesigner::TabWidget *tab_w = KFormDesigner::findParent<KFormDesigner::TabWidget>(w, "KFormDesigner::TabWidget", page_w); while (nextw) { - if (KexiUtils::hasParent(TQT_TQOBJECT(w), TQT_TQOBJECT(nextw))) // do not group (sort) widgets where on is a child of another + if (KexiUtils::hasParent(w, nextw)) // do not group (sort) widgets where on is a child of another break; if (nextw->y() >= (w->y() + 20)) break; if (tab_w) { TQObject *page_nextw = 0; - KFormDesigner::TabWidget *tab_nextw = KFormDesigner::findParent<KFormDesigner::TabWidget>(TQT_TQOBJECT(nextw), "KFormDesigner::TabWidget", page_nextw); + KFormDesigner::TabWidget *tab_nextw = KFormDesigner::findParent<KFormDesigner::TabWidget>(nextw, "KFormDesigner::TabWidget", page_nextw); if (tab_w == tab_nextw) { if (page_w != page_nextw) // 'nextw' widget within different tab page break; diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 62402bfa..188238fd 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -879,7 +879,7 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name) else if(type == "set") { WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj); - TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj; + TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : obj; const int count = subobject->metaObject()->findProperty(name.latin1(), true); const TQMetaProperty *meta = count!=-1 ? subobject->metaObject()->property(count, true) : 0; @@ -1343,7 +1343,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl if (node.attribute("subwidget")=="true") { //this is property for subwidget: remember it for delayed setting //because now the subwidget could be not created yet (true e.g. for KexiDBAutoField) - const TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) ); + const TQVariant val( readPropertyValue(node.firstChild(), w, name) ); kdDebug() << val.toStringList() << endl; item->addSubproperty( name.latin1(), val ); //subwidget->setProperty(name.latin1(), val); @@ -1353,23 +1353,23 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl // We cannot assign the buddy now as the buddy widget may not be created yet if(name == "buddy") - m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w); + m_buddies->insert(readPropertyValue(node.firstChild(), w, name).toString(), (TQLabel*)w); else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) && item->container() && item->container()->layout()) { // We load the margin of a Layout if(name == "margin") { - int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); + int margin = readPropertyValue(node.firstChild(), w, name).toInt(); item->container()->setLayoutMargin(margin); item->container()->layout()->setMargin(margin); } // We load the spacing of a Layout else if(name == "spacing") { - int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); + int spacing = readPropertyValue(node.firstChild(), w, name).toInt(); item->container()->setLayoutSpacing(spacing); item->container()->layout()->setSpacing(spacing); } else if((name == "justify")){ - bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool(); + bool justify = readPropertyValue(node.firstChild(), w, name).toBool(); KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout()); if(flow) flow->setJustified(justify); @@ -1389,7 +1389,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl } else // we have a normal property, let's load it { - TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) ); + TQVariant val( readPropertyValue(node.firstChild(), w, name) ); if(name == "geometry" && dynamic_cast<FormWidget*>(w)) { //fix geometry if needed - this is top level form widget TQRect r( val.toRect() ); diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index d502d5e8..14584e20 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -297,8 +297,8 @@ FormManager::insertWidget(const TQCString &classname) if( ((TQWidget*)o)->ownCursor() ) { // form->d->cursors->insert(o->name(), ((TQWidget*)o)->cursor()); - form->d->cursors.insert(o, TQT_TQWIDGET(o)->cursor()); - TQT_TQWIDGET(o)->setCursor(TQCursor(TQt::CrossCursor)); + form->d->cursors.insert(o, static_cast<TQWidget*>(o)->cursor()); + static_cast<TQWidget*>(o)->setCursor(TQCursor(TQt::CrossCursor)); } } @@ -325,12 +325,12 @@ FormManager::stopInsert() TQObjectList *l = form->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) { - TQT_TQWIDGET(o)->unsetCursor(); + static_cast<TQWidget*>(o)->unsetCursor(); #if 0 if( ((TQWidget*)o)->ownCursor()) { TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.find(o) ); if (curIt!=form->d->cursors.constEnd()) - TQT_TQWIDGET(o)->setCursor( *curIt ); + static_cast<TQWidget*>(o)->setCursor( *curIt ); // ((TQWidget*)o)->setCursor( (*(form->d->cursors))[o->name()] ) ; } #endif @@ -376,11 +376,11 @@ FormManager::startCreatingConnection() TQObjectList *l = form->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) { - TQWidget *w = TQT_TQWIDGET(o); + TQWidget *w = static_cast<TQWidget*>(o); if( w->ownCursor() ) { - form->d->cursors.insert(TQT_TQOBJECT(w), w->cursor()); -// form->d->cursors->insert(TQT_TQOBJECT(w)->name(), w->cursor()); + form->d->cursors.insert(w, w->cursor()); +// form->d->cursors->insert(w->name(), w->cursor()); w->setCursor(TQCursor(PointingHandCursor )); } if(w->hasMouseTracking()) @@ -439,7 +439,7 @@ FormManager::stopCreatingConnection() if( w->ownCursor()) { TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.find(o) ); if (curIt!=form->d->cursors.constEnd()) - TQT_TQWIDGET(o)->setCursor( *curIt ); + static_cast<TQWidget*>(o)->setCursor( *curIt ); } // w->setCursor( (*(form->d->cursors))[o->name()] ) ; w->setMouseTracking( !form->d->mouseTrackers->grep(w->name()).isEmpty() ); @@ -1212,7 +1212,7 @@ FormManager::slotStyle() TQObjectList *l = activeForm()->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) - (TQT_TQWIDGET(o))->setStyle( style ); + (static_cast<TQWidget*>(o))->setStyle( style ); delete l; } diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp index b04222f3..a55f121d 100644 --- a/kexi/formeditor/utils.cpp +++ b/kexi/formeditor/utils.cpp @@ -131,8 +131,8 @@ HorWidgetList::~HorWidgetList() int HorWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2) { - TQWidget *w1 = TQT_TQWIDGET(item1); - TQWidget *w2 = TQT_TQWIDGET(item2); + TQWidget *w1 = static_cast<TQWidget*>(item1); + TQWidget *w2 = static_cast<TQWidget*>(item2); return w1->mapTo(m_topLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_topLevelWidget, TQPoint(0,0)).x(); } @@ -150,8 +150,8 @@ VerWidgetList::~VerWidgetList() int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2) { - TQWidget *w1 = TQT_TQWIDGET(item1); - TQWidget *w2 = TQT_TQWIDGET(item2); + TQWidget *w1 = static_cast<TQWidget*>(item1); + TQWidget *w2 = static_cast<TQWidget*>(item2); int y1, y2; TQObject *page1 = 0; @@ -165,7 +165,7 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It TabWidget *tw2 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w2, "KFormDesigner::TabWidget", page2); if (tw1 && tw2 && tw1 == tw2 && page1 != page2) { // this sorts widgets by tabs there're put in - return tw1->indexOf(TQT_TQWIDGET(page1)) - tw2->indexOf(TQT_TQWIDGET(page2)); + return tw1->indexOf(static_cast<TQWidget*>(page1)) - tw2->indexOf(static_cast<TQWidget*>(page2)); } if (tw2) // special case diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h index d42a891f..1f325265 100644 --- a/kexi/formeditor/utils.h +++ b/kexi/formeditor/utils.h @@ -41,10 +41,10 @@ type* findParent(TQObject* o, const char* className, TQObject* &prevPrev) { if (!o || !className || className[0]=='\0') return 0; - TQObject *prev = TQT_TQOBJECT(o); - while ( ((o=TQT_TQOBJECT(o)->parent())) && !TQT_TQOBJECT(o)->inherits(className) ) { + TQObject *prev = o; + while ( ((o=o->parent())) && !o->inherits(className) ) { prevPrev = prev; - prev = TQT_TQOBJECT(o); + prev = o; } return static_cast<type*>(o); } diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 5beed16b..9da235d2 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -740,7 +740,7 @@ WidgetPropertySet::eventFilter(TQObject *o, TQEvent *ev) if(d->set["geometry"].value() == o->property("geometry")) // to avoid infinite recursion return false; - d->set["geometry"] = TQT_TQWIDGET(o)->geometry(); + d->set["geometry"] = static_cast<TQWidget*>(o)->geometry(); } } else if(d->widgets.count() > 1 && ev->type() == TQEvent::Move) // the widget is being moved, we update the property diff --git a/kexi/kexidb/fieldvalidator.cpp b/kexi/kexidb/fieldvalidator.cpp index 3b08301c..bea6662b 100644 --- a/kexi/kexidb/fieldvalidator.cpp +++ b/kexi/kexidb/fieldvalidator.cpp @@ -27,7 +27,7 @@ using namespace KexiDB; FieldValidator::FieldValidator( const Field &field, TQWidget * parent, const char * name ) - : KexiUtils::MultiValidator(TQT_TQOBJECT(parent), name) + : KexiUtils::MultiValidator(parent, name) { //! @todo merge this code with KexiTableEdit code! //! @todo set maximum length validator diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp index e7cce867..363c18b1 100644 --- a/kexi/kexiutils/longlongvalidator.cpp +++ b/kexi/kexiutils/longlongvalidator.cpp @@ -26,14 +26,14 @@ using namespace KexiUtils; LongLongValidator::LongLongValidator( TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) , m_min(0), m_max(0) { setBase(base); } LongLongValidator::LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { setBase(base); setRange( bottom, top ); diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h index 89af157c..2cff43eb 100644 --- a/kexi/kexiutils/utils.h +++ b/kexi/kexiutils/utils.h @@ -46,7 +46,7 @@ namespace KexiUtils { if (!o || !className || className[0]=='\0') return 0; - while ( ((o=TQT_TQOBJECT(o)->parent())) && !TQT_TQOBJECT(o)->inherits(className) ) + while ( ((o=o->parent())) && !o->inherits(className) ) ; return static_cast<type*>(o); } @@ -71,7 +71,7 @@ namespace KexiUtils { if (!o || !className || className[0]=='\0') return 0; - TQObjectList *l = TQT_TQOBJECT(o)->queryList( className, objName ); + TQObjectList *l = o->queryList( className, objName ); TQObject *result = l->first(); delete l; return static_cast<type*>(result); diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 0920928b..7a82eb1e 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -260,14 +260,14 @@ KexiMainWindowImpl::KexiMainWindowImpl() //get informed connect(&Kexi::partManager(),TQT_SIGNAL(partLoaded(KexiPart::Part*)),this,TQT_SLOT(slotPartLoaded(KexiPart::Part*))); - connect( m_pMdi, TQT_SIGNAL(nowMaximized(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCaptionForCurrentMDIChild(bool)) ); - connect( m_pMdi, TQT_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), TQT_TQOBJECT(this), TQT_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*))); -// connect( TQT_TQOBJECT(this), TQT_SIGNAL(lastChildFrmClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotLastChildFrmClosed())); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(lastChildViewClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotLastChildViewClosed())); + 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( TQT_TQOBJECT(this), TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*))); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), - TQT_TQOBJECT(this), TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); + connect( this, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*))); + connect( this, TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), + this, TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); //if (!userMode()) { @@ -295,7 +295,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() //kdDebug() << "name=" <<it.current()->name() << " cname="<<it.current()->className()<<endl; //KexiMainWindowImpl::eventFilter() will filter our popups: it.current()->installEventFilter(this); - d->popups.insert(it.current()->name(), static_cast<TQPopupMenu*>(TQT_TQWIDGET(it.current()))); + d->popups.insert(it.current()->name(), static_cast<TQPopupMenu*>(it.current())); } delete l; d->createMenu = d->popups["create"]; @@ -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() ), TQT_TQOBJECT(this), TQT_SLOT( closeActiveView() ) ); + TQObject::connect( closeButton, TQT_SIGNAL( clicked() ), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu()) ); + TQObject::connect( m_pWindowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()) ); } void KexiMainWindowImpl::fillWindowMenu() @@ -521,26 +521,26 @@ 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 &)), TQT_TQOBJECT(this), TQT_SLOT(slotAction(const TQString &))); +// connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &))); // PROJECT MENU TDEAction *action = new TDEAction(i18n("&New..."), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), - TQT_TQOBJECT(this), TQT_SLOT(slotProjectNew()), actionCollection(), "project_new"); + this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT( slotProjectOpen() ), actionCollection(), "project_open" ); + action = KStdAction::open( this, TQT_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), - TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); + this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); +// d->action_open_recent = KStdAction::openRecent( this, TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); //#ifdef KEXI_SHOW_UNIMPLEMENTED #ifndef KEXI_NO_UNFINISHED @@ -556,42 +556,42 @@ void KexiMainWindowImpl::initActions() // 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..."), TQT_TQOBJECT(this), TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000); +// ->insertItem(i18n("&More Projects..."), this, TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000); #else d->action_open_recent = d->dummy_action; #endif d->action_save = KStdAction::save( - TQT_TQOBJECT(this), TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); + this, TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); // d->action_save = new TDEAction(i18n("&Save"), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save), -// TQT_TQOBJECT(this), TQT_SLOT(slotProjectSave()), actionCollection(), "project_save"); +// this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" ); + this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT(slotProjectQuit()), actionCollection(), "quit"); + KStdAction::quit( this, TQT_SLOT(slotProjectQuit()), actionCollection(), "quit"); #ifdef KEXI_SHOW_UNIMPLEMENTED d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); + this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotProjectImportDataTable()), actionCollection(), + 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotProjectExportDataTable()), actionCollection(), + 0, this, TQT_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 TQT_TQOBJECT(this), TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); +//TODO this, TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); //TODO new TDEAction(i18n("From Server..."), "server", 0, -//TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); +//TODO this, TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); - d->action_project_print = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrint()), + d->action_project_print = KStdAction::print(this, TQT_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( - TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrintPreview()), + this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotProjectPageSetup()), actionCollection(), + "", 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotEditPasteSpecialDataTable()), + "table", 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotEditCopySpecialDataTable()), + "table", 0, this, TQT_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( - TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" ); + this, TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" ); // d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = KStdAction::findNext( - TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); + this, TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); d->action_edit_findprev = KStdAction::findPrev( - TQT_TQOBJECT(this), TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); + this, TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); d->action_edit_replace = 0; //! @todo d->action_edit_replace = KStdAction::replace( -//! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); +//! this, TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; //! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, -//! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); +//! this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); + this, TQT_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 - TQT_TQOBJECT(this), TQT_SLOT(activateNextWin()), actionCollection(), "window_next"); + this, TQT_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 - TQT_TQOBJECT(this), TQT_SLOT(activatePrevWin()), actionCollection(), "window_previous"); + this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + action = KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure shortcut keys.")); #ifdef KEXI_SHOW_UNIMPLEMENTED - action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + action = KStdAction::configureToolbars( this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings()), actionCollection()); + d->action_configure = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection()); action->setWhatsThis(i18n("Lets you configure Kexi.")); #endif //HELP MENU #if 0//js: todo reenable later - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotTipOfTheDayAction() ), actionCollection() ) + KStdAction::tipOfDay( this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); + this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings())); +// connect(actionSettings, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowSettings())); // -- add a few missing tooltips (usable especially in Form's "Assign action" dialog) if ((action = actionCollection()->action("window_close"))) @@ -1126,7 +1126,7 @@ void KexiMainWindowImpl::invalidateSharedActions(TQObject *o) d->action_edit_paste->setEnabled(true);*/ if (!o) - o = TQT_TQOBJECT(focusWindow()); + o = focusWindow(); KexiSharedActionHost::invalidateSharedActions(o); } @@ -1138,7 +1138,7 @@ void KexiMainWindowImpl::invalidateSharedActions() // unused, I think void KexiMainWindowImpl::invalidateSharedActionsLater() { - TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(invalidateSharedActions())); + TQTimer::singleShot(1, this, TQT_SLOT(invalidateSharedActions())); } void KexiMainWindowImpl::invalidateProjectWideActions() @@ -1345,7 +1345,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) // d->disableErrorMessages = true; enableMessages( false ); - TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(slotAutoOpenObjectsLater())); + TQTimer::singleShot(1, this, TQT_SLOT(slotAutoOpenObjectsLater())); return true; } @@ -1721,7 +1721,7 @@ void KexiMainWindowImpl::initNavigator() if(!d->nav) { d->nav = new KexiBrowser(this, this); - d->nav->installEventFilter(TQT_TQOBJECT(this)); + d->nav->installEventFilter(this); d->navToolWindow = addToolWindow(d->nav, KDockWidget::DockLeft, getMainDockWidget(), 20/*, lv, 35, "2"*/); // d->navToolWindow->hide(); @@ -1859,7 +1859,7 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p) if (!p) return; connect(p, TQT_SIGNAL(newObjectRequest(KexiPart::Info*)), - TQT_TQOBJECT(this), TQT_SLOT(newObject(KexiPart::Info*))); + this, TQT_SLOT(newObject(KexiPart::Info*))); p->createGUIClients(this); } @@ -2225,11 +2225,11 @@ KexiMainWindowImpl::registerChild(KexiDialogBase *dlg) { kdDebug() << "KexiMainWindowImpl::registerChild()" << endl; connect(dlg, TQT_SIGNAL(activated(KMdiChildView *)), - TQT_TQOBJECT(this), TQT_SLOT(activeWindowChanged(KMdiChildView *))); + this, TQT_SLOT(activeWindowChanged(KMdiChildView *))); connect(dlg, TQT_SIGNAL(dirtyChanged(KexiDialogBase*)), - TQT_TQOBJECT(this), TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*))); + this, TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*))); -// connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), TQT_TQOBJECT(this), TQT_SLOT(childClosed(KMdiChildView *))); +// connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQT_SLOT(childClosed(KMdiChildView *))); if(dlg->id() != -1) { d->insertDialog(dlg); } @@ -2564,7 +2564,7 @@ KexiMainWindowImpl::slotProjectNew() //todo: pass new_data->caption() //start new instance //! @todo use TDEProcess? - TQProcess proc(args, TQT_TQOBJECT(this), "process"); + TQProcess proc(args, this, "process"); proc.setCommunication((TQProcess::Communication)0); // proc.setWorkingDirectory( TQFileInfo(new_data->connectionData()->fileName()).dir(true) ); proc.setWorkingDirectory( TQFileInfo(fileName).dir(true) ); @@ -2579,9 +2579,9 @@ 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*)), TQT_TQOBJECT(this), TQT_SLOT(showErrorMessage(const TQString&,KexiDB::Object*))); -//provided by KexiMessageHandler connect(d->prj, TQT_SIGNAL(error(const TQString&,const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(showErrorMessage(const TQString&,const TQString&))); - connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), TQT_TQOBJECT(this), TQT_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&))); +//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&))); if (d->nav) connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&))); @@ -2783,7 +2783,7 @@ tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const TQString& a } //! @todo use KRun args << fileName; - TQProcess proc(args, TQT_TQOBJECT(this), "process"); + TQProcess proc(args, this, "process"); proc.setWorkingDirectory( TQFileInfo(fileName).dir(true) ); const bool ok = proc.start(); if (!ok) { @@ -3394,7 +3394,7 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool TQWidget* KexiMainWindowImpl::findWindow(TQWidget *w) { - while (w && !acceptsSharedActions(TQT_TQOBJECT(w))) + while (w && !acceptsSharedActions(w)) w = w->parentWidget(); return w; } @@ -3465,14 +3465,14 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) /*! On mouse click on the findow, make sure it's focused and actions are invalidated */ if (e->type()==TQEvent::MouseButtonPress) { - TQWidget *w = findWindow(TQT_TQWIDGET(obj)); + TQWidget *w = findWindow(static_cast<TQWidget*>(obj)); KexiVDebug << "MouseButtonPress EVENT " << (w ? w->name() : 0) << endl; if (w) { w->setFocus(); - invalidateSharedActions(TQT_TQOBJECT(d->curDialog)); + invalidateSharedActions(d->curDialog); } } - TQWidget *w = findWindow(TQT_TQWIDGET(obj)); + TQWidget *w = findWindow(static_cast<TQWidget*>(obj)); if (e->type()==TQEvent::FocusIn) { focus_w = focusWindow(); KexiVDebug << "Focus EVENT" << endl; @@ -3530,15 +3530,15 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) //d->nav->setFocus(); d->focus_before_popup->setFocus(); d->focus_before_popup=0; - invalidateSharedActions(TQT_TQOBJECT(d->curDialog)); + invalidateSharedActions(d->curDialog); return true; } //remember currently focued window invalidate act. if (e->type()==TQEvent::FocusOut) { if (static_cast<TQFocusEvent*>(e)->reason()==TQFocusEvent::Popup) { - if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) { - invalidateSharedActions(TQT_TQOBJECT(d->curDialog)); + if (KexiUtils::hasParent(d->curDialog, focus_w)) { + invalidateSharedActions(d->curDialog); d->focus_before_popup=d->curDialog; } else { diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index 8b1a66ab..d1eac9f5 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -73,7 +73,7 @@ public: wasAutoOpen = false; dialogExistedBeforeCloseProject = false; #ifndef KEXI_SHOW_UNIMPLEMENTED - dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd)); + dummy_action = new TDEActionMenu(TQString(""), wnd); #endif maximizeFirstOpenedChildFrm = false; #ifdef HAVE_TDENEWSTUFF diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index 51c1e045..bf38c28a 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -85,7 +85,7 @@ void KexiNameWidget::init( le_name = new KLineEdit( nameText, this, "le_name" ); le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0)); Validator *idValidator = new IdentifierValidator(0, "id_val"); - le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") ); + le_name->setValidator( m_validator = new MultiValidator(idValidator, this, "val") ); lyr->addWidget( le_name, 2, 1 ); setFocusProxy(le_caption); diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 404237bb..11cf1114 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()), TQT_TQOBJECT(this), TQT_SLOT(slotPrintClicked())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotPageSetup())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomInClicked())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOutClicked())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(close())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstClicked())); + m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotPreviousClicked())); + m_navToolbar->addConnection(m_idPrevious, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotNextClicked())); + m_navToolbar->addConnection(m_idNext, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotLastClicked())); + m_navToolbar->addConnection(m_idLast, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLastClicked())); m_navToolbar->insertSeparator(); resize(width(), kapp->desktop()->height()*4/5); //! @todo progress bar... - TQTimer::singleShot(50, TQT_TQOBJECT(this), TQT_SLOT(initLater())); + TQTimer::singleShot(50, this, TQT_SLOT(initLater())); } void KexiSimplePrintPreviewWindow::initLater() diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 26d9cc64..2b1f4026 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -188,7 +188,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, connect(m_server_db_name->le_dbname, TQT_SIGNAL(returnPressed()), this,TQT_SLOT(accept())); m_server_db_name->le_caption->setText(i18n("New database")); - m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this), "id_val")); + m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(this, "id_val")); m_project_selector = new KexiProjectSelectorWidget( m_server_db_name->frm_dblist, "KexiProjectSelectorWidget", 0, false, false ); GLUE_WIDGET(m_project_selector, m_server_db_name->frm_dblist); diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 61aa0735..a5c6f958 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -60,7 +60,7 @@ KexiStartupFileDialog::KexiStartupFileDialog( TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - static_cast<TQPushButton*>(TQT_TQWIDGET(obj))->hide(); + static_cast<TQPushButton*>(obj)->hide(); } delete l; } @@ -70,7 +70,7 @@ KexiStartupFileDialog::KexiStartupFileDialog( TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - TQT_TQWIDGET(obj)->installEventFilter(this); + static_cast<TQWidget*>(obj)->installEventFilter(this); } delete l; } diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index 12b207a9..43bf6e4f 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -353,7 +353,7 @@ void ImportWizard::setupImporting() KButtonBox *optionsBox = new KButtonBox(m_importingPage); vbox->addWidget( optionsBox ); - m_importOptionsButton = optionsBox->addButton(i18n("Advanced Options"), TQT_TQOBJECT(this), TQT_SLOT(slotOptionsButtonClicked())); + m_importOptionsButton = optionsBox->addButton(i18n("Advanced Options"), this, TQT_SLOT(slotOptionsButtonClicked())); m_importOptionsButton->setIconSet(SmallIconSet("configure")); optionsBox->addStretch(1); diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index cce155d4..e5d7addf 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -230,7 +230,7 @@ void KexiFormPart::initInstanceActions() KexiDialogTempData* KexiFormPart::createTempData(KexiDialogBase* dialog) { - return new KexiFormPart::TempData(TQT_TQOBJECT(dialog)); + return new KexiFormPart::TempData(dialog); } KexiViewBase* KexiFormPart::createView(TQWidget *parent, KexiDialogBase* dialog, diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 41e8cc64..263f327b 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -131,7 +131,7 @@ static void repaintAll(TQWidget *w) TQObjectList *list = w->queryList("TQWidget"); TQObjectListIt it(*list); for (TQObject *obj; (obj=it.current()); ++it ) { - TQT_TQWIDGET(obj)->repaint(); + static_cast<TQWidget*>(obj)->repaint(); } delete list; } @@ -320,7 +320,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" << childrenIt.current()->className() << " " << childrenIt.current()->name() << "' child to filtered widgets" << endl; - //it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current())); + //it.current()->widget()->installEventFilter(childrenIt.current()); childrenIt.current()->installEventFilter(this); // } } @@ -495,7 +495,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (!realWidget) return true; //ignore //the watched widget can be a subwidget of a real widget, e.g. autofield: find it - //TQWidget* realWidget = TQT_TQWIDGET(watched); + //TQWidget* realWidget = static_cast<TQWidget*>(watched); while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface()) realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() ); @@ -548,7 +548,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) //behaves differently (e.g. TQLineEdit calls selectAll()) when //focus event's reason is TQFocusEvent::Tab if (widgetToFocus->focusProxy()) - widgetToFocus = TQT_TQWIDGET(widgetToFocus->focusProxy()); + widgetToFocus = widgetToFocus->focusProxy(); if (widgetToFocus && d->dataAwareObject->acceptEditor()) { if (tab) { //try to accept this will validate the current input (if any) diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index 5e2ac08a..e0395cde 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -56,7 +56,7 @@ KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name) , KexiFormDataItemInterface() //moved , m_dateFormatter(0) //moved , m_timeFormatter(0) - , m_menuExtender(TQT_TQOBJECT(this), this) + , m_menuExtender(this, this) , m_internalReadOnly(false) , m_slotTextChanged_enabled(true) { @@ -254,7 +254,7 @@ void KexiDBLineEdit::setReadOnly( bool readOnly ) if (m_internalReadOnly) { m_readWriteValidator = validator(); if (!m_readOnlyValidator) - m_readOnlyValidator = new KexiDBLineEdit_ReadOnlyValidator(TQT_TQOBJECT(this)); + m_readOnlyValidator = new KexiDBLineEdit_ReadOnlyValidator(this); setValidator( m_readOnlyValidator ); } else { diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp index 8b4149a9..d021bcb2 100644 --- a/kexi/plugins/forms/widgets/kexidbsubform.cpp +++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp @@ -124,8 +124,8 @@ KexiDBSubForm::setFormName(const TQString &name) m_form->setDesignMode(false); // Install event filters on the whole newly created form - KFormDesigner::ObjectTreeItem *tree = m_parentForm->objectTree()->lookup(TQT_TQOBJECT(this)->name()); - KFormDesigner::installRecursiveEventFilter(TQT_TQOBJECT(this), tree->eventEater()); + KFormDesigner::ObjectTreeItem *tree = m_parentForm->objectTree()->lookup(this->name()); + KFormDesigner::installRecursiveEventFilter(this, tree->eventEater()); } #include "kexidbsubform.moc" diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index 98ad8bd5..b99eb609 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -32,7 +32,7 @@ KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name) : KTextEdit(parent, name) , KexiDBTextWidgetInterface() , KexiFormDataItemInterface() - , m_menuExtender(TQT_TQOBJECT(this), this) + , m_menuExtender(this, this) , m_slotTextChanged_enabled(true) { connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 9c9c5f22..61f86ec2 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -383,7 +383,7 @@ if ( m_mode == Clipboard ) connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(optionsButtonClicked())); - installRecursiveEventFilter(TQT_TQOBJECT(this), TQT_TQOBJECT(this)); + installRecursiveEventFilter(this, this); initLater(); } diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index be57a766..f443c92f 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()), TQT_TQOBJECT(this), TQT_SLOT(slotTextChanged())); + connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(slotCheckQuery())); - plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode())); + plugSharedAction("querypart_check_query", this, TQT_SLOT(slotCheckQuery())); + plugSharedAction("querypart_view_toggle_history", this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery())); - d->historyHead->addButton("edit-clear", msg_clear, TQT_TQOBJECT(d->history), TQT_SLOT(clear())); - d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery())); + 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()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery())); + connect(d->history, TQT_SIGNAL(currentItemDoubleClicked()), this, TQT_SLOT(slotSelectQuery())); d->heightForHistoryMode = -1; //height() / 2; //d->historyHead->hide(); diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp index 02c4ab94..aad6c992 100644 --- a/kexi/plugins/queries/kexiquerypart.cpp +++ b/kexi/plugins/queries/kexiquerypart.cpp @@ -214,7 +214,7 @@ tristate KexiQueryPart::rename(KexiMainWindow *win, KexiPart::Item &item, const //---------------- KexiQueryPart::TempData::TempData(KexiDialogBase* parent, KexiDB::Connection *conn) - : KexiDialogTempData(TQT_TQOBJECT(parent)) + : KexiDialogTempData(parent) , KexiDB::Connection::TableSchemaChangeListenerInterface() , queryChangedInPreviousView(false) , m_query(0) @@ -253,7 +253,7 @@ void KexiQueryPart::TempData::registerTableSchemaChanges(KexiDB::QuerySchema *q) tristate KexiQueryPart::TempData::closeListener() { - KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent())); + KexiDialogBase* dlg = static_cast<KexiDialogBase*>(parent()); return dlg->mainWin()->closeDialog(dlg); } @@ -270,7 +270,7 @@ void KexiQueryPart::TempData::setQuery(KexiDB::QuerySchema *query) return; if (m_query /* query not owned by dialog */ - && (static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query ))) + && (static_cast<KexiDialogBase*>(parent())->schemaData() != static_cast<KexiDB::SchemaData*>( m_query ))) { delete m_query; } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index 6de68b7d..4348aae2 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -88,13 +88,13 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa d->statusbrowser->installEventFilter(this); splitter->setResizeMode(d->statusbrowser, TQSplitter::KeepSize); - plugSharedAction( "data_execute", TQT_TQOBJECT(this), TQT_SLOT(execute()) ); + plugSharedAction( "data_execute", this, TQT_SLOT(execute()) ); if(KexiEditor::isAdvancedEditor()) // the configeditor is only in advanced mode avaiable. - plugSharedAction( "script_config_editor", TQT_TQOBJECT(d->editor), TQT_SLOT(slotConfigureEditor()) ); + plugSharedAction( "script_config_editor", d->editor, TQT_SLOT(slotConfigureEditor()) ); loadData(); - d->properties = new KoProperty::Set(TQT_TQOBJECT(this), "KexiScripting"); + 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&) )); diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index b45c97c7..fe3453ab 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -124,7 +124,7 @@ void KexiScriptPart::initPartActions() // scripting-plugin depends on this instance and loading the plugin will // fail if it's not avaiable. if(! Kross::Api::Manager::scriptManager()->hasChild("KexiMainWindow")) { - Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_mainWin), "KexiMainWindow"); + Kross::Api::Manager::scriptManager()->addTQObject(m_mainWin, "KexiMainWindow"); // Add the TDEAction's provided by the ScriptGUIClient to the // KexiMainWindow. diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 4b68a7de..d092bf89 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -160,45 +160,45 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare d->view->setSpreadSheetMode(); connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), - TQT_TQOBJECT(this), TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); connect(d->data, TQT_SIGNAL(rowUpdated(KexiTableItem*)), - TQT_TQOBJECT(this), TQT_SLOT(slotRowUpdated(KexiTableItem*))); + this, TQT_SLOT(slotRowUpdated(KexiTableItem*))); //connect(d->data, TQT_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)), - // TQT_TQOBJECT(this), TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool))); + // this, TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool))); connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); + this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(updateActions())); - connect(d->sets, TQT_SIGNAL(rowInserted()), TQT_TQOBJECT(this), TQT_SLOT(slotRowInserted())); + connect(d->sets, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(updateActions())); + connect(d->sets, TQT_SIGNAL(rowInserted()), this, TQT_SLOT(slotRowInserted())); d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu()); d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0); - connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowContextMenu())); + connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowContextMenu())); - plugSharedAction("tablepart_toggle_pkey", TQT_TQOBJECT(this), TQT_SLOT(slotTogglePrimaryKey())); + plugSharedAction("tablepart_toggle_pkey", this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(slotUndo())); - plugSharedAction("edit_redo", TQT_TQOBJECT(this), TQT_SLOT(slotRedo())); + plugSharedAction("edit_undo", this, TQT_SLOT(slotUndo())); + plugSharedAction("edit_redo", this, TQT_SLOT(slotRedo())); setAvailable("edit_undo", false); setAvailable("edit_redo", false); - connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), TQT_TQOBJECT(this), TQT_SLOT(slotCommandExecuted(KCommand*))); + connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), this, TQT_SLOT(slotCommandExecuted(KCommand*))); #endif #ifdef KEXI_DEBUG_GUI KexiUtils::addAlterTableActionDebug(TQString()); //to create the tab KexiUtils::connectPushButtonActionForDebugWindow( - "simulateAlterTableExecution", TQT_TQOBJECT(this), TQT_SLOT(slotSimulateAlterTableExecution())); + "simulateAlterTableExecution", this, TQT_SLOT(slotSimulateAlterTableExecution())); KexiUtils::connectPushButtonActionForDebugWindow( - "executeRealAlterTable", TQT_TQOBJECT(this), TQT_SLOT(executeRealAlterTable())); + "executeRealAlterTable", this, TQT_SLOT(executeRealAlterTable())); #endif } @@ -309,7 +309,7 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b if (mainWin()->project()->dbConnection()->isReadOnly()) set->setReadOnly( true ); // connect(buff,TQT_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)), -// TQT_TQOBJECT(this), TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&))); +// this, TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&))); KoProperty::Property *prop; @@ -457,7 +457,7 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b d->updatePropertiesVisibility(field.type(), *set); connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - TQT_TQOBJECT(this), TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); d->sets->insert(row, set, newOne); return set; diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 2a9b61d3..e1c3cd22 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -93,7 +93,7 @@ void KexiTablePart::initInstanceActions() KexiDialogTempData* KexiTablePart::createTempData(KexiDialogBase* dialog) { - return new KexiTablePart::TempData(TQT_TQOBJECT(dialog)); + return new KexiTablePart::TempData(dialog); } KexiViewBase* KexiTablePart::createView(TQWidget *parent, KexiDialogBase* dialog, diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index dd0b16a1..6a17bc94 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -101,10 +101,10 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_list->sort(); m_list->setAllColumnsShowFocus(true); m_list->setTooltipColumn(0); - m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this)) ); + m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(this) ); m_list->setResizeMode(TQListView::LastColumn); connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); @@ -123,8 +123,8 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } // actions - m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), - TQT_SLOT(slotOpenObject()), TQT_TQOBJECT(this), "open_object"); + m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, this, + TQT_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*/, - TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete"); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotRename()), m_actions, "edit_rename"); + this, TQT_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())); #endif - m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), - TQT_SLOT(slotDesignObject()), TQT_TQOBJECT(this), "design_object"); + m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, this, + TQT_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) { @@ -167,21 +167,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features buttons_flyr->add(btn); } - m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditTextObject()), TQT_TQOBJECT(this), "editText_object"); + m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, this, + TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); + m_newObjectAction = new TDEAction("", "document-new", 0, this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotNewObjectPopupAboutToShow())); + connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotNewObject())); + connect(m_newObjectToolButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewObject())); buttons_flyr->add(m_newObjectToolButton); m_deleteObjectToolButton = new KexiSmallToolButton(this, m_deleteAction); @@ -190,22 +190,22 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } } - m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotExecuteObject()), TQT_TQOBJECT(this), "data_execute"); + m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, this, + TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotExportAsDataTable()), TQT_TQOBJECT(this), "exportAsDataTable"); + "table", 0, this, TQT_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, TQT_TQOBJECT(this), - TQT_SLOT(slotPrintItem()), TQT_TQOBJECT(this), "printItem"); + m_printAction = new TDEAction(i18n("&Print..."), "document-print", 0, this, + TQT_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, TQT_TQOBJECT(this), - TQT_SLOT(slotPageSetupForItem()), TQT_TQOBJECT(this), "pageSetupForItem"); + m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, this, + TQT_SLOT(slotPageSetupForItem()), this, "pageSetupForItem"); m_pageSetupAction->setWhatsThis( i18n("Shows page setup for printing the active table or query.")); diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp index 2cdd0bfc..5e549461 100644 --- a/kexi/widget/kexicustompropertyfactory_p.cpp +++ b/kexi/widget/kexicustompropertyfactory_p.cpp @@ -83,7 +83,7 @@ KexiIdentifierPropertyEdit::KexiIdentifierPropertyEdit( : StringEdit(property, parent, name) { m_edit->setValidator( - new KexiUtils::IdentifierValidator(TQT_TQOBJECT(m_edit), "KexiIdentifierPropertyEdit Validator") ); + new KexiUtils::IdentifierValidator(m_edit, "KexiIdentifierPropertyEdit Validator") ); } KexiIdentifierPropertyEdit::~KexiIdentifierPropertyEdit() diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 034b3f70..6c61009b 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(TQT_TQOBJECT(this), TQT_SLOT(slotCellSelected(int,int))); + m_dataAwareObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int))); //! before closing - we'are accepting editing - connect(TQT_TQOBJECT(this), TQT_SIGNAL(closing(bool&)), TQT_TQOBJECT(this), TQT_SLOT(slotClosing(bool&))); + connect(this, TQT_SIGNAL(closing(bool&)), this, TQT_SLOT(slotClosing(bool&))); //! updating actions on start/stop editing - m_dataAwareObject->connectRowEditStartedSignal(TQT_TQOBJECT(this), TQT_SLOT(slotUpdateRowActions(int))); - m_dataAwareObject->connectRowEditTerminatedSignal(TQT_TQOBJECT(this), TQT_SLOT(slotUpdateRowActions(int))); - m_dataAwareObject->connectReloadActionsSignal(TQT_TQOBJECT(this), TQT_SLOT(reloadActions())); + m_dataAwareObject->connectRowEditStartedSignal(this, TQT_SLOT(slotUpdateRowActions(int))); + m_dataAwareObject->connectRowEditTerminatedSignal(this, TQT_SLOT(slotUpdateRowActions(int))); + m_dataAwareObject->connectReloadActionsSignal(this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(deleteCurrentRow())); + plugSharedAction("edit_delete_row", this, TQT_SLOT(deleteCurrentRow())); m_actionClient->plugSharedAction(sharedAction("edit_delete_row")); //for proper shortcut - plugSharedAction("edit_delete", TQT_TQOBJECT(this), TQT_SLOT(deleteAndStartEditCurrentCell())); + plugSharedAction("edit_delete", this, TQT_SLOT(deleteAndStartEditCurrentCell())); m_actionClient->plugSharedAction(sharedAction("edit_delete")); //for proper shortcut - plugSharedAction("edit_edititem", TQT_TQOBJECT(this), TQT_SLOT(startEditOrToggleValue())); + plugSharedAction("edit_edititem", this, TQT_SLOT(startEditOrToggleValue())); m_actionClient->plugSharedAction(sharedAction("edit_edititem")); //for proper shortcut - plugSharedAction("data_save_row", TQT_TQOBJECT(this), TQT_SLOT(acceptRowEdit())); + plugSharedAction("data_save_row", this, TQT_SLOT(acceptRowEdit())); m_actionClient->plugSharedAction(sharedAction("data_save_row")); //for proper shortcut - plugSharedAction("data_cancel_row_changes", TQT_TQOBJECT(this), TQT_SLOT(cancelRowEdit())); + plugSharedAction("data_cancel_row_changes", this, TQT_SLOT(cancelRowEdit())); m_actionClient->plugSharedAction(sharedAction("data_cancel_row_changes")); //for proper shortcut if (m_dataAwareObject->isSortingEnabled()) { - plugSharedAction("data_sort_az", TQT_TQOBJECT(this), TQT_SLOT(sortAscending())); - plugSharedAction("data_sort_za", TQT_TQOBJECT(this), TQT_SLOT(sortDescending())); + plugSharedAction("data_sort_az", this, TQT_SLOT(sortAscending())); + plugSharedAction("data_sort_za", this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(???())); +//! \todo plugSharedAction("data_filter", this, TQT_SLOT(???())); - plugSharedAction("data_go_to_first_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToFirstRow())); - plugSharedAction("data_go_to_previous_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToPreviusRow())); - plugSharedAction("data_go_to_next_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToNextRow())); - plugSharedAction("data_go_to_last_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToLastRow())); - plugSharedAction("data_go_to_new_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToNewRow())); + 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())); //! \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", TQT_TQOBJECT(this), TQT_SLOT(copySelection())); + plugSharedAction("edit_copy", this, TQT_SLOT(copySelection())); m_actionClient->plugSharedAction(sharedAction("edit_copy")); //for proper shortcut - plugSharedAction("edit_cut", TQT_TQOBJECT(this), TQT_SLOT(cutSelection())); + plugSharedAction("edit_cut", this, TQT_SLOT(cutSelection())); m_actionClient->plugSharedAction(sharedAction("edit_cut")); //for proper shortcut - plugSharedAction("edit_paste", TQT_TQOBJECT(this), TQT_SLOT(paste())); + plugSharedAction("edit_paste", this, TQT_SLOT(paste())); m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut -// plugSharedAction("edit_find", TQT_TQOBJECT(this), TQT_SLOT(editFind())); +// plugSharedAction("edit_find", this, TQT_SLOT(editFind())); // m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut -// plugSharedAction("edit_findnext", TQT_TQOBJECT(this), TQT_SLOT(editFindNext())); +// plugSharedAction("edit_findnext", this, TQT_SLOT(editFindNext())); // m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut -// plugSharedAction("edit_findprevious", TQT_TQOBJECT(this), TQT_SLOT(editFindPrevious())); +// plugSharedAction("edit_findprevious", this, TQT_SLOT(editFindPrevious())); // m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut -//! @todo plugSharedAction("edit_replace", TQT_TQOBJECT(this), TQT_SLOT(editReplace())); +//! @todo plugSharedAction("edit_replace", this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(filter()), actionCollection(), "tablepart_filter"); + new TDEAction(i18n("Filter"), "filter", 0, this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(deleteAllRows())); + plugSharedAction("edit_clear_table", this, TQT_SLOT(deleteAllRows())); if (m_dataAwareObject->isEmptyRowInsertingEnabled()) { unplugSharedAction("edit_insert_empty_row"); - plugSharedAction("edit_insert_empty_row", TQT_TQOBJECT(m_internalView), TQT_SLOT(insertEmptyRow())); + plugSharedAction("edit_insert_empty_row", m_internalView, TQT_SLOT(insertEmptyRow())); if (separatorNeeded) m_dataAwareObject->contextMenu()->insertSeparator(); plugSharedAction("edit_insert_empty_row", m_dataAwareObject->contextMenu()); diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 5df84c96..01000882 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -102,7 +102,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na layout = new TQVBoxLayout(fr); layout->setMargin( 2 ); - d->doc = KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr)); + d->doc = KTextEditor::EditorChooser::createDocument(fr); if (!d->doc) return; d->view = d->doc->createView(fr, 0L); @@ -118,7 +118,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na connect(d->doc, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged())); #endif - KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view)); + KexiEditorSharedActionConnector c(this, d->view); d->view->installEventFilter(this); layout->addWidget(d->view); diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index ceb2aa41..875425de 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -243,7 +243,7 @@ void KexiFieldComboBox::focusOutEvent( TQFocusEvent *e ) { KComboBox::focusOutEvent( e ); // accept changes if the focus is moved - if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) //(a check needed because drop-down listbox also causes a focusout) + if (!KexiUtils::hasParent(this, focusWidget())) //(a check needed because drop-down listbox also causes a focusout) slotReturnPressed(currentText()); } diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 1176b793..7ff39106 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -104,7 +104,7 @@ bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e ) if (o == d->lbl && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) { if (d->lyr->view) d->lyr->view->setFocus(); -// if (KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) { +// if (KexiUtils::hasParent( this, o)) { // d->lbl->setPaletteBackgroundColor( e->type()==TQEvent::FocusIn ? red : blue); // } } diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 94d81348..e3a2e8b2 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()), TQT_TQOBJECT(this), TQT_SLOT(slotAddTable())); + connect(m_btnAdd, TQT_SIGNAL(clicked()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); + connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu())); m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopupTitleID = m_connectionPopup->insertTitle(""); - connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); + connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu())); m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("document-open"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(openSelectedTable()), TQT_TQOBJECT(this), "relationsview_openTable"); + this, TQT_SLOT(openSelectedTable()), this, "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(designSelectedTable()), TQT_TQOBJECT(this), "relationsview_designTable"); + this, TQT_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",TQT_TQOBJECT(this), TQT_SLOT(removeSelectedObject())); + plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); connect(m_relationView, TQT_SIGNAL(tableViewGotFocus()), - TQT_TQOBJECT(this), TQT_SLOT(tableViewGotFocus())); + this, TQT_SLOT(tableViewGotFocus())); connect(m_relationView, TQT_SIGNAL(connectionViewGotFocus()), - TQT_TQOBJECT(this), TQT_SLOT(connectionViewGotFocus())); + this, TQT_SLOT(connectionViewGotFocus())); connect(m_relationView, TQT_SIGNAL(emptyAreaGotFocus()), - TQT_TQOBJECT(this), TQT_SLOT(emptyAreaGotFocus())); + this, TQT_SLOT(emptyAreaGotFocus())); connect(m_relationView, TQT_SIGNAL(tableContextMenuRequest( const TQPoint& )), - TQT_TQOBJECT(this), TQT_SLOT(tableContextMenuRequest( const TQPoint& ))); + this, TQT_SLOT(tableContextMenuRequest( const TQPoint& ))); connect(m_relationView, TQT_SIGNAL(connectionContextMenuRequest( const TQPoint& )), - TQT_TQOBJECT(this), TQT_SLOT(connectionContextMenuRequest( const TQPoint& ))); + this, TQT_SLOT(connectionContextMenuRequest( const TQPoint& ))); connect(m_relationView, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)), - TQT_TQOBJECT(this), TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); + this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); connect(m_relationView, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), - TQT_TQOBJECT(this), TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); + this, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); connect(m_relationView, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), - TQT_TQOBJECT(this), TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); + this, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); #if 0 if(!embedd) @@ -172,7 +172,7 @@ KexiRelationWidget::addTable(KexiDB::TableSchema *t, const TQRect &rect) if (!c) return; connect(c->tableView(), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_TQOBJECT(this), TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); + this, TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); } const TQString tname = t->name().lower(); diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index dbb89f5d..11ff828d 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -102,10 +102,10 @@ class KexiTableView::WhatsThis : public TQWhatsThis const int leftMargin = m_tv->verticalHeaderVisible() ? m_tv->verticalHeader()->width() : 0; //const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0; //const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0; - if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->childAt(pos)))) { + if (KexiUtils::hasParent(m_tv->verticalHeader(), m_tv->childAt(pos))) { return i18n("Contains a pointer to the currently selected row"); } - else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) { + else if (KexiUtils::hasParent(m_tv->m_navPanel, m_tv->childAt(pos))) { return i18n("Row navigator"); // return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin )); } @@ -1264,7 +1264,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) TQWidget *w = focusWidget(); // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) { // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) { - if (!w || w!=viewport() && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQObject*>(m_editor)), TQT_TQOBJECT(w)))) { + if (!w || w!=viewport() && w!=this && (!m_editor || !KexiUtils::hasParent(dynamic_cast<TQObject*>(m_editor), w))) { //don't process stranger's events e->ignore(); return; @@ -2478,8 +2478,8 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) } /* else if (e->type()==TQEvent::FocusOut && o->inherits("TQWidget")) { //hp==true if currently focused widget is a child of this table view - const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget()); - if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) { + const bool hp = KexiUtils::hasParent( o, focusWidget()); + if (!hp && KexiUtils::hasParent( this, o)) { //accept row editing if focus is moved to foreign widget //(not a child, like eg. editor) from one of our table view's children //or from table view itself diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index f52ff7d5..e127bea6 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -63,20 +63,20 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) insertTitle(TQString()); d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("document-open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); + this, TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); d->insertFromFileAction->plug(this); - d->saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), &d->actionCollection); + d->saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), &d->actionCollection); // d->saveAsAction->setText(i18n("&Save &As...")); d->saveAsAction->plug(this); insertSeparator(); - d->cutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), &d->actionCollection); + d->cutAction = KStdAction::cut(this, TQT_SLOT(cut()), &d->actionCollection); d->cutAction->plug(this); - d->copyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), &d->actionCollection); + d->copyAction = KStdAction::copy(this, TQT_SLOT(copy()), &d->actionCollection); d->copyAction->plug(this); - d->pasteAction = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), &d->actionCollection); + d->pasteAction = KStdAction::paste(this, TQT_SLOT(paste()), &d->actionCollection); d->pasteAction->plug(this); d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("edit-delete"), 0, - TQT_TQOBJECT(this), TQT_SLOT(clear()), &d->actionCollection, "delete"); + this, TQT_SLOT(clear()), &d->actionCollection, "delete"); d->deleteAction->plug(this); #ifdef KEXI_NO_UNFINISHED d->propertiesAction = 0; diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index f009bd43..4aa7341c 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -225,7 +225,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { if ( object == this ) { if ( event->type() == TQEvent::ChildInserted ) { child = dynamic_cast<TQWidget*>( dynamic_cast<TQChildEvent*>( event )->child() ); - if ( isValidChildWidget( TQT_TQOBJECT(child) ) == false ) { + if ( isValidChildWidget( child ) == false ) { return false; } /** diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 334c605a..5e3cfae8 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -106,7 +106,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const m_navRecordNumber->setFocusPolicy(TQWidget::ClickFocus); m_navRecordNumber->installEventFilter(this); // m_navRowNumber->setFixedWidth(fw); - m_navRecordNumberValidator = new TQIntValidator(1, INT_MAX, TQT_TQOBJECT(this)); + m_navRecordNumberValidator = new TQIntValidator(1, INT_MAX, this); m_navRecordNumber->setValidator(m_navRecordNumberValidator); m_navRecordNumber->installEventFilter(this); TQToolTip::add(m_navRecordNumber, i18n("Current row number")); diff --git a/kformula/kformula_view.cpp b/kformula/kformula_view.cpp index 1c7e044c..baa244a4 100644 --- a/kformula/kformula_view.cpp +++ b/kformula/kformula_view.cpp @@ -83,7 +83,7 @@ KFormulaPartView::KFormulaPartView(KFormulaDoc* _doc, TQWidget* _parent, const c copyAction->setEnabled(false); // tip of the day - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQT_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(TQT_TQOBJECT(formulaWidget), TQT_SLOT(slotSelectAll()), actionCollection()); + (void) KStdAction::selectAll(formulaWidget, TQT_SLOT(slotSelectAll()), actionCollection()); //------------------------ Settings menu - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection(), "configure" ); + KStdAction::preferences( this, TQT_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& ) ), TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString& ) ) ); +// connect( actionElement_Text_Font, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_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 ) ), TQT_TQOBJECT(this), TQT_SLOT( sizeSelected( int ) ) ); + connect( actionTextSize, TQT_SIGNAL( fontSizeChanged( int ) ), this, TQT_SLOT( sizeSelected( int ) ) ); connect( formula, TQT_SIGNAL( baseSizeChanged( int ) ), actionTextSize, TQT_SLOT( setFontSize( int ) ) ); // TDEToggleAction* actionElement_Text_Bold = new TDEToggleAction(i18n( "Bold" ), // "bold", // 0, // actionCollection(),"textbold"); -// connect( actionElement_Text_Bold, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( bold( bool ) ) ); +// connect( actionElement_Text_Bold, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( bold( bool ) ) ); // TDEToggleAction* actionElement_Text_Italic = new TDEToggleAction(i18n( "Italic" ), // "italic", // 0, // actionCollection(),"textitalic"); -// connect( actionElement_Text_Italic, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( italic( bool ) ) ); +// connect( actionElement_Text_Italic, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( italic( bool ) ) ); // TDEToggleAction* actionElement_Text_Under = new TDEToggleAction(i18n( "Underlined" ), // "underl", // 0, // actionCollection(),"textunder"); -// connect(actionElement_Text_Under, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( underline( bool ) ) ); +// connect(actionElement_Text_Under, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( underline( bool ) ) ); formulaStringAction = new TDEAction( i18n( "Edit Formula String..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( formulaString() ), + this, TQT_SLOT( formulaString() ), actionCollection(), "formula_formulastring" ); // notify on cursor change connect(formulaWidget, TQT_SIGNAL(cursorChanged(bool, bool)), - TQT_TQOBJECT(this), TQT_SLOT(cursorChanged(bool, bool))); + this, TQT_SLOT(cursorChanged(bool, bool))); connect( formula, TQT_SIGNAL( statusMsg( const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotActionStatusText( const TQString& ) ) ); + this, TQT_SLOT( slotActionStatusText( const TQString& ) ) ); if ( !_doc->isEmbedded() && first_window ) { - TQTimer::singleShot( 200, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) ); first_window = false; } } diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index d06bc5f0..a64bb9ce 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()), TQT_TQOBJECT(this), TQT_SLOT(initStatusBarProgress())); - connect(m_pDoc, TQT_SIGNAL(progress(int)), TQT_TQOBJECT(this), TQT_SLOT(setStatusBarProgress(int))); - connect(m_pDoc, TQT_SIGNAL(endProgress()), TQT_TQOBJECT(this), TQT_SLOT(removeStatusBarProgress())); + 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())); bool isModified = doc->isModified(); m_pStencilBarDockManager = new StencilBarDockManager(this); @@ -197,7 +197,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) 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)), TQT_TQOBJECT(this), TQT_SLOT(moveTab(unsigned, unsigned))); + connect(m_pTabBar, TQT_SIGNAL(tabMoved(unsigned, unsigned)), this, TQT_SLOT(moveTab(unsigned, unsigned))); m_pTabBar->setReverseLayout( TQApplication::reverseLayout() ); // Scroll Bar @@ -257,8 +257,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) TQWidget::setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( m_pCanvas ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) ); + 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 ) ) ); setInstance(KivioFactory::global()); if ( !m_pDoc->isReadWrite() ) @@ -294,7 +294,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) connect( m_pDoc, TQT_SIGNAL( sig_updateGrid()),TQT_SLOT(slotUpdateGrid())); - connect(m_pDoc, TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(loadingFinished())); + connect(m_pDoc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(loadingFinished())); initActions(); @@ -341,8 +341,8 @@ void KivioView::createGeometryDock() m_pStencilGeometryPanel->setUnit(m_pDoc->unit()); paletteManager()->addWidget(m_pStencilGeometryPanel, "stencilgeometrypanel", "geometrydocker"); - connect( m_pStencilGeometryPanel, TQT_SIGNAL(positionChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilPosition(double, double)) ); - connect( m_pStencilGeometryPanel, TQT_SIGNAL(sizeChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilSize(double, double)) ); + 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_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), m_pStencilGeometryPanel, TQT_SLOT(setUnit(KoUnit::Unit)) ); @@ -381,35 +381,35 @@ 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(TQT_TQOBJECT(this), TQT_SIGNAL(updateStencilSetList()), addStSet, TQT_SLOT(updateMenu())); - connect(addStSet, TQT_SIGNAL(showDialog()), TQT_TQOBJECT(this), TQT_SLOT(showAddStencilSetDialog())); + connect(this, TQT_SIGNAL(updateStencilSetList()), addStSet, TQT_SLOT(updateMenu())); + connect(addStSet, TQT_SIGNAL(showDialog()), this, TQT_SLOT(showAddStencilSetDialog())); - m_alignAndDistribute = new TDEAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, TQT_TQOBJECT(this), + m_alignAndDistribute = new TDEAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, this, TQT_SLOT(alignStencilsDlg()), actionCollection(), "alignStencils" ); - m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" ); - m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" ); - m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" ); - connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); + 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_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); - m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); + m_selectAll = KStdAction::selectAll(this, TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); + m_selectNone = KStdAction::deselect(this, TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); - m_groupAction = new TDEAction( i18n("Group Selection"), "group", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(groupStencils()), actionCollection(), "groupStencils" ); + m_groupAction = new TDEAction( i18n("Group Selection"), "group", CTRL+Key_G, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" ); + m_ungroupAction = new TDEAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" ); - m_stencilToBack = new TDEAction( i18n("Send to Back"), "send_backward", 0, TQT_TQOBJECT(this), TQT_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" ); + 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_menuTextFormatAction = new TDEAction(i18n("&Text..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(textFormat()), + m_menuTextFormatAction = new TDEAction(i18n("&Text..."), 0, 0, this, TQT_SLOT(textFormat()), actionCollection(), "textFormat"); - m_menuStencilConnectorsAction = new TDEAction(i18n("&Stencils && Connectors..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(stencilFormat()), + m_menuStencilConnectorsAction = new TDEAction(i18n("&Stencils && Connectors..."), 0, 0, this, TQT_SLOT(stencilFormat()), actionCollection(), "stencilFormat"); - m_arrowHeadsMenuAction = new TDEAction(i18n("&Arrowheads..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(arrowHeadFormat()), + m_arrowHeadsMenuAction = new TDEAction(i18n("&Arrowheads..."), 0, 0, this, TQT_SLOT(arrowHeadFormat()), actionCollection(), "arrowHeadFormat"); m_arrowHeadsMenuAction->setWhatsThis(i18n("Arrowheads allow you to add an arrow to the beginning and/or end of a line.")); @@ -427,7 +427,7 @@ void KivioView::setupActions() m_setFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "setFontSize" ); connect( m_setFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( setFontSize(int ) ) ); + this, TQT_SLOT( setFontSize(int ) ) ); m_setTextColor = new TTDESelectColorAction( i18n("Text Color"), TTDESelectColorAction::TextColor, actionCollection(), "setTextColor" ); @@ -443,43 +443,43 @@ void KivioView::setupActions() connect( m_setUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontUnderline(bool))); m_textAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", CTRL + Key_L, - TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), + this, TQT_SLOT( textAlignLeft() ), actionCollection(), "textAlignLeft" ); m_textAlignLeft->setExclusiveGroup( "align" ); m_textAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", CTRL + ALT + Key_C, - TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), + this, TQT_SLOT( textAlignRight() ), actionCollection(), "textAlignRight" ); m_textAlignRight->setExclusiveGroup( "align" ); m_textVAlignSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), + this, TQT_SLOT( textSuperScript() ), actionCollection(), "textVAlignSuper" ); m_textVAlignSuper->setExclusiveGroup( "valign" ); m_textVAlignSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), + this, TQT_SLOT( textSubScript() ), actionCollection(), "textVAlignSub" ); m_textVAlignSub->setExclusiveGroup( "valign" ); - m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", TQT_TQOBJECT(this), TQT_SLOT(setLineWidth(double)), + m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", this, TQT_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))); - m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", TQT_TQOBJECT(this), TQT_SLOT(setLineStyle(int)), + m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", this, TQT_SLOT(setLineStyle(int)), actionCollection(), "setLineStyle"); - m_paperLayout = new TDEAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(this), TQT_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" ); - m_insertPage = new TDEAction( i18n("Insert Page"),"item_add", 0, TQT_TQOBJECT(this), TQT_SLOT(insertPage()), actionCollection(), "insertPage" ); - m_removePage = new TDEAction( i18n("Remove Page"), "item_remove",0,TQT_TQOBJECT(this), TQT_SLOT(removePage()), actionCollection(), "removePage" ); + 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_renamePage = new TDEAction( i18n("Rename Page..."), "item_rename",0,TQT_TQOBJECT(this), TQT_SLOT(renamePage()), actionCollection(), "renamePage" ); + m_renamePage = new TDEAction( i18n("Rename Page..."), "item_rename",0,this, TQT_SLOT(renamePage()), actionCollection(), "renamePage" ); - m_showPage = new TDEAction( i18n("Show Page..."),0 ,TQT_TQOBJECT(this),TQT_SLOT(showPage()), actionCollection(), "showPage" ); - m_hidePage = new TDEAction( i18n("Hide Page"),0 ,TQT_TQOBJECT(this),TQT_SLOT(hidePage()), actionCollection(), "hidePage" ); + 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" ); showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "showPageMargins" ); connect( showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool))); @@ -506,7 +506,7 @@ void KivioView::setupActions() // 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, TQT_TQOBJECT(this), TQT_SLOT(addGuideLine()), + TDEAction* addGuide = new TDEAction(i18n("Add Guide Line..."), 0, this, TQT_SLOT(addGuideLine()), actionCollection(), "addGuideLine"); connect(showGuides, TQT_SIGNAL(toggled(bool)), addGuide, TQT_SLOT(setEnabled(bool))); //-- @@ -516,13 +516,13 @@ void KivioView::setupActions() connect( m_setArrowHeads, TQT_SIGNAL(endChanged(int)), TQT_SLOT(slotSetEndArrow(int))); connect( m_setArrowHeads, TQT_SIGNAL(startChanged(int)), TQT_SLOT(slotSetStartArrow(int))); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsDialog()), actionCollection(), "options"); + KStdAction::preferences(this, TQT_SLOT(optionsDialog()), actionCollection(), "options"); - (void) new TDEAction(i18n("Install Stencil Set..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction(i18n("Install Stencil Set..."), 0, this, TQT_SLOT(installStencilSet()), actionCollection(), "installStencilSet"); m_editDelete = new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(deleteObject()), actionCollection(), "deleteObject"); + this, TQT_SLOT(deleteObject()), actionCollection(), "deleteObject"); } void KivioView::initActions() @@ -587,9 +587,9 @@ void KivioView::addPage( KivioPage* page ) insertPage( page ); TQObject::connect( page, TQT_SIGNAL( sig_PageHidden( KivioPage* ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotPageHidden( KivioPage* ) ) ); + this, TQT_SLOT( slotPageHidden( KivioPage* ) ) ); TQObject::connect( page, TQT_SIGNAL( sig_PageShown( KivioPage* ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotPageShown( KivioPage* ) ) ); + this, TQT_SLOT( slotPageShown( KivioPage* ) ) ); updatePageStatusLabel(); } @@ -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&)), TQT_TQOBJECT(this), TQT_SLOT(addStencilSet(const TQString&))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateStencilSetList()), m_addStencilSetDialog, TQT_SLOT(updateList())); + connect(m_addStencilSetDialog, TQT_SIGNAL(addStencilSet(const TQString&)), this, TQT_SLOT(addStencilSet(const TQString&))); + connect(this, TQT_SIGNAL(updateStencilSetList()), m_addStencilSetDialog, TQT_SLOT(updateList())); } m_addStencilSetDialog->show(); diff --git a/kivio/kiviopart/tools/kivio_plugin.cpp b/kivio/kiviopart/tools/kivio_plugin.cpp index 7e227fb1..01e06906 100644 --- a/kivio/kiviopart/tools/kivio_plugin.cpp +++ b/kivio/kiviopart/tools/kivio_plugin.cpp @@ -21,7 +21,7 @@ #include "kivio_factory.h" namespace Kivio { - Plugin::Plugin(KivioView* parent, const char* name) : KParts::Plugin(TQT_TQOBJECT(parent), name) + Plugin::Plugin(KivioView* parent, const char* name) : KParts::Plugin(parent, name) { setInstance(KivioFactory::global()); } diff --git a/kivio/kiviopart/tools/kivio_plugin.h b/kivio/kiviopart/tools/kivio_plugin.h index 0fa2327e..74fc9b91 100644 --- a/kivio/kiviopart/tools/kivio_plugin.h +++ b/kivio/kiviopart/tools/kivio_plugin.h @@ -35,7 +35,7 @@ namespace Kivio { Plugin(KivioView* parent = 0, const char* name = 0); ~Plugin(); - KivioView* view() { return static_cast<KivioView*>(TQT_TQWIDGET(parent())); } + KivioView* view() { return static_cast<KivioView*>(parent()); } }; } diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index f1cccd78..f7803dd6 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, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this)); - actDel = new TDEAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this)); - actRename = new TDEAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this)); - actUp = new TDEAction( i18n("Move Layer Up"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this)); - actDown = new TDEAction( i18n("Move Layer Down"), "go-down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(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->plug(bar); actDel->plug(bar); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index e1623d9c..cd0f2953 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -101,7 +101,7 @@ void KivioOptionsDialog::initPage() kapp->iconLoader()->loadIcon("application-x-zerosize", TDEIcon::Toolbar, 32)); m_pageIndex = pageIndex(page); - KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent())); + KivioView* view = static_cast<KivioView*>(parent()); KoUnit::Unit unit = KoUnit::unit(Kivio::Config::unit()); m_layout = Kivio::Config::defaultPageLayout(); m_font = Kivio::Config::font(); @@ -158,8 +158,8 @@ void KivioOptionsDialog::initGrid() TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", TDEIcon::SizeMedium )); m_gridIndex = pageIndex(page); - KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->unit(); - KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->grid(); + KoUnit::Unit unit = static_cast<KivioView*>(parent())->doc()->unit(); + KivioGridData d = static_cast<KivioView*>(parent())->doc()->grid(); double pgw = m_layout.ptWidth; double pgh = m_layout.ptHeight; double fw = Kivio::Config::gridXSpacing(); @@ -210,7 +210,7 @@ void KivioOptionsDialog::initGrid() void KivioOptionsDialog::applyPage() { - KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent())); + KivioView* view = static_cast<KivioView*>(parent()); view->doc()->setUnit(static_cast<KoUnit::Unit>(m_unitCombo->currentItem())); Kivio::Config::setUnit(KoUnit::unitName(view->doc()->unit())); Kivio::Config::setDefaultPageLayout(m_layout); @@ -230,7 +230,7 @@ void KivioOptionsDialog::applyGrid() Kivio::Config::setShowGrid(m_gridChBox->isChecked()); Kivio::Config::setSnapGrid(m_snapChBox->isChecked()); Kivio::Config::setGridColor(m_gridColorBtn->color()); - KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent())); + KivioView* view = static_cast<KivioView*>(parent()); view->doc()->updateView(0); } diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 536ab660..8111869e 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -183,7 +183,7 @@ void KivioTextFormatDlg::setTextColor(TQColor c) void KivioTextFormatDlg::slotDefault() { - setFont((static_cast<KivioView*>(TQT_TQWIDGET(parent())))->doc()->defaultFont()); + setFont((static_cast<KivioView*>(parent()))->doc()->defaultFont()); setTextColor(TQColor(0, 0, 0)); setHAlign(TQt::AlignHCenter); setVAlign(TQt::AlignVCenter); diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index 50cdecc7..dd8ce7b9 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -59,9 +59,9 @@ SelectTool::SelectTool( KivioView* parent ) : Kivio::MouseTool(parent, "Selectio 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, TQT_TQOBJECT(view()), TQT_SLOT(stencilFormat()), + (void) new TDEAction(i18n("Format &Stencils && Connectors..."), 0, 0, view(), TQT_SLOT(stencilFormat()), actionCollection(), "formatStencil"); - m_arrowHeadAction = new TDEAction(i18n("Format &Arrowheads..."), 0, 0, TQT_TQOBJECT(view()), TQT_SLOT(arrowHeadFormat()), + m_arrowHeadAction = new TDEAction(i18n("Format &Arrowheads..."), 0, 0, view(), TQT_SLOT(arrowHeadFormat()), actionCollection(), "formatConnector"); m_mode = stmNone; diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp index ebc5075f..46c0cc40 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp +++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp @@ -40,7 +40,7 @@ TQObject* KivioTargetToolFactory::createObject( TQObject* parent, const char*, c if ( !parent->inherits("KivioView") ) return 0; - TQObject *obj = new Kivio::TargetTool(static_cast<KivioView*>(TQT_TQWIDGET(parent))); + TQObject *obj = new Kivio::TargetTool(static_cast<KivioView*>(parent)); return obj; } diff --git a/koshell/koshell_shell.cpp b/koshell/koshell_shell.cpp index aaff3c02..b3cbef71 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, TQT_TQOBJECT(this), TQT_SLOT( slotSidebar_Part(int ))); - m_grpDocuments = m_pSidebar->insertGroup(i18n("Documents"), true, TQT_TQOBJECT(this), TQT_SLOT(slotSidebar_Document(int))); + 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_pLayout->setResizeMode(m_pSidebar,TQSplitter::FollowSizeHint); // Setup the tabbar @@ -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, TQT_TQOBJECT(window), TQT_SLOT( saveAll() ), actionCollection(), "save_all" ); + window->mnuSaveAll = new TDEAction( i18n("Save All"), 0, window, TQT_SLOT( saveAll() ), actionCollection(), "save_all" ); window->mnuSaveAll->setEnabled(false); - window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, TQT_TQOBJECT(window), TQT_SLOT(showPartSpecificHelp()), + window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, window, TQT_SLOT(showPartSpecificHelp()), actionCollection(), "partSpecificHelp"); window->partSpecificHelpAction->setEnabled(false); } diff --git a/kplato/kptdatetable.cpp b/kplato/kptdatetable.cpp index 0f07b748..5c10eb0b 100644 --- a/kplato/kptdatetable.cpp +++ b/kplato/kptdatetable.cpp @@ -42,7 +42,7 @@ namespace KPlato { DateValidator::DateValidator(TQWidget* parent, const char* name) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { } @@ -715,7 +715,7 @@ void DateTable::markSelected(int state) { DateInternalWeekSelector::DateInternalWeekSelector (int fontsize, TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -927,7 +927,7 @@ DateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) DateInternalYearSelector::DateInternalYearSelector (int fontsize, TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; diff --git a/kplato/kptdurationwidget.ui.h b/kplato/kptdurationwidget.ui.h index 087b539e..11eea601 100644 --- a/kplato/kptdurationwidget.ui.h +++ b/kplato/kptdurationwidget.ui.h @@ -103,7 +103,7 @@ void DurationWidget::init() TQRegExp re(TQString("\\d{1,10}|\\d{1,7}\\") + m_decimalPoint + TQString("\\d{0,10}|\\d{0,7}\\") + m_decimalPoint + TQString("\\d{1,3}")); - m_validator = new TQRegExpValidator(re, TQT_TQOBJECT(this)); + m_validator = new TQRegExpValidator(re, this); m_ddd->setValidator(m_validator); m_hh->setValidator(m_validator); m_mm->setValidator(m_validator); diff --git a/kplato/kptpertcanvas.cpp b/kplato/kptpertcanvas.cpp index 55e8c36e..0a9e8c87 100644 --- a/kplato/kptpertcanvas.cpp +++ b/kplato/kptpertcanvas.cpp @@ -56,7 +56,7 @@ PertCanvas::PertCanvas( TQWidget *parent ) { //setHScrollBarMode(TQScrollView::AlwaysOn); - m_canvas = new TQCanvas( TQT_TQOBJECT(this) ); + m_canvas = new TQCanvas( this ); setCanvas( m_canvas ); } diff --git a/kplato/kptview.cpp b/kplato/kptview.cpp index 519de080..7f4d62b2 100644 --- a/kplato/kptview.cpp +++ b/kplato/kptview.cpp @@ -144,7 +144,7 @@ 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 *)), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShow(TQWidget *))); + connect(m_tab, TQT_SIGNAL(aboutToShow(TQWidget *)), this, TQT_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*))); @@ -154,83 +154,83 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) 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&)),TQT_TQOBJECT(this), TQT_SLOT(slotRenameNode(Node*, const TQString&))); - connect(m_ganttview, TQT_SIGNAL(requestPopupMenu(const TQString&, const TQPoint &)),TQT_TQOBJECT(this), TQT_SLOT(slotPopupMenu(const TQString&, const TQPoint&))); + 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())); // The menu items // ------ Edit - actionCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotEditCut() ), actionCollection(), "edit_cut" ); - actionCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotEditCopy() ), actionCollection(), "edit_copy" ); - actionPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotEditPaste() ), actionCollection(), "edit_paste" ); + 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" ); - actionIndentTask = new TDEAction(i18n("Indent Task"), "indent_task", 0, TQT_TQOBJECT(this), + actionIndentTask = new TDEAction(i18n("Indent Task"), "indent_task", 0, this, TQT_SLOT(slotIndentTask()), actionCollection(), "indent_task"); - actionUnindentTask = new TDEAction(i18n("Unindent Task"), "unindent_task", 0, TQT_TQOBJECT(this), + actionUnindentTask = new TDEAction(i18n("Unindent Task"), "unindent_task", 0, this, TQT_SLOT(slotUnindentTask()), actionCollection(), "unindent_task"); - actionMoveTaskUp = new TDEAction(i18n("Move Up"), "move_task_up", 0, TQT_TQOBJECT(this), + actionMoveTaskUp = new TDEAction(i18n("Move Up"), "move_task_up", 0, this, TQT_SLOT(slotMoveTaskUp()), actionCollection(), "move_task_up"); - actionMoveTaskDown = new TDEAction(i18n("Move Down"), "move_task_down", 0, TQT_TQOBJECT(this), + actionMoveTaskDown = new TDEAction(i18n("Move Down"), "move_task_down", 0, this, TQT_SLOT(slotMoveTaskDown()), actionCollection(), "move_task_down"); // ------ View - actionViewGantt = new TDEAction(i18n("Gantt"), "gantt_chart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGantt()), actionCollection(), "view_gantt"); + actionViewGantt = new TDEAction(i18n("Gantt"), "gantt_chart", 0, this, TQT_SLOT(slotViewGantt()), actionCollection(), "view_gantt"); TQString group = "EstimationType"; - actionViewExpected = new TDERadioAction(i18n("Expected"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewExpected()), actionCollection(), "view_expected"); + actionViewExpected = new TDERadioAction(i18n("Expected"), 0, 0, this, TQT_SLOT(slotViewExpected()), actionCollection(), "view_expected"); actionViewExpected->setExclusiveGroup(group); - actionViewOptimistic = new TDERadioAction(i18n("Optimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewOptimistic()), actionCollection(), "view_optimistic"); + actionViewOptimistic = new TDERadioAction(i18n("Optimistic"), 0, 0, this, TQT_SLOT(slotViewOptimistic()), actionCollection(), "view_optimistic"); actionViewOptimistic->setExclusiveGroup(group); - actionViewPessimistic = new TDERadioAction(i18n("Pessimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPessimistic()), actionCollection(), "view_pessimistic"); + actionViewPessimistic = new TDERadioAction(i18n("Pessimistic"), 0, 0, this, TQT_SLOT(slotViewPessimistic()), actionCollection(), "view_pessimistic"); actionViewPessimistic->setExclusiveGroup(group); - actionViewGanttResources = new TDEToggleAction(i18n("Resources"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttResources()), actionCollection(), "view_gantt_showResources"); - actionViewGanttTaskName = new TDEToggleAction(i18n("Task Name"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttTaskName()), actionCollection(), "view_gantt_showTaskName"); - actionViewGanttTaskLinks = new TDEToggleAction(i18n("Task Links"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttTaskLinks()), actionCollection(), "view_gantt_showTaskLinks"); - actionViewGanttProgress = new TDEToggleAction(i18n("Progress"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttProgress()), actionCollection(), "view_gantt_showProgress"); - actionViewGanttFloat = new TDEToggleAction(i18n("Float"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttFloat()), actionCollection(), "view_gantt_showFloat"); - actionViewGanttCriticalTasks = new TDEToggleAction(i18n("Critical Tasks"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttCriticalTasks()), actionCollection(), "view_gantt_showCriticalTasks"); - actionViewGanttCriticalPath = new TDEToggleAction(i18n("Critical Path"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttCriticalPath()), actionCollection(), "view_gantt_showCriticalPath"); + 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"); -// actionViewGanttNotScheduled = new TDEToggleAction(i18n("Not Scheduled"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled"); +// actionViewGanttNotScheduled = new TDEToggleAction(i18n("Not Scheduled"), 0, 0, this, TQT_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled"); - actionViewTaskAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments"); + actionViewTaskAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQT_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments"); - actionViewPert = new TDEAction(i18n("Network"), "pert_chart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPert()), actionCollection(), "view_pert"); + actionViewPert = new TDEAction(i18n("Network"), "pert_chart", 0, this, TQT_SLOT(slotViewPert()), actionCollection(), "view_pert"); - actionViewResources = new TDEAction(i18n("Resources"), "resources", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewResources()), actionCollection(), "view_resources"); + actionViewResources = new TDEAction(i18n("Resources"), "resources", 0, this, TQT_SLOT(slotViewResources()), actionCollection(), "view_resources"); - actionViewResourceAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewResourceAppointments()), actionCollection(), "view_resource_appointments"); + actionViewResourceAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQT_SLOT(slotViewResourceAppointments()), actionCollection(), "view_resource_appointments"); - actionViewAccounts = new TDEAction(i18n("Accounts"), "accounts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewAccounts()), actionCollection(), "view_accounts"); + actionViewAccounts = new TDEAction(i18n("Accounts"), "accounts", 0, this, TQT_SLOT(slotViewAccounts()), actionCollection(), "view_accounts"); - //actionViewReports = new TDEAction(i18n("Reports"), "reports", 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewReports()), actionCollection(), "view_reports"); + //actionViewReports = new TDEAction(i18n("Reports"), "reports", 0, this, TQT_SLOT(slotViewReports()), actionCollection(), "view_reports"); // ------ Insert - actionAddTask = new TDEAction(i18n("Task..."), "add_task", 0, TQT_TQOBJECT(this), + actionAddTask = new TDEAction(i18n("Task..."), "add_task", 0, this, TQT_SLOT(slotAddTask()), actionCollection(), "add_task"); - actionAddSubtask = new TDEAction(i18n("Sub-Task..."), "add_sub_task", 0, TQT_TQOBJECT(this), + actionAddSubtask = new TDEAction(i18n("Sub-Task..."), "add_sub_task", 0, this, TQT_SLOT(slotAddSubTask()), actionCollection(), "add_sub_task"); - actionAddMilestone = new TDEAction(i18n("Milestone..."), "add_milestone", 0, TQT_TQOBJECT(this), + actionAddMilestone = new TDEAction(i18n("Milestone..."), "add_milestone", 0, this, TQT_SLOT(slotAddMilestone()), actionCollection(), "add_milestone"); // ------ Project - actionEditMainProject = new TDEAction(i18n("Edit Main Project..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectEdit()), actionCollection(), "project_edit"); - actionEditStandardWorktime = new TDEAction(i18n("Edit Standard Worktime..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectWorktime()), actionCollection(), "project_worktime"); - actionEditCalendar = new TDEAction(i18n("Edit Calendar..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalendar()), actionCollection(), "project_calendar"); - actionEditAccounts = new TDEAction(i18n("Edit Accounts..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAccounts()), actionCollection(), "project_accounts"); - actionEditResources = new TDEAction(i18n("Edit Resources..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectResources()), actionCollection(), "project_resources"); + 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"); actionCalculate = new TDEActionMenu(i18n("Calculate"), "project_calculate", actionCollection(), "project_calculate"); connect(actionCalculate, TQT_SIGNAL(activated()), TQT_SLOT(slotProjectCalculate())); - actionCalculateExpected = new TDEAction(i18n("Expected"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculateExpected()), actionCollection(), "project_calculate_expected"); + actionCalculateExpected = new TDEAction(i18n("Expected"), 0, 0, this, TQT_SLOT(slotProjectCalculateExpected()), actionCollection(), "project_calculate_expected"); actionCalculate->insert(actionCalculateExpected); - actionCalculateOptimistic = new TDEAction(i18n("Optimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculateOptimistic()), actionCollection(), "project_calculate_optimistic"); + actionCalculateOptimistic = new TDEAction(i18n("Optimistic"), 0, 0, this, TQT_SLOT(slotProjectCalculateOptimistic()), actionCollection(), "project_calculate_optimistic"); actionCalculate->insert(actionCalculateOptimistic); - actionCalculatePessimistic = new TDEAction(i18n("Pessimistic"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectCalculatePessimistic()), actionCollection(), "project_calculate_pessimistic"); + actionCalculatePessimistic = new TDEAction(i18n("Pessimistic"), 0, 0, this, TQT_SLOT(slotProjectCalculatePessimistic()), actionCollection(), "project_calculate_pessimistic"); actionCalculate->insert(actionCalculatePessimistic); /* // ------ Reports @@ -245,49 +245,49 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) m_reportview->enableNavigationBtn();*/ mainWindow()->toolBar("report")->hide(); -// new TDEAction(i18n("Design..."), "report_design", 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Design..."), "report_design", 0, this, // TQT_SLOT(slotReportDesign()), actionCollection(), "report_design"); // ------ Tools actionDefineWBS = - new TDEAction(i18n("Define WBS Pattern..."), "tools_define_wbs", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Define WBS Pattern..."), "tools_define_wbs", 0, this, TQT_SLOT(slotDefineWBS()), actionCollection(), "tools_generate_wbs"); actionGenerateWBS = - new TDEAction(i18n("Generate WBS Code"), "tools_generate_wbs", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Generate WBS Code"), "tools_generate_wbs", 0, this, TQT_SLOT(slotGenerateWBS()), actionCollection(), "tools_define_wbs"); // ------ Export (testing) - //actionExportGantt = new TDEAction(i18n("Export Ganttview"), "export_gantt", 0, TQT_TQOBJECT(this), + //actionExportGantt = new TDEAction(i18n("Export Ganttview"), "export_gantt", 0, this, // TQT_SLOT(slotExportGantt()), actionCollection(), "export_gantt"); // ------ Settings - actionConfigure = new TDEAction(i18n("Configure KPlato..."), "configure", 0, TQT_TQOBJECT(this), + actionConfigure = new TDEAction(i18n("Configure KPlato..."), "configure", 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "configure"); // ------ Popup - actionOpenNode = new TDEAction(i18n("Edit..."), "edit", 0, TQT_TQOBJECT(this), + actionOpenNode = new TDEAction(i18n("Edit..."), "edit", 0, this, TQT_SLOT(slotOpenNode()), actionCollection(), "node_properties"); - actionTaskProgress = new TDEAction(i18n("Progress..."), "edit", 0, TQT_TQOBJECT(this), + actionTaskProgress = new TDEAction(i18n("Progress..."), "edit", 0, this, TQT_SLOT(slotTaskProgress()), actionCollection(), "task_progress"); - actionDeleteTask = new TDEAction(i18n("Delete Task"), "edit-delete", 0, TQT_TQOBJECT(this), + actionDeleteTask = new TDEAction(i18n("Delete Task"), "edit-delete", 0, this, TQT_SLOT(slotDeleteTask()), actionCollection(), "delete_task"); - actionEditResource = new TDEAction(i18n("Edit Resource..."), "edit", 0, TQT_TQOBJECT(this), + actionEditResource = new TDEAction(i18n("Edit Resource..."), "edit", 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotViewGanttNoInformation()), actionCollection(), "show_noinformation"); + actNoInformation = new TDEAction("Toggle no information", CTRL+SHIFT+Key_T, this, TQT_SLOT(slotViewGanttNoInformation()), actionCollection(), "show_noinformation"); #ifndef NDEBUG - //new TDEAction("Print Debug", CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), TQT_SLOT( slotPrintDebug()), actionCollection(), "print_debug"); - new TDEAction("Print Debug", CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrintSelectedDebug()), actionCollection(), "print_debug"); - new TDEAction("Print Calendar Debug", CTRL+SHIFT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotPrintCalendarDebug()), actionCollection(), "print_calendar_debug"); -// new TDEAction("Print Test Debug", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotPrintTestDebug()), actionCollection(), "print_test_debug"); + //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"); TDEAction* actExportGantt = new TDEAction( i18n( "Export Gantt" ), CTRL+SHIFT+Key_G, - TQT_TQOBJECT(this), TQT_SLOT( slotExportGantt() ), actionCollection(), "export_gantt" ); + this, TQT_SLOT( slotExportGantt() ), actionCollection(), "export_gantt" ); #endif // Stupid compilers ;) diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index 1f8281ac..a3fdbedc 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -524,7 +524,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T double w = _origSize.width(); w *= ext.width(); #if KDE_IS_VERSION(3,1,90) - TQRect desk = TDEGlobalSettings::desktopGeometry(TQT_TQWIDGET(kapp->activeWindow())); + TQRect desk = TDEGlobalSettings::desktopGeometry(kapp->activeWindow()); #else TQRect desk = TQApplication::desktop()->screenGeometry(); #endif diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 88d54ad6..e43e3ce0 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -364,14 +364,14 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) if ( shell() ) changeNbOfRecentFiles( m_pKPresenterDoc->maxRecentFiles() ); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(embeddImage(const TQString &)), TQT_SLOT(insertPicture(const TQString &))); + connect(this, TQT_SIGNAL(embeddImage(const TQString &)), TQT_SLOT(insertPicture(const TQString &))); connect( m_pKPresenterDoc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), - TQT_TQOBJECT(this), TQT_SLOT( refreshCustomMenu())); + this, TQT_SLOT( refreshCustomMenu())); // Cut and copy are directly connected to the selectionChanged signal if ( m_pKPresenterDoc->isReadWrite() ) connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); + this, TQT_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); else actionEditCut->setEnabled( false ); @@ -389,16 +389,16 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) TQT_SLOT( tabListChanged( const KoTabulatorList & ) ) ); //statusbar stuff - connect( m_pKPresenterDoc, TQT_SIGNAL( pageNumChanged() ), TQT_TQOBJECT(this), TQT_SLOT( pageNumChanged()) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( currentPageChanged(int) ), TQT_TQOBJECT(this), TQT_SLOT( pageNumChanged()) ); - connect( m_canvas, TQT_SIGNAL( objectSizeChanged() ), TQT_TQOBJECT(this), TQT_SLOT( updateObjectStatusBarItem() )); - connect( m_canvas, TQT_SIGNAL( objectSelectedChanged() ), TQT_TQOBJECT(this), TQT_SLOT( updateObjectStatusBarItem() )); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),TQT_TQOBJECT(this), TQT_SLOT( slotUpdateRuler())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),TQT_TQOBJECT(this), TQT_SLOT( slotUpdateScrollBarRanges())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateMenuBar()),TQT_TQOBJECT(this), TQT_SLOT(updateSideBarMenu())); - connect (m_pKPresenterDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)),TQT_TQOBJECT(this), TQT_SLOT(slotUnitChanged(KoUnit::Unit))); - connect( m_pKPresenterDoc, TQT_SIGNAL( modified( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( documentModified( bool )) ); - connect( m_pKPresenterDoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(loadingFinished())); + 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())); KStatusBar * sb = statusBar(); m_sbPageLabel = 0L; @@ -1075,13 +1075,13 @@ void KPrView::toolsAutoform() afChoose->setCaption( i18n( "Insert Autoform" ) ); TQObject::connect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( afChooseOk( const TQString & ) ) ); + this, TQT_SLOT( afChooseOk( const TQString & ) ) ); TQObject::connect( afChoose, TQT_SIGNAL( afchooseCanceled()), - TQT_TQOBJECT(this), TQT_SLOT(slotAfchooseCanceled())); + this, TQT_SLOT(slotAfchooseCanceled())); afChoose->exec(); TQObject::disconnect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( afChooseOk( const TQString & ) ) ); + this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( propertiesOk() ) ); + connect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); m_propertyEditor->exec(); - disconnect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), TQT_TQOBJECT(this), TQT_SLOT( propertiesOk() ) ); + disconnect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( rotateOk() ) ); + connect( rotateDia, TQT_SIGNAL( apply() ), this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) ); + connect( shadowDia, TQT_SIGNAL( apply() ), this, TQT_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 ) ), TQT_TQOBJECT(this), TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; + TQObject::connect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; backDia->exec(); - TQObject::disconnect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), TQT_TQOBJECT(this), TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ); + TQObject::disconnect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( pgConfOk() ) ); + TQObject::connect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); pgConfDia->exec(); - TQObject::disconnect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), TQT_TQOBJECT(this), TQT_SLOT( pgConfOk() ) ); + TQObject::disconnect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); delete pgConfDia; pgConfDia = 0; } @@ -1838,7 +1838,7 @@ void KPrView::mtextFont() , this, 0 ); connect( m_fontDlg, TQT_SIGNAL( applyFont() ), - TQT_TQOBJECT(this), TQT_SLOT( slotApplyFont() ) ); + this, TQT_SLOT( slotApplyFont() ) ); m_fontDlg->exec(); delete m_fontDlg; @@ -2164,7 +2164,7 @@ void KPrView::createGUI() connect( sidebar, TQT_SIGNAL( selectPage( int, bool ) ), m_pKPresenterDoc, TQT_SLOT( selectPage( int, bool ) ) ); connect( sidebar, TQT_SIGNAL( showPage( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( skipToPage( int ) ) ); + this, TQT_SLOT( skipToPage( int ) ) ); // This sucks when resizing the window //splitter->setResizeMode( sidebar, TQSplitter::FollowSizeHint ); //splitter->setResizeMode( pageBase, TQSplitter::Stretch ); @@ -2180,15 +2180,15 @@ void KPrView::createGUI() m_canvas=new KPrCanvas( pageBase, "Canvas", this ); TQObject::connect( m_canvas, TQT_SIGNAL( fontChanged( const TQFont & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); + this, TQT_SLOT( fontChanged( const TQFont & ) ) ); TQObject::connect( m_canvas, TQT_SIGNAL( colorChanged( const TQColor & ) ), - TQT_TQOBJECT(this), TQT_SLOT( colorChanged( const TQColor & ) ) ); + this, TQT_SLOT( colorChanged( const TQColor & ) ) ); TQObject::connect( m_canvas, TQT_SIGNAL( alignChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( alignChanged( int ) ) ); + this, TQT_SLOT( alignChanged( int ) ) ); TQObject::connect( m_canvas, TQT_SIGNAL( objectSelectedChanged()), - TQT_TQOBJECT(this), TQT_SLOT( objectSelectedChanged())); + this, TQT_SLOT( objectSelectedChanged())); TQObject::connect( m_canvas, TQT_SIGNAL( sigMouseWheelEvent( TQWheelEvent* ) ), - TQT_TQOBJECT(this), TQT_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); + this, TQT_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); // setup notebar. @@ -2207,8 +2207,8 @@ void KPrView::createGUI() if ( m_pKPresenterDoc && m_canvas ) { - TQObject::connect( m_canvas, TQT_SIGNAL( stopAutomaticPresentation() ), TQT_TQOBJECT(this), TQT_SLOT( stopAutomaticPresentation() ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( restartPresentation() ), TQT_TQOBJECT(this), TQT_SLOT( restartPresentation() ) ); + 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 ) ) ); @@ -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, TQT_TQOBJECT(this), TQT_SLOT( initialLayoutOfSplitter() ) ); + TQTimer::singleShot( 0, this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - actionEditCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - actionEditPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + 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 ) ) ); m_pKPresenterDoc->clipboardDataChanged(); // set paste's initial state actionEditDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", CTRL + TQt::Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( editDelete() ), + this, TQT_SLOT( editDelete() ), actionCollection(), "edit_delete" ); - actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - actionEditDeSelectAll= KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); + actionEditSelectAll = KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); + actionEditDeSelectAll= KStdAction::deselect( this, TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); actionEditCopyPage = new TDEAction( i18n( "Copy Slide" ), "edit-copy", - 0, TQT_TQOBJECT(this), TQT_SLOT( editCopyPage() ), + 0, this, TQT_SLOT( editCopyPage() ), actionCollection(), "edit_copypage" ); actionEditDuplicatePage = new TDEAction( i18n( "Duplicate Slide" ), "newslide", - 0, TQT_TQOBJECT(this), TQT_SLOT( editDuplicatePage() ), + 0, this, TQT_SLOT( editDuplicatePage() ), actionCollection(), "edit_duplicatepage" ); actionEditDelPage = new TDEAction( i18n( "Delete Slide" ), "delslide", 0, - TQT_TQOBJECT(this), TQT_SLOT( editDelPage() ), + this, TQT_SLOT( editDelPage() ), actionCollection(), "edit_delpage" ); - actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); - actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); + 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" ); // ---------------- View actions if ( !m_pKPresenterDoc->isEmbedded() ) { actionViewShowSideBar = new TDEToggleAction( i18n("Show Sidebar"), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewShowSideBar() ), + this, TQT_SLOT( viewShowSideBar() ), actionCollection(), "view_showsidebar" ); actionViewShowSideBar->setCheckedState(i18n("Hide Sidebar")); actionViewShowNoteBar = new TDEToggleAction( i18n("Show Notebar"), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewShowNoteBar() ), + this, TQT_SLOT( viewShowNoteBar() ), actionCollection(), "view_shownotebar" ); actionViewShowNoteBar->setCheckedState(i18n("Hide Notebar")); } actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotViewFormattingChars() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewSlideMaster() ), + this, TQT_SLOT( viewSlideMaster() ), actionCollection(), "view_master" ); actionViewShowGuideLine= new TDEToggleAction( i18n( "Guide Lines" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), + this, TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); actionViewShowGrid = new TDEToggleAction( i18n( "Show &Grid" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewGrid() ), + this, TQT_SLOT( viewGrid() ), actionCollection(), "view_grid" ); actionViewShowGrid->setCheckedState(i18n("Hide &Grid")); actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, - TQT_TQOBJECT(this), TQT_SLOT(viewSnapToGrid() ), + this, TQT_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); // ---------------- insert actions actionInsertPage = new TDEAction( i18n( "&Slide..." ), "slide", TQt::Key_F2, - TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), + this, TQT_SLOT( insertPage() ), actionCollection(), "insert_page" ); new TDEAction( i18n( "Insert &Slide..." ), "newslide", 0, - TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), + this, TQT_SLOT( insertPage() ), actionCollection(), "insert_page_popup" ); actionInsertPicture = new TDEAction( i18n( "P&icture..." ), "frame_image", TQt::SHIFT+TQt::Key_F5, - TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), + this, TQT_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); // ----------------- tools actions actionToolsMouse = new TDEToggleAction( i18n( "Select" ), "select", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsMouse() ), + this, TQT_SLOT( toolsMouse() ), actionCollection(), "tools_mouse" ); actionToolsMouse->setExclusiveGroup( "tools" ); actionToolsMouse->setChecked( true ); actionToolsRotate = new TDEToggleAction( i18n( "&Rotate" ), "rotate", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsRotate() ), + this, TQT_SLOT( toolsRotate() ), actionCollection(), "tools_rotate" ); actionToolsRotate->setExclusiveGroup( "tools" ); actionToolsZoom = new TDEToggleAction( i18n( "&Zoom" ), "viewmag", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsZoom() ), + this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup())); + connect(actionToolsShapePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsShapePopup())); actionToolsRectangle = new TDEToggleAction( i18n( "&Rectangle" ), "rectangle", - 0, TQT_TQOBJECT(this), TQT_SLOT( toolsRectangle() ), + 0, this, TQT_SLOT( toolsRectangle() ), actionCollection(), "tools_rectangle" ); actionToolsRectangle->setExclusiveGroup( "tools" ); actionToolsCircleOrEllipse = new TDEToggleAction( i18n( "&Circle/Ellipse" ), "circle", - 0, TQT_TQOBJECT(this), TQT_SLOT( toolsCircleOrEllipse() ), + 0, this, TQT_SLOT( toolsCircleOrEllipse() ), actionCollection(), "tools_circle" ); actionToolsCircleOrEllipse->setExclusiveGroup( "tools" ); actionToolsPie = new TDEToggleAction( i18n( "&Pie/Arc/Chord" ), "pie", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsPie() ), + this, TQT_SLOT( toolsPie() ), actionCollection(), "tools_pie" ); actionToolsPie->setExclusiveGroup( "tools" ); actionToolsText = new TDEToggleAction( i18n( "&Text" ), "frame_text", TQt::Key_F10, // same shortcut as KWord - TQT_TQOBJECT(this), TQT_SLOT( toolsText() ), + this, TQT_SLOT( toolsText() ), actionCollection(), "tools_text" ); actionToolsText->setExclusiveGroup( "tools" ); actionToolsAutoform = new TDEToggleAction( i18n( "&Arrows && Connections" ), "autoform", - 0, TQT_TQOBJECT(this), TQT_SLOT( toolsAutoform() ), + 0, this, TQT_SLOT( toolsAutoform() ), actionCollection(), "tools_autoform" ); actionToolsAutoform->setExclusiveGroup( "tools" ); actionToolsDiagramm = new TDEToggleAction( i18n( "&Chart" ), "frame_chart", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsDiagramm() ), + this, TQT_SLOT( toolsDiagramm() ), actionCollection(), "tools_diagramm" ); actionToolsDiagramm->setExclusiveGroup( "tools" ); actionToolsTable = new TDEToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", TQt::Key_F5 /*same as kword*/, - TQT_TQOBJECT(this), TQT_SLOT( toolsTable() ), + this, TQT_SLOT( toolsTable() ), actionCollection(), "tools_table" ); actionToolsTable->setExclusiveGroup( "tools" ); actionToolsObject = new KoPartSelectAction( i18n( "&Object" ), "frame_query", - TQT_TQOBJECT(this), TQT_SLOT( toolsObject() ), + this, TQT_SLOT( toolsObject() ), actionCollection(), "tools_object" ); actionToolsLinePopup = new TDEActionMenu( i18n( "&Line" ), "line", actionCollection(), "tools_linepopup" ); actionToolsLinePopup->setDelayed(true); - connect(actionToolsLinePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsLinePopup())); + connect(actionToolsLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsLinePopup())); actionToolsLine = new TDEToggleAction( i18n( "&Line" ), "line", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsLine() ), + this, TQT_SLOT( toolsLine() ), actionCollection(), "tools_line" ); actionToolsLine->setExclusiveGroup( "tools" ); actionToolsFreehand = new TDEToggleAction( i18n( "&Freehand" ), "freehand", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsFreehand() ), + this, TQT_SLOT( toolsFreehand() ), actionCollection(), "tools_freehand" ); actionToolsFreehand->setExclusiveGroup( "tools" ); actionToolsPolyline = new TDEToggleAction( i18n( "Po&lyline" ), "polyline", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsPolyline() ), + this, TQT_SLOT( toolsPolyline() ), actionCollection(), "tools_polyline" ); actionToolsPolyline->setExclusiveGroup( "tools" ); actionToolsQuadricBezierCurve = new TDEToggleAction( i18n( "&Quadric Bezier Curve" ), "quadricbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsQuadricBezierCurve() ), + this, TQT_SLOT( toolsQuadricBezierCurve() ), actionCollection(), "tools_quadricbeziercurve" ); actionToolsQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsCubicBezierCurve = new TDEToggleAction( i18n( "C&ubic Bezier Curve" ), "cubicbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsCubicBezierCurve() ), + this, TQT_SLOT( toolsCubicBezierCurve() ), actionCollection(), "tools_cubicbeziercurve" ); actionToolsCubicBezierCurve->setExclusiveGroup( "tools" ); actionToolsConvexOrConcavePolygon = new TDEToggleAction( i18n( "Co&nvex/Concave Polygon" ), "polygon", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsConvexOrConcavePolygon() ), + this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(toolsClosedLinePopup())); + connect(actionToolsClosedLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsClosedLinePopup())); actionToolsClosedFreehand = new TDEToggleAction( i18n( "Closed &Freehand" ), "closed_freehand", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedFreehand() ), + this, TQT_SLOT( toolsClosedFreehand() ), actionCollection(), "tools_closed_freehand" ); actionToolsClosedFreehand->setExclusiveGroup( "tools" ); actionToolsClosedPolyline = new TDEToggleAction( i18n( "Closed Po&lyline" ), "closed_polyline", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedPolyline() ), + this, TQT_SLOT( toolsClosedPolyline() ), actionCollection(), "tools_closed_polyline" ); actionToolsClosedPolyline->setExclusiveGroup( "tools" ); actionToolsClosedQuadricBezierCurve = new TDEToggleAction( i18n( "Closed &Quadric Bezier Curve" ), "closed_quadricbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedQuadricBezierCurve() ), + this, TQT_SLOT( toolsClosedQuadricBezierCurve() ), actionCollection(), "tools_closed_quadricbeziercurve" ); actionToolsClosedQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsClosedCubicBezierCurve = new TDEToggleAction( i18n( "Closed C&ubic Bezier Curve" ), "closed_cubicbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedCubicBezierCurve() ), + this, TQT_SLOT( toolsClosedCubicBezierCurve() ), actionCollection(), "tools_closed_cubicbeziercurve" ); actionToolsClosedCubicBezierCurve->setExclusiveGroup( "tools" ); // ----------------- text actions - actionTextFont = new TDEAction( i18n( "&Font..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( mtextFont() ), + actionTextFont = new TDEAction( i18n( "&Font..." ), 0, this, TQT_SLOT( mtextFont() ), actionCollection(), "text_font" ); actionTextFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "text_fontsize" ); connect( actionTextFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( sizeSelected( int ) ) ); + this, TQT_SLOT( sizeSelected( int ) ) ); #ifdef KFONTACTION_HAS_CRITERIA_ARG actionTextFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, @@ -2539,22 +2539,22 @@ void KPrView::setupActions() actionCollection(), "text_fontfamily" ); #endif connect( actionTextFontFamily , TQT_SIGNAL( activated( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString & ) ) ); + this, TQT_SLOT( fontSelected( const TQString & ) ) ); actionTextBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", CTRL + TQt::Key_B, - TQT_TQOBJECT(this), TQT_SLOT( textBold() ), + this, TQT_SLOT( textBold() ), actionCollection(), "format-text-bold" ); actionTextItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", CTRL + TQt::Key_I, - TQT_TQOBJECT(this), TQT_SLOT( textItalic() ), + this, TQT_SLOT( textItalic() ), actionCollection(), "format-text-italic" ); actionTextUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", CTRL + TQt::Key_U, - TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ), + this, TQT_SLOT( textUnderline() ), actionCollection(), "text_underline" ); actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 , - TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ), + this, TQT_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); actionTextColor = new TTDESelectColorAction( i18n( "&Color..." ), TTDESelectColorAction::TextColor, @@ -2564,23 +2564,23 @@ void KPrView::setupActions() actionTextAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", ALT + TQt::Key_L, - TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), + this, TQT_SLOT( textAlignLeft() ), actionCollection(), "text_alignleft" ); actionTextAlignLeft->setExclusiveGroup( "align" ); actionTextAlignLeft->setChecked( true ); actionTextAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", ALT + TQt::Key_C, - TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), + this, TQT_SLOT( textAlignCenter() ), actionCollection(), "text_aligncenter" ); actionTextAlignCenter->setExclusiveGroup( "align" ); actionTextAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", ALT + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), + this, TQT_SLOT( textAlignRight() ), actionCollection(), "text_alignright" ); actionTextAlignRight->setExclusiveGroup( "align" ); actionTextAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", CTRL + TQt::Key_J, - TQT_TQOBJECT(this), TQT_SLOT( textAlignBlock() ), + this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), + 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( textDepthPlus() ), + CTRL + TQt::Key_Plus, this, TQT_SLOT( textDepthPlus() ), actionCollection(), "text_depthPlus" ); actionTextDepthMinus = new TDEAction( i18n( "&Decrease Depth" ), TQApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", - CTRL + TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( textDepthMinus() ), + CTRL + TQt::Key_Minus, this, TQT_SLOT( textDepthMinus() ), actionCollection(), "text_depthMinus" ); actionTextExtentCont2Height = new TDEAction( i18n( "Extend Contents to Object &Height" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), + this, TQT_SLOT( textContentsToHeight() ), actionCollection(), "text_con2hei" ); actionTextExtendObj2Cont = new TDEAction( i18n( "&Extend Object to Fit Contents" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), + this, TQT_SLOT( textObjectToContents() ), actionCollection(), "text_obj2cont" ); actionTextInsertPageNum = new TDEAction( i18n( "&Insert Slide Number" ), "pgnum", 0, - TQT_TQOBJECT(this), TQT_SLOT( textInsertPageNum() ), + this, TQT_SLOT( textInsertPageNum() ), actionCollection(), "text_inspgnum" ); // ----------------- format actions actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraProperties() ), + this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( extraRaise() ), + CTRL+TQt::SHIFT+TQt::Key_R, this, TQT_SLOT( extraRaise() ), actionCollection(), "extra_raise" ); actionExtraLower = new TDEAction( i18n( "&Lower Objects" ), "lower", CTRL +TQt::SHIFT+ TQt::Key_L, - TQT_TQOBJECT(this), TQT_SLOT( extraLower() ), + this, TQT_SLOT( extraLower() ), actionCollection(), "extra_lower" ); actionExtraBringForward= new TDEAction( i18n( "Bring to Front" ), "bring_forward", - 0, TQT_TQOBJECT(this), TQT_SLOT( extraBringForward() ), + 0, this, TQT_SLOT( extraBringForward() ), actionCollection(), "extra_bring_forward" ); actionExtraSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", - 0, TQT_TQOBJECT(this), TQT_SLOT( extraSendBackward() ), + 0, this, TQT_SLOT( extraSendBackward() ), actionCollection(), "extra_send_backward" ); actionExtraRotate = new TDEAction( i18n( "R&otate Objects..." ), "object-rotate-right", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraRotate() ), + this, TQT_SLOT( extraRotate() ), actionCollection(), "extra_rotate" ); actionExtraShadow = new TDEAction( i18n( "&Shadow Objects..." ), "shadow", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraShadow() ), + this, TQT_SLOT( extraShadow() ), actionCollection(), "extra_shadow" ); actionExtraAlignObjLeft = new TDEAction( i18n( "Align &Left" ), "aoleft", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjLeft() ), + this, TQT_SLOT( extraAlignObjLeft() ), actionCollection(), "extra_alignleft" ); actionExtraAlignObjCenterH = new TDEAction( i18n( "Align Center (&horizontally)" ), "aocenterh", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterH() ), + this, TQT_SLOT( extraAlignObjCenterH() ), actionCollection(), "extra_aligncenterh" ); actionExtraAlignObjRight = new TDEAction( i18n( "Align &Right" ), "aoright", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjRight() ), + this, TQT_SLOT( extraAlignObjRight() ), actionCollection(), "extra_alignright" ); actionExtraAlignObjTop = new TDEAction( i18n( "Align &Top" ), "aotop", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjTop() ), + this, TQT_SLOT( extraAlignObjTop() ), actionCollection(), "extra_aligntop" ); actionExtraAlignObjCenterV = new TDEAction( i18n( "Align Center (&vertically)" ), "aocenterv", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterV() ), + this, TQT_SLOT( extraAlignObjCenterV() ), actionCollection(), "extra_aligncenterv" ); actionExtraAlignObjBottom = new TDEAction( i18n( "Align &Bottom" ), "aobottom", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjBottom() ), + this, TQT_SLOT( extraAlignObjBottom() ), actionCollection(), "extra_alignbottom" ); actionExtraBackground = new TDEAction( i18n( "Slide Bac&kground..." ), "background", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraBackground() ), + this, TQT_SLOT( extraBackground() ), actionCollection(), "extra_background" ); actionExtraLayout = new TDEAction( i18n( "Page &Layout..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraLayout() ), + this, TQT_SLOT( extraLayout() ), actionCollection(), "extra_layout" ); m_actionExtraHeader = new TDEToggleAction( i18n( "Enable Document &Header" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewHeader() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewFooter() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( extraConfigure() ), + this, TQT_SLOT( extraConfigure() ), actionCollection(), "extra_configure" ); actionExtraWebPres = new TDEAction( i18n( "Create &HTML Slideshow..." ), "webpres", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraWebPres() ), + this, TQT_SLOT( extraWebPres() ), actionCollection(), "extra_webpres" ); actionExtraMSPres = new TDEAction( i18n( "Create Memor&y Stick Slideshow..." ), - 0, TQT_TQOBJECT(this), TQT_SLOT( extraMSPres() ), + 0, this, TQT_SLOT( extraMSPres() ), actionCollection(), "extra_mspres" ); actionExtraCreateTemplate = new TDEAction( i18n( "Template Manager" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), + this, TQT_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); actionExtraDefaultTemplate = new TDEAction( i18n( "Use Current Slide as Default Template" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraDefaultTemplate() ), + this, TQT_SLOT( extraDefaultTemplate() ), actionCollection(), "extra_defaulttemplate" ); actionExtraAlignObjsPopup = new TDEActionMenu( i18n("Align O&bjects"), "alignobjs", @@ -2738,20 +2738,20 @@ void KPrView::setupActions() actionExtraAlignObjsPopup->setDelayed( false ); actionExtraLineBegin = new TDEAction( i18n("Line Begin"), "line_begin", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraLineBegin() ), + this, TQT_SLOT( extraLineBegin() ), actionCollection(), "extra_linebegin" ); actionExtraLineEnd = new TDEAction( i18n("Line End"), "line_end", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraLineEnd() ), + this, TQT_SLOT( extraLineEnd() ), actionCollection(), "extra_lineend" ); actionExtraPenStyle = new KoLineStyleAction( i18n("Outline Style"), "pen_style", - TQT_TQOBJECT(this), TQT_SLOT( extraPenStyle(int) ), + this, TQT_SLOT( extraPenStyle(int) ), actionCollection(), "extra_penstyle" ); actionExtraPenStyle->setShowCurrentSelection(false); actionExtraPenWidth = new KoLineWidthAction( i18n("Outline Width"), "pen_width", - TQT_TQOBJECT(this), TQT_SLOT( extraPenWidth(double) ), + this, TQT_SLOT( extraPenWidth(double) ), actionCollection(), "extra_penwidth" ); actionExtraPenWidth->setUnit( kPresenterDoc()->unit() ); actionExtraPenWidth->setShowCurrentSelection(false); @@ -2760,65 +2760,65 @@ void KPrView::setupActions() actionExtraGroup = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), - TQT_TQOBJECT(this), TQT_SLOT( extraGroup() ), + this, TQT_SLOT( extraGroup() ), actionCollection(), "extra_group" ); actionExtraUnGroup = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), - TQT_TQOBJECT(this), TQT_SLOT( extraUnGroup() ), + this, TQT_SLOT( extraUnGroup() ), actionCollection(), "extra_ungroup" ); // ----------------- slideshow actions actionScreenConfigPages = new TDEAction( i18n( "&Configure Slide Show..." ), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenConfigPages() ), + this, TQT_SLOT( screenConfigPages() ), actionCollection(), "screen_configpages" ); actionScreenAssignEffect = new TDEAction( i18n( "Edit &Object Effect..." ), "effect", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenAssignEffect() ), + this, TQT_SLOT( screenAssignEffect() ), actionCollection(), "screen_assigneffect"); actionScreenTransEffect = new TDEAction( i18n( "Edit Slide &Transition..." ), "slide_effect", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenTransEffect() ), + this, TQT_SLOT( screenTransEffect() ), actionCollection(), "screen_transeffect"); actionScreenStart = new TDEAction( i18n( "&Start" ), "2rightarrow", TQt::Key_F12, - TQT_TQOBJECT(this), TQT_SLOT( screenStart() ), + this, TQT_SLOT( screenStart() ), actionCollection(), "screen_start" ); actionScreenStartFromFirst = new TDEAction( i18n( "Start From &First Slide" ), "1rightarrow", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenStartFromFirst() ), + this, TQT_SLOT( screenStartFromFirst() ), actionCollection(), "screen_startfromfirst" ); actionScreenFirst = new TDEAction( i18n( "&Go to Start" ), "go-first", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenFirst() ), + this, TQT_SLOT( screenFirst() ), actionCollection(), "screen_first" ); actionScreenPrev = new TDEAction( i18n( "&Previous Slide" ), "back", TQt::Key_Prior, - TQT_TQOBJECT(this), TQT_SLOT( screenPrev() ), + this, TQT_SLOT( screenPrev() ), actionCollection(), "screen_prev" ); actionScreenNext = new TDEAction( i18n( "&Next Slide" ), "forward", TQt::Key_Next, - TQT_TQOBJECT(this), TQT_SLOT( screenNext() ), + this, TQT_SLOT( screenNext() ), actionCollection(), "screen_next" ); actionScreenLast = new TDEAction( i18n( "Go to &End" ), "go-last", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenLast() ), + this, TQT_SLOT( screenLast() ), actionCollection(), "screen_last" ); actionScreenSkip = new TDEAction( i18n( "Goto &Slide..." ), "goto", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenSkip() ), + this, TQT_SLOT( screenSkip() ), actionCollection(), "screen_skip" ); // ----------------- colorbar(Brush and Pen) action @@ -2832,113 +2832,113 @@ void KPrView::setupActions() actionCollection(), "pen_color" ); connect( actionPenColor, TQT_SIGNAL( activated() ), TQT_SLOT( penChosen() ) ); actionPenColor->setDefaultColor(TQColor()); - actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), + actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, this, TQT_SLOT( textContentsToHeight() ), actionCollection(), "extendobjectheight" ); - actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), + actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, this, TQT_SLOT( textObjectToContents() ), actionCollection(), "resizetextobject" ); - actionRenamePage=new TDEAction(i18n( "&Rename Slide..." ),0,TQT_TQOBJECT(this), + actionRenamePage=new TDEAction(i18n( "&Rename Slide..." ),0,this, TQT_SLOT( renamePageTitle() ), actionCollection(), "rename_page" ); - actionPicOriginalSize = new TDEAction( i18n( "Sca&le to Original Size" ), 0, TQT_TQOBJECT(this), + actionPicOriginalSize = new TDEAction( i18n( "Sca&le to Original Size" ), 0, this, TQT_SLOT( picViewOriginalSize() ), actionCollection(), "pic_original_size" ); - actionPic640x480=new TDEAction(i18n( "640x480" ),0,TQT_TQOBJECT(this), + actionPic640x480=new TDEAction(i18n( "640x480" ),0,this, TQT_SLOT( picViewOrig640x480() ), actionCollection(), "pic_640_480" ); - actionPic800x600=new TDEAction(i18n( "800x600" ),0,TQT_TQOBJECT(this), + actionPic800x600=new TDEAction(i18n( "800x600" ),0,this, TQT_SLOT( picViewOrig800x600() ), actionCollection(), "pic_800_600" ); - actionPic1024x768=new TDEAction(i18n( "1024x768" ),0,TQT_TQOBJECT(this), + actionPic1024x768=new TDEAction(i18n( "1024x768" ),0,this, TQT_SLOT( picViewOrig1024x768() ), actionCollection(), "pic_1024_768" ); - actionPic1280x1024=new TDEAction(i18n( "1280x1024" ),0,TQT_TQOBJECT(this), + actionPic1280x1024=new TDEAction(i18n( "1280x1024" ),0,this, TQT_SLOT( picViewOrig1280x1024() ), actionCollection(), "pic_1280_1024" ); - actionPic1600x1200=new TDEAction(i18n( "1600x1200" ),0,TQT_TQOBJECT(this), + actionPic1600x1200=new TDEAction(i18n( "1600x1200" ),0,this, TQT_SLOT( picViewOrig1600x1200() ), actionCollection(), "pic_1600_1200" ); - actionChangePic=new TDEAction( i18n( "&Change Picture..." ),"frame_image",0,TQT_TQOBJECT(this), + actionChangePic=new TDEAction( i18n( "&Change Picture..." ),"frame_image",0,this, TQT_SLOT( chPic() ), actionCollection(), "change_picture" ); - actionImageEffect = new TDEAction( i18n("Image &Effect..."), 0, TQT_TQOBJECT(this), + actionImageEffect = new TDEAction( i18n("Image &Effect..."), 0, this, TQT_SLOT(imageEffect()), actionCollection(), "image_effect"); actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), + this, TQT_SLOT( textSuperScript() ), actionCollection(), "format_super" ); actionFormatSuper->setExclusiveGroup( "valign" ); actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), + this, TQT_SLOT( textSubScript() ), actionCollection(), "format_sub" ); actionFormatSub->setExclusiveGroup( "valign" ); actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", ALT + TQt::SHIFT + TQt::Key_C, - TQT_TQOBJECT(this), TQT_SLOT( insertSpecialChar() ), + this, TQT_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); actionInsertLink = new TDEAction( i18n( "Link..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertLink() ), + this, TQT_SLOT( insertLink() ), actionCollection(), "insert_link" ); #if 0 //code from page.cpp //not implemented picResizeMenu->insertSeparator(); - picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), TQT_TQOBJECT(this), TQT_SLOT( picViewOrigFactor() ) ); + picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), this, TQT_SLOT( picViewOrigFactor() ) ); #endif (void) new TDEAction( i18n( "Configure &Autocorrection..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAutoFormat() ), + this, TQT_SLOT( extraAutoFormat() ), actionCollection(), "extra_autocorrection" ); - actionExtraSpellCheck = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + actionExtraSpellCheck = KStdAction::spelling( this, TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), ALT + CTRL + TQt::Key_P, - TQT_TQOBJECT(this), TQT_SLOT( formatParagraph() ), + this, TQT_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( textDefaultFormat() ), + this, TQT_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( openLink() ), + this, TQT_SLOT( openLink() ), actionCollection(), "open_link" ); actionChangeLink=new TDEAction( i18n("Change Link..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(changeLink()), + this, TQT_SLOT(changeLink()), actionCollection(), "change_link"); actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( copyLink() ), + this, TQT_SLOT( copyLink() ), actionCollection(), "copy_link" ); actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( removeLink() ), + this, TQT_SLOT( removeLink() ), actionCollection(), "remove_link" ); actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( addToBookmark() ), + this, TQT_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); actionEditCustomVarsEdit = new TDEAction( i18n( "&Custom Variables..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( editCustomVars() ), + this, TQT_SLOT( editCustomVars() ), actionCollection(), "edit_vars" ); actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( editCustomVariable() ), + this, TQT_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); @@ -2960,31 +2960,31 @@ void KPrView::setupActions() actionInsertVariable->popupMenu()->insertSeparator(); actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( refreshAllVariable() ), + this, TQT_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); actionInsertVariable->insert(actionRefreshAllVariable); actionIncreaseFontSize = new TDEAction( i18n("Increase Font Size"),"fontsizeup", 0, - TQT_TQOBJECT(this), TQT_SLOT( increaseFontSize() ), + this, TQT_SLOT( increaseFontSize() ), actionCollection(), "increaseFontSize" ); actionDecreaseFontSize = new TDEAction( i18n("Decrease Font Size"),"fontsizedown", 0, - TQT_TQOBJECT(this), TQT_SLOT( decreaseFontSize() ), + this, TQT_SLOT( decreaseFontSize() ), actionCollection(), "decreaseFontSize" ); actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( changeCaseOfText() ), + this, TQT_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); connect( actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( viewZoom( const TQString & ) ) ); + this, TQT_SLOT( viewZoom( const TQString & ) ) ); actionViewZoom->setEditable(true); changeZoomMenu( ); actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), ALT + CTRL + TQt::Key_S, - TQT_TQOBJECT(this), TQT_SLOT( extraStylist() ), + this, TQT_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, @@ -2994,166 +2994,166 @@ void KPrView::setupActions() actionFormatStyle = new TDESelectAction( i18n( "St&yle" ), 0, actionCollection(), "format_style" ); connect( actionFormatStyle, TQT_SIGNAL( activated( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( textStyleSelected( int ) ) ); + this, TQT_SLOT( textStyleSelected( int ) ) ); actionFormatStyle->setMenuAccelsEnabled( true ); updateStyleList(); actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAllowAutoFormat() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + this, TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+TQt::SHIFT+TQt::Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + this, TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); new TDEAction( i18n( "Insert Soft Hyphen" ), CTRL+TQt::Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + this, TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, - TQT_TQOBJECT(this), TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + this, TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), - TQT_TQOBJECT(this), TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + this, TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); new TDEAction( i18n( "Increase Numbering Level" ), ALT+TQt::Key_Right, - TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + this, TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); new TDEAction( i18n( "Decrease Numbering Level" ), ALT+TQt::Key_Left, - TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + this, TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertComment() ), + this, TQT_SLOT( insertComment() ), actionCollection(), "insert_comment" ); actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(editComment()), + this, TQT_SLOT(editComment()), actionCollection(), "edit_comment"); actionAddGuideLine = new TDEAction( i18n( "Add Guide Line..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( addGuideLine()), + this, TQT_SLOT( addGuideLine()), actionCollection(), "add_guideline"); actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, - TQT_TQOBJECT(this), TQT_SLOT(removeComment()), + this, TQT_SLOT(removeComment()), actionCollection(), "remove_comment"); actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(copyTextOfComment()), + this, TQT_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); actionConfigureCompletion = new TDEAction( i18n( "&Configure Completion..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( configureCompletion() ), + this, TQT_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); actionZoomMinus = new TDEAction( i18n( "Zoom Out" ), "zoom-out",0, - TQT_TQOBJECT(this), TQT_SLOT( zoomMinus() ), + this, TQT_SLOT( zoomMinus() ), actionCollection(), "zoom_minus" ); actionZoomPlus = new TDEAction( i18n( "Zoom In" ), "zoom-in",0, - TQT_TQOBJECT(this), TQT_SLOT( zoomPlus() ), + this, TQT_SLOT( zoomPlus() ), actionCollection(), "zoom_plus" ); actionZoomEntirePage = new TDEAction( i18n( "Zoom Entire Slide" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomEntirePage() ), + this, TQT_SLOT( zoomEntirePage() ), actionCollection(), "zoom_entire_page" ); actionZoomMinus = new TDEAction( i18n( "Zoom Slide Width" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomPageWidth() ), + this, TQT_SLOT( zoomPageWidth() ), actionCollection(), "zoom_page_width" ); actionZoomSelectedObject= new TDEAction( i18n( "Zoom Selected Objects" ), "zoom-fit-best",0, - TQT_TQOBJECT(this), TQT_SLOT( zoomSelectedObject() ), + this, TQT_SLOT( zoomSelectedObject() ), actionCollection(), "zoom_selected_object" ); actionZoomPageHeight= new TDEAction( i18n( "Zoom Slide Height" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomPageHeight() ), + this, TQT_SLOT( zoomPageHeight() ), actionCollection(), "zoom_page_height" ); actionZoomAllObject= new TDEAction( i18n( "Zoom All Objects" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomAllObject() ), + this, TQT_SLOT( zoomAllObject() ), actionCollection(), "zoom_all_object" ); actionFlipHorizontal= new TDEAction( i18n( "Horizontal Flip" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( flipHorizontal() ), + this, TQT_SLOT( flipHorizontal() ), actionCollection(), "horizontal_flip" ); actionFlipVertical= new TDEAction( i18n( "Vertical Flip" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( flipVertical() ), + this, TQT_SLOT( flipVertical() ), actionCollection(), "vertical_flip" ); actionDuplicateObj = new TDEAction( i18n( "Duplicate Object..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( duplicateObj() ), + this, TQT_SLOT( duplicateObj() ), actionCollection(), "duplicate_obj" ); actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( applyAutoFormat() ), + this, TQT_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( createStyleFromSelection()), + this, TQT_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); actionCloseObject = new TDEAction( i18n( "Close Object" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( closeObject()), + this, TQT_SLOT( closeObject()), actionCollection(), "close_object" ); actionAlignVerticalTop = new TDEToggleAction( i18n( "Align Top" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ), + this, TQT_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalTop->setChecked( true ); actionAlignVerticalBottom = new TDEToggleAction( i18n( "Align Bottom" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ), + this, TQT_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalCenter = new TDEToggleAction( i18n( "Align Middle" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ), + this, TQT_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); actionSavePicture= new TDEAction( i18n("Save Picture..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( savePicture() ), + this, TQT_SLOT( savePicture() ), actionCollection(), "save_picture"); actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( autoSpellCheck() ), + this, TQT_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); actionInsertFile= new TDEAction( i18n( "File..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertFile() ), + this, TQT_SLOT( insertFile() ), actionCollection(), "insert_file" ); actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( importStyle() ), + this, TQT_SLOT( importStyle() ), actionCollection(), "import_style" ); actionSaveBackgroundPicture= new TDEAction( i18n( "Save Background Picture..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT(backgroundPicture() ), + this, TQT_SLOT(backgroundPicture() ), actionCollection(), "save_bgpicture" ); #if 0 actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertDirectCursor() ), + this, TQT_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddIgnoreAllWord() ), + this, TQT_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, - TQT_TQOBJECT(this), TQT_SLOT( addWordToDictionary() ), + this, TQT_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); actionCustomSlideShow = new TDEAction( i18n( "Custom Slide Show..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( customSlideShow() ), + this, TQT_SLOT( customSlideShow() ), actionCollection(), "custom_slide_show" ); actionDisplayObjectFromMasterPage = new TDEToggleAction( i18n( "Hide Object From Slide Master" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( displayObjectFromMasterPage() ), + this, TQT_SLOT( displayObjectFromMasterPage() ), actionCollection(), "display_object_from_master_page" ); actionDisplayObjectFromMasterPage->setCheckedState(i18n("Display Object From Slide Master")); actionDisplayBackgroundPage = new TDEToggleAction( i18n( "Hide Background" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( displayBackground() ), + this, TQT_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" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginNormal() ) ); + rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), this, TQT_SLOT( extraLineBeginNormal() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), this, TQT_SLOT( extraLineBeginArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginRect() ) ); + rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), this, TQT_SLOT( extraLineBeginRect() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginCircle() ) ); + rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), this, TQT_SLOT( extraLineBeginCircle() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), this, TQT_SLOT( extraLineBeginLineArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDimensionLine() ) ); + rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), this, TQT_SLOT( extraLineBeginDimensionLine() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDoubleArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), this, TQT_SLOT( extraLineBeginDoubleArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDoubleLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), this, TQT_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" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndNormal() ) ); + rb_lend->insertItem( KPBarIcon("line_normal_end" ), this, TQT_SLOT( extraLineEndNormal() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_arrow_end" ), this, TQT_SLOT( extraLineEndArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_rect_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndRect() ) ); + rb_lend->insertItem( KPBarIcon("line_rect_end" ), this, TQT_SLOT( extraLineEndRect() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_circle_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndCircle() ) ); + rb_lend->insertItem( KPBarIcon("line_circle_end" ), this, TQT_SLOT( extraLineEndCircle() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), this, TQT_SLOT( extraLineEndLineArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDimensionLine() ) ); + rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), this, TQT_SLOT( extraLineEndDimensionLine() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDoubleArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), this, TQT_SLOT( extraLineEndDoubleArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDoubleLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), this, TQT_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"), TQT_TQOBJECT(this), TQT_SLOT(extraLower())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), this, TQT_SLOT(extraLower())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), TQT_TQOBJECT(this), TQT_SLOT(extraSendBackward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), this, TQT_SLOT(extraSendBackward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), TQT_TQOBJECT(this), TQT_SLOT(extraBringForward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), this, TQT_SLOT(extraBringForward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), TQT_TQOBJECT(this), TQT_SLOT(extraRaise())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), this, TQT_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 ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollV( int ) ) ); - TQObject::connect( horz, TQT_SIGNAL( valueChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollH( int ) ) ); + TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( scrollV( int ) ) ); + TQObject::connect( horz, TQT_SIGNAL( valueChanged( int ) ), this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( nextPage() ) ); + connect( pgNext, TQT_SIGNAL( clicked() ), this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( prevPage() ) ); + connect( pgPrev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); } void KPrView::setupRulers() @@ -3787,9 +3787,9 @@ void KPrView::setupRulers() v_ruler->setGeometry( 0, vSpace, hSpace, m_canvas->height() ); TQObject::connect( h_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); TQObject::connect( h_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - TQT_TQOBJECT(this), TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); + this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); connect( h_ruler, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( slotHRulerDoubleClicked() ) ); @@ -3797,15 +3797,15 @@ void KPrView::setupRulers() TQT_SLOT( slotHRulerDoubleClicked(double) ) ); TQObject::connect( v_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); TQObject::connect( v_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - TQT_TQOBJECT(this), TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); + this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); TQObject::connect( v_ruler, TQT_SIGNAL( doubleClicked() ), - TQT_TQOBJECT(this), TQT_SLOT( openPageLayoutDia() ) ); + this, TQT_SLOT( openPageLayoutDia() ) ); - connect( h_ruler, TQT_SIGNAL( newLeftIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newLeftIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newFirstIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newFirstIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newRightIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newRightIndent( double ) ) ); + 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 ) ) ); } void KPrView::unitChanged( KoUnit::Unit u ) @@ -4358,9 +4358,9 @@ void KPrView::insertSpecialChar() { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); connect( m_specialCharDlg, TQT_SIGNAL( finished() ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); + this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -4370,9 +4370,9 @@ void KPrView::slotSpecialCharDlgClosed() if ( m_specialCharDlg) { disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); + this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } @@ -4587,22 +4587,22 @@ void KPrView::startKSpell() { // m_spellCurrFrameSetNum is supposed to be set by the caller of this method if ( !m_spell.kospell ) - m_spell.kospell = new KoSpell( m_broker, TQT_TQOBJECT(this) ); + m_spell.kospell = new KoSpell( m_broker, this ); m_spell.kospell->check( m_spell.textIterator, true ); 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)), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + this, TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + this, TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) ); + this, TQT_SLOT(spellCheckerDone(const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), - TQT_TQOBJECT(this), TQT_SLOT( spellCheckerCancel() ) ); + this, TQT_SLOT( spellCheckerCancel() ) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); + this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplyParag() ) ); + connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, this, TQT_SLOT( insertVariable() ), actionCollection(), "var-action" ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); @@ -4882,7 +4882,7 @@ void KPrView::refreshCustomMenu() { lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); - act = new TDEAction( varName, shortCuts[varName], TQT_TQOBJECT(this), + act = new TDEAction( varName, shortCuts[varName], this, TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); act->setGroup( "custom-variable-action" ); @@ -4895,7 +4895,7 @@ void KPrView::refreshCustomMenu() if(state) actionInsertCustom->popupMenu()->insertSeparator(); - act = new TDEAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), + act = new TDEAction( i18n("New..."), 0, this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( pddClosed() ) ); + TQObject::connect( presDurationDia, TQT_SIGNAL( presDurationDiaClosed() ), this, TQT_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], TQT_TQOBJECT(this), TQT_SLOT( slotStyleSelected() ), + shortCuts[name], this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotCorrectWord()) ); + connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotCorrectWord()) ); listAction.append( act ); } } @@ -6421,7 +6421,7 @@ void KPrView::initialLayoutOfSplitter() return; } - TQSplitter* splitterVertical = static_cast<TQSplitter*>( TQT_TQWIDGET(notebar->parent()) ); + TQSplitter* splitterVertical = static_cast<TQSplitter*>( notebar->parent() ); TQValueList<int> tmpList; int noteHeight = height() / 25; tmpList << height() - noteHeight << noteHeight; diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 89406321..23d9f057 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -547,7 +547,7 @@ static void showEntry( TQLineEdit* edit, TQLabel* label, edit->setText( "0" ); break; case KSpread_Int: - edit->setValidator(new TQIntValidator (TQT_TQOBJECT(edit))); + edit->setValidator(new TQIntValidator (edit)); edit->setText( "0" ); break; } diff --git a/kspread/kspread_handler.cpp b/kspread/kspread_handler.cpp index 3e9fe0e5..79d0c152 100644 --- a/kspread/kspread_handler.cpp +++ b/kspread/kspread_handler.cpp @@ -13,7 +13,7 @@ using namespace KSpread; InsertHandler::InsertHandler( View* view, TQWidget* widget ) - : KoEventHandler( TQT_TQOBJECT(widget) ) + : KoEventHandler( widget ) { m_view = view; m_started = false; diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 92d083b4..91f5edce 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, TQT_TQOBJECT(view), TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); + TQt::CTRL+ TQt::ALT+ TQt::Key_F, view, TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); actions->cellLayout->setToolTip( i18n("Set the cell formatting.") ); actions->actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - TQT_TQOBJECT(view), TQT_SLOT( extraProperties() ), ac, "extra_properties" ); + view, TQT_SLOT( extraProperties() ), ac, "extra_properties" ); actions->defaultFormat = new TDEAction( i18n("Default"), - 0, TQT_TQOBJECT(view), TQT_SLOT( defaultSelection() ), ac, "default" ); + 0, view, TQT_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) ), - TQT_TQOBJECT(view), TQT_SLOT( bold( bool ) ) ); + view, TQT_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) ), - TQT_TQOBJECT(view), TQT_SLOT( italic( bool ) ) ); + view, TQT_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) ), - TQT_TQOBJECT(view), TQT_SLOT( underline( bool ) ) ); + view, TQT_SLOT( underline( bool ) ) ); actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", 0, ac, "strikeout"); TQObject::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), - TQT_TQOBJECT(view), TQT_SLOT( strikeOut( bool ) ) ); + view, TQT_SLOT( strikeOut( bool ) ) ); actions->selectFont = new TDEFontAction( i18n("Select Font..."), 0, ac, "selectFont" ); TQObject::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), - TQT_TQOBJECT(view), TQT_SLOT( fontSelected( const TQString& ) ) ); + view, TQT_SLOT( fontSelected( const TQString& ) ) ); actions->selectFontSize = new TDEFontSizeAction( i18n("Select Font Size"), 0, ac, "selectFontSize" ); TQObject::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_TQOBJECT(view), TQT_SLOT( fontSizeSelected( int ) ) ); + view, TQT_SLOT( fontSizeSelected( int ) ) ); actions->fontSizeUp = new TDEAction( i18n("Increase Font Size"), "fontsizeup", - 0, TQT_TQOBJECT(view), TQT_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); + 0, view, TQT_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); actions->fontSizeDown = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", - 0, TQT_TQOBJECT(view), TQT_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); + 0, view, TQT_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); actions->textColor = new TTDESelectColorAction( i18n("Text Color"), - TTDESelectColorAction::TextColor, TQT_TQOBJECT(view), TQT_SLOT( changeTextColor() ), + TTDESelectColorAction::TextColor, view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignLeft( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignCenter( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignRight( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignTop( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignMiddle( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignBottom( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( wrapText( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( verticalText( bool ) ) ); + view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( increaseIndent() ), ac, "increaseindent" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( decreaseIndent() ), ac, "decreaseindent"); + 0, view, TQT_SLOT( decreaseIndent() ), ac, "decreaseindent"); actions->decreaseIndent->setToolTip(i18n("Decrease the indentation.")); actions->changeAngle = new TDEAction( i18n("Change Angle..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( changeAngle() ), ac, "changeangle" ); + 0, view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( percent( bool ) ) ); + view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( precisionPlus() ), ac, "precplus"); + 0, view, TQT_SLOT( precisionPlus() ), ac, "precplus"); actions->precplus->setToolTip(i18n("Increase the decimal precision shown onscreen.")); actions->precminus = new TDEAction( i18n("Decrease Precision"), "prec_minus", - 0, TQT_TQOBJECT(view), TQT_SLOT( precisionMinus() ), ac, "precminus"); + 0, view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( moneyFormat( bool ) ) ); + view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( upper() ), ac, "upper" ); + 0, view, TQT_SLOT( upper() ), ac, "upper" ); actions->upper->setToolTip(i18n("Convert all letters to upper case.")); actions->lower = new TDEAction( i18n("Lower Case"), "fontsizedown", - 0, TQT_TQOBJECT(view), TQT_SLOT( lower() ), ac, "lower" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); + 0, view, TQT_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() ), - TQT_TQOBJECT(view), TQT_SLOT( changeBackgroundColor() ) ); + view, TQT_SLOT( changeBackgroundColor() ) ); actions->bgColor->setDefaultColor(TQColor()); actions->bgColor->setToolTip(i18n("Set the background color.")); actions->borderLeft = new TDEAction( i18n("Border Left"), "border_left", - 0, TQT_TQOBJECT(view), TQT_SLOT( borderLeft() ), ac, "borderLeft" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( borderRight() ), ac, "borderRight" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( borderTop() ), ac, "borderTop" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( borderBottom() ), ac, "borderBottom" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( borderAll() ), ac, "borderAll" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( borderRemove() ), ac, "borderRemove" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( borderOutline() ), ac, "borderOutline" ); + 0, view, TQT_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() ), - TQT_TQOBJECT(view), TQT_SLOT( changeBorderColor() ) ); + view, TQT_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 & ) ), - TQT_TQOBJECT(view), TQT_SLOT( styleSelected( const TQString & ) ) ); + view, TQT_SLOT( styleSelected( const TQString & ) ) ); actions->createStyle = new TDEAction( i18n( "Create Style From Cell..." ), - 0, TQT_TQOBJECT(view), TQT_SLOT( createStyleFromCell()), ac, "createStyle" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( editCell() ), ac, "editCell" ); + TQt::CTRL+TQt::Key_M, view, TQT_SLOT( editCell() ), ac, "editCell" ); actions->editCell->setToolTip(i18n("Edit the highlighted cell.")); actions->insertCell = new TDEAction( i18n("Insert Cells..."), "insertcell", - 0, TQT_TQOBJECT(view), TQT_SLOT( slotInsert() ), ac, "insertCell" ); + 0, view, TQT_SLOT( slotInsert() ), ac, "insertCell" ); actions->insertCell->setToolTip(i18n("Insert a blank cell into the spreadsheet.")); actions->removeCell = new TDEAction( i18n("Remove Cells..."), "removecell", - 0, TQT_TQOBJECT(view), TQT_SLOT( slotRemove() ), ac, "removeCell" ); + 0, view, TQT_SLOT( slotRemove() ), ac, "removeCell" ); actions->removeCell->setToolTip(i18n("Removes the current cell from the spreadsheet.")); actions->deleteCell = new TDEAction( i18n("Delete"), "deletecell", - 0, TQT_TQOBJECT(view), TQT_SLOT( deleteSelection() ), ac, "delete" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( mergeCell() ), ac, "mergecell" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( dissociateCell() ), ac, "dissociatecell" ); + 0, view, TQT_SLOT( dissociateCell() ), ac, "dissociatecell" ); actions->dissociateCell->setToolTip(i18n("Unmerge the selected region.")); actions->clearText = new TDEAction( i18n("Text"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearTextSelection() ), ac, "cleartext" ); + 0, view, TQT_SLOT( clearTextSelection() ), ac, "cleartext" ); actions->clearText->setToolTip(i18n("Remove the contents of the current cell.")); actions->conditional = new TDEAction( i18n("Conditional Cell Attributes..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( conditional() ), ac, "conditional" ); + 0, view, TQT_SLOT( conditional() ), ac, "conditional" ); actions->conditional->setToolTip(i18n("Set cell format based on certain conditions.")); actions->clearConditional = new TDEAction( i18n("Conditional Cell Attributes"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); + 0, view, TQT_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); actions->clearConditional->setToolTip(i18n("Remove the conditional cell formatting.")); actions->validity = new TDEAction( i18n("Validity..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( validity() ), ac, "validity" ); + 0, view, TQT_SLOT( validity() ), ac, "validity" ); actions->validity->setToolTip(i18n("Set tests to confirm cell data is valid.")); actions->clearValidity = new TDEAction( i18n("Validity"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( addModifyComment() ), ac, "addmodifycomment" ); + 0, view, TQT_SLOT( addModifyComment() ), ac, "addmodifycomment" ); actions->addModifyComment->setToolTip(i18n("Edit a comment for this cell.")); actions->removeComment = new TDEAction( i18n("&Remove Comment"),"removecomment", - 0, TQT_TQOBJECT(view), TQT_SLOT( removeComment() ), ac, "removecomment" ); + 0, view, TQT_SLOT( removeComment() ), ac, "removecomment" ); actions->removeComment->setToolTip(i18n("Remove this cell's comment.")); actions->clearComment = new TDEAction( i18n("Comment"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearCommentSelection() ), ac, "clearcomment" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( resizeColumn() ), ac, "resizeCol" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( insertColumn() ), ac, "insertColumn" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( deleteColumn() ), ac, "deleteColumn" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( hideColumn() ), ac, "hideColumn" ); + 0, view, TQT_SLOT( hideColumn() ), ac, "hideColumn" ); actions->hideColumn->setToolTip(i18n("Hide the column from view.")); actions->showColumn = new TDEAction( i18n("Show Columns..."), "show_table_column", - 0, TQT_TQOBJECT(view), TQT_SLOT( showColumn() ), ac, "showColumn" ); + 0, view, TQT_SLOT( showColumn() ), ac, "showColumn" ); actions->showColumn->setToolTip(i18n("Show hidden columns.")); actions->equalizeColumn = new TDEAction( i18n("Equalize Column"), "adjustcol", - 0, TQT_TQOBJECT(view), TQT_SLOT( equalizeColumn() ), ac, "equalizeCol" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( showSelColumns() ), ac, "showSelColumns" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( resizeRow() ), ac, "resizeRow" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( insertRow() ), ac, "insertRow" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( deleteRow() ), ac, "deleteRow" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( hideRow() ), ac, "hideRow" ); + 0, view, TQT_SLOT( hideRow() ), ac, "hideRow" ); actions->hideRow->setToolTip(i18n("Hide a row from view.")); actions->showRow = new TDEAction( i18n("Show Rows..."), "show_table_row", - 0, TQT_TQOBJECT(view), TQT_SLOT( showRow() ), ac, "showRow" ); + 0, view, TQT_SLOT( showRow() ), ac, "showRow" ); actions->showRow->setToolTip(i18n("Show hidden rows.")); actions->equalizeRow = new TDEAction( i18n("Equalize Row"), "adjustrow", - 0, TQT_TQOBJECT(view), TQT_SLOT( equalizeRow() ), ac, "equalizeRow" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( showSelRows() ), ac, "showSelRows" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( adjust() ), ac, "adjust" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( sheetProperties() ), ac, "sheetProperties" ); + 0, view, TQT_SLOT( sheetProperties() ), ac, "sheetProperties" ); actions->sheetProperties->setToolTip(i18n("Modify current sheet's properties.")); actions->insertSheet = new TDEAction( i18n("Insert Sheet"),"inserttable", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertSheet() ), ac, "insertSheet" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( insertSheet() ), ac, "menuInsertSheet" ); + 0, view, TQT_SLOT( insertSheet() ), ac, "menuInsertSheet" ); actions->menuInsertSheet->setToolTip(i18n("Insert a new sheet.")); actions->removeSheet = new TDEAction( i18n("Remove Sheet"), "delete_table", - 0, TQT_TQOBJECT(view), TQT_SLOT( removeSheet() ), ac, "removeSheet" ); + 0, view, TQT_SLOT( removeSheet() ), ac, "removeSheet" ); actions->removeSheet->setToolTip(i18n("Remove the active sheet.")); actions->renameSheet=new TDEAction( i18n("Rename Sheet..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( slotRename() ), ac, "renameSheet" ); + 0, view, TQT_SLOT( slotRename() ), ac, "renameSheet" ); actions->renameSheet->setToolTip(i18n("Rename the active sheet.")); actions->showSheet = new TDEAction(i18n("Show Sheet..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( showSheet()), ac, "showSheet" ); + 0, view, TQT_SLOT( showSheet()), ac, "showSheet" ); actions->showSheet->setToolTip(i18n("Show a hidden sheet.")); actions->hideSheet = new TDEAction(i18n("Hide Sheet"), - 0, TQT_TQOBJECT(view), TQT_SLOT( hideSheet() ), ac, "hideSheet" ); + 0, view, TQT_SLOT( hideSheet() ), ac, "hideSheet" ); actions->hideSheet->setToolTip(i18n("Hide the active sheet.")); actions->autoFormat = new TDEAction( i18n("AutoFormat..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( sheetFormat() ), ac, "sheetFormat" ); + 0, view, TQT_SLOT( sheetFormat() ), ac, "sheetFormat" ); actions->autoFormat->setToolTip(i18n("Set the worksheet formatting.")); actions->areaName = new TDEAction( i18n("Area Name..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( setAreaName() ), ac, "areaname" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( showAreaName() ), ac, "showArea" ); + 0, view, TQT_SLOT( showAreaName() ), ac, "showArea" ); actions->showArea->setToolTip(i18n("Display a named area.")); actions->insertFunction = new TDEAction( i18n("&Function..."), "funct", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); + 0, view, TQT_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); actions->insertFunction->setToolTip(i18n("Insert math expression.")); actions->insertSeries = new TDEAction( i18n("&Series..."),"series", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertSeries() ), ac, "series"); + 0, view, TQT_SLOT( insertSeries() ), ac, "series"); actions->insertSeries ->setToolTip(i18n("Insert a series.")); actions->insertLink = new TDEAction( i18n("&Link..."), "insert_link", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); + 0, view, TQT_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); actions->insertLink->setToolTip(i18n("Insert an Internet hyperlink.")); actions->removeLink = new TDEAction( i18n("&Remove Link"), - 0, TQT_TQOBJECT(view), TQT_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); + 0, view, TQT_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); actions->removeLink->setToolTip(i18n("Remove a link.")); actions->insertSpecialChar = new TDEAction( i18n( "S&pecial Character..." ), "char", - TQT_TQOBJECT(view), TQT_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); + view, TQT_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", - TQT_TQOBJECT(view), TQT_SLOT( insertObject() ), ac, "insertPart"); + view, TQT_SLOT( insertObject() ), ac, "insertPart"); actions->insertPart->setToolTip(i18n("Insert an object from another program.")); actions->insertChartFrame = new TDEToggleAction( i18n("&Chart"), "insert_chart", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertChart() ), ac, "insertChart" ); + 0, view, TQT_SLOT( insertChart() ), ac, "insertChart" ); actions->insertChartFrame->setToolTip(i18n("Insert a chart.")); actions->insertPicture = new TDEAction( i18n("&Picture"), - 0, TQT_TQOBJECT(view), TQT_SLOT( insertPicture() ), ac, "insertPicture" ); + 0, view, TQT_SLOT( insertPicture() ), ac, "insertPicture" ); actions->insertPicture->setToolTip(i18n("Insert a picture.")); #ifndef TQT_NO_SQL actions->insertFromDatabase = new TDEAction( i18n("From &Database..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); + 0, view, TQT_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); actions->insertFromDatabase->setToolTip(i18n("Insert data from a SQL database.")); #endif actions->insertFromTextfile = new TDEAction( i18n("From &Text File..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( transformPart() ), ac, "transform" ); +// 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( sort() ), ac, "sort" ); + 0, view, TQT_SLOT( sort() ), ac, "sort" ); actions->sort->setToolTip(i18n("Sort a group of cells.")); actions->sortDec = new TDEAction( i18n("Sort &Decreasing"), "sort_decrease", - 0, TQT_TQOBJECT(view), TQT_SLOT( sortDec() ), ac, "sortDec" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( sortInc() ), ac, "sortInc" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); + 0, view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( togglePageBorders( bool ) ) ); + view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); + TQt::SHIFT + TQt::Key_F9, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); + TQt::Key_F9, view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( toggleProtectSheet( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( toggleProtectDoc( bool ) ) ); + view, TQT_SLOT( toggleProtectDoc( bool ) ) ); // -- editing actions -- - actions->copy = KStdAction::copy( TQT_TQOBJECT(view), TQT_SLOT( copySelection() ), ac, "copy" ); + actions->copy = KStdAction::copy( view, TQT_SLOT( copySelection() ), ac, "copy" ); actions->copy->setToolTip(i18n("Copy the cell object to the clipboard.")); - actions->paste = KStdAction::paste( TQT_TQOBJECT(view), TQT_SLOT( paste() ), ac, "paste" ); + actions->paste = KStdAction::paste( view, TQT_SLOT( paste() ), ac, "paste" ); actions->paste->setToolTip(i18n("Paste the contents of the clipboard at the cursor.")); - actions->cut = KStdAction::cut( TQT_TQOBJECT(view), TQT_SLOT( cutSelection() ), ac, "cut" ); + actions->cut = KStdAction::cut( view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( specialPaste() ), ac, "specialPaste" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); + 0, view, TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); actions->insertCellCopy->setToolTip(i18n("Inserts a cell from the clipboard into the spreadsheet.")); - actions->find = KStdAction::find( TQT_TQOBJECT(view), TQT_SLOT(find()), ac ); - /*actions->findNext =*/ KStdAction::findNext( TQT_TQOBJECT(view), TQT_SLOT( findNext() ), ac ); - /*actions->findPrevious =*/ KStdAction::findPrev( TQT_TQOBJECT(view), TQT_SLOT( findPrevious() ), ac ); + 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->replace = KStdAction::replace( TQT_TQOBJECT(view), TQT_SLOT(replace()), ac ); + actions->replace = KStdAction::replace( view, TQT_SLOT(replace()), ac ); actions->fillRight = new TDEAction( i18n( "&Right" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillRight() ), ac, "fillRight" ); + 0, view, TQT_SLOT( fillRight() ), ac, "fillRight" ); actions->fillLeft = new TDEAction( i18n( "&Left" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillLeft() ), ac, "fillLeft" ); + 0, view, TQT_SLOT( fillLeft() ), ac, "fillLeft" ); actions->fillDown = new TDEAction( i18n( "&Down" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillDown() ), ac, "fillDown" ); + 0, view, TQT_SLOT( fillDown() ), ac, "fillDown" ); actions->fillUp = new TDEAction( i18n( "&Up" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillUp() ), ac, "fillUp" ); + 0, view, TQT_SLOT( fillUp() ), ac, "fillUp" ); // -- misc actions -- actions->styleDialog = new TDEAction( i18n( "Style Manager" ), - 0, TQT_TQOBJECT(view), TQT_SLOT( styleDialog() ), ac, "styles" ); + 0, view, TQT_SLOT( styleDialog() ), ac, "styles" ); actions->styleDialog->setToolTip( i18n( "Edit and organize cell styles." ) ); actions->autoSum = new TDEAction( i18n("Autosum"), "black_sum", - 0, TQT_TQOBJECT(view), TQT_SLOT( autoSum() ), ac, "autoSum" ); + 0, view, TQT_SLOT( autoSum() ), ac, "autoSum" ); actions->autoSum->setToolTip(i18n("Insert the 'sum' function")); - actions->spellChecking = KStdAction::spelling( TQT_TQOBJECT(view), TQT_SLOT( extraSpelling() ), + actions->spellChecking = KStdAction::spelling( view, TQT_SLOT( extraSpelling() ), ac, "spelling" ); actions->spellChecking->setToolTip(i18n("Check the spelling.")); @@ -1014,59 +1014,59 @@ void View::Private::initActions() actions->formulaSelection->setComboWidth( 80 ); actions->formulaSelection->setCurrentItem(0); TQObject::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), - TQT_TQOBJECT(view), TQT_SLOT( formulaSelection( const TQString& ) ) ); + view, TQT_SLOT( formulaSelection( const TQString& ) ) ); actions->viewZoom = new KoZoomAction( i18n( "Zoom" ), "viewmag", 0, ac, "view_zoom" ); TQObject::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), - TQT_TQOBJECT(view), TQT_SLOT( viewZoom( const TQString & ) ) ); + view, TQT_SLOT( viewZoom( const TQString & ) ) ); actions->consolidate = new TDEAction( i18n("&Consolidate..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( consolidate() ), ac, "consolidate" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( goalSeek() ), ac, "goalSeek" ); + 0, view, TQT_SLOT( goalSeek() ), ac, "goalSeek" ); actions->goalSeek->setToolTip( i18n("Repeating calculation to find a specific value.") ); actions->subTotals = new TDEAction( i18n("&Subtotals..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( subtotals() ), ac, "subtotals" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( textToColumns() ), ac, "textToColumns" ); + 0, view, TQT_SLOT( textToColumns() ), ac, "textToColumns" ); actions->textToColumns->setToolTip( i18n("Expand the content of cells to multiple columns.") ); actions->multipleOperations = new TDEAction( i18n("&Multiple Operations..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( multipleOperations() ), ac, "multipleOperations" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( createTemplate() ), ac, "createTemplate" ); + 0, view, TQT_SLOT( createTemplate() ), ac, "createTemplate" ); actions->customList = new TDEAction( i18n("Custom Lists..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( sortList() ), ac, "sortlist" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( gotoCell() ), ac, "gotoCell" ); + 0, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( nextSheet() ), ac, "nextSheet"); + TQt::CTRL+TQt::Key_PageDown, view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( previousSheet() ), ac, "previousSheet"); + TQt::CTRL+TQt::Key_PageUp, view, TQT_SLOT( previousSheet() ), ac, "previousSheet"); actions->prevSheet->setToolTip(i18n("Move to the previous sheet.")); actions->firstSheet = new TDEAction( i18n("First Sheet"), "go-first", - 0, TQT_TQOBJECT(view), TQT_SLOT( firstSheet() ), ac, "firstSheet"); + 0, view, TQT_SLOT( firstSheet() ), ac, "firstSheet"); actions->firstSheet->setToolTip(i18n("Move to the first sheet.")); actions->lastSheet = new TDEAction( i18n("Last Sheet"), "go-last", - 0, TQT_TQOBJECT(view), TQT_SLOT( lastSheet() ), ac, "lastSheet"); + 0, view, TQT_SLOT( lastSheet() ), ac, "lastSheet"); actions->lastSheet->setToolTip(i18n("Move to the last sheet.")); // -- settings actions -- @@ -1075,77 +1075,77 @@ void View::Private::initActions() 0, ac, "showStatusBar" ); actions->showStatusBar->setCheckedState(i18n("Hide Status Bar")); TQObject::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( showStatusBar( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( showTabBar( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( showFormulaBar( bool ) ) ); + view, TQT_SLOT( showFormulaBar( bool ) ) ); actions->showFormulaBar->setToolTip(i18n("Show the formula bar.")); actions->preference = new TDEAction( i18n("Configure KSpread..."),"configure", - 0, TQT_TQOBJECT(view), TQT_SLOT( preference() ), ac, "preference" ); + 0, view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_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 ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_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, TQT_TQOBJECT(view), TQT_SLOT( runInternalTests() ), ac, "internalTests" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_T, view, TQT_SLOT( runInternalTests() ), ac, "internalTests" ); actions->inspector = new TDEAction( i18n("Run Inspector..."), "inspector", - TQt::CTRL+ TQt::SHIFT + TQt::Key_I, TQT_TQOBJECT(view), TQT_SLOT( runInspector() ), ac, "inspector" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_I, view, TQT_SLOT( runInspector() ), ac, "inspector" ); m_propertyEditor = 0; } @@ -2296,7 +2296,7 @@ void View::startKSpell() doc()->getKSpellConfig()->setReplaceAllList( d->spell.replaceAll ); } - d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), + d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), this, TQT_SLOT( spellCheckerReady() ), doc()->getKSpellConfig() ); diff --git a/kspread/plugins/scripting/scripting.cpp b/kspread/plugins/scripting/scripting.cpp index 040bd98d..4bc3f1a6 100644 --- a/kspread/plugins/scripting/scripting.cpp +++ b/kspread/plugins/scripting/scripting.cpp @@ -67,7 +67,7 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); Kross::Api::Manager::scriptManager()->addTQObject(m_view->doc(), "KSpreadDocument"); - Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_view), "KSpreadView"); + Kross::Api::Manager::scriptManager()->addTQObject(m_view, "KSpreadView"); } } diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index c1623518..83d150e1 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -178,56 +178,56 @@ void KudesignerView::resizeEvent( TQResizeEvent* /*_ev*/ ) void KudesignerView::initActions() { - cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( cut() ), actionCollection() ); - copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection() ); - pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection() ); - selectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), actionCollection() ); - deleteAction = new TDEAction( i18n( "Delete" ), "edit-delete", 0, TQT_TQOBJECT(this), + 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() ); + deleteAction = new TDEAction( i18n( "Delete" ), "edit-delete", 0, this, TQT_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, TQT_TQOBJECT(this), + sectionsReportHeader = new TDEAction( i18n( "Report Header" ), "irh", 0, this, TQT_SLOT( slotAddReportHeader() ), actionCollection(), "rheader" ); - sectionsReportFooter = new TDEAction( i18n( "Report Footer" ), "irf", 0, TQT_TQOBJECT(this), + sectionsReportFooter = new TDEAction( i18n( "Report Footer" ), "irf", 0, this, TQT_SLOT( slotAddReportFooter() ), actionCollection(), "rfooter" ); - sectionsPageHeader = new TDEAction( i18n( "Page Header" ), "iph", 0, TQT_TQOBJECT(this), + sectionsPageHeader = new TDEAction( i18n( "Page Header" ), "iph", 0, this, TQT_SLOT( slotAddPageHeader() ), actionCollection(), "pheader" ); - sectionsPageFooter = new TDEAction( i18n( "Page Footer" ), "ipf", 0, TQT_TQOBJECT(this), + sectionsPageFooter = new TDEAction( i18n( "Page Footer" ), "ipf", 0, this, TQT_SLOT( slotAddPageFooter() ), actionCollection(), "pfooter" ); - sectionsDetailHeader = new TDEAction( i18n( "Detail Header" ), "idh", 0, TQT_TQOBJECT(this), + sectionsDetailHeader = new TDEAction( i18n( "Detail Header" ), "idh", 0, this, TQT_SLOT( slotAddDetailHeader() ), actionCollection(), "dheader" ); - sectionsDetail = new TDEAction( i18n( "Detail" ), "id", 0, TQT_TQOBJECT(this), + sectionsDetail = new TDEAction( i18n( "Detail" ), "id", 0, this, TQT_SLOT( slotAddDetail() ), actionCollection(), "detail" ); - sectionsDetailFooter = new TDEAction( i18n( "Detail Footer" ), "idf", 0, TQT_TQOBJECT(this), + sectionsDetailFooter = new TDEAction( i18n( "Detail Footer" ), "idf", 0, this, TQT_SLOT( slotAddDetailFooter() ), actionCollection(), "dfooter" ); - itemsNothing = new TDERadioAction( i18n( "Clear Selection" ), "frame_edit", 0, TQT_TQOBJECT(this), + itemsNothing = new TDERadioAction( i18n( "Clear Selection" ), "frame_edit", 0, this, TQT_SLOT( slotAddItemNothing() ), actionCollection(), "nothing" ); itemsNothing->setExclusiveGroup( "itemsToolBar" ); itemsNothing->setChecked( true ); - itemsLabel = new TDERadioAction( i18n( "Label" ), "frame_text", 0, TQT_TQOBJECT(this), + itemsLabel = new TDERadioAction( i18n( "Label" ), "frame_text", 0, this, TQT_SLOT( slotAddItemLabel() ), actionCollection(), "label" ); itemsLabel->setExclusiveGroup( "itemsToolBar" ); - itemsField = new TDERadioAction( i18n( "Field" ), "frame_field", 0, TQT_TQOBJECT(this), + itemsField = new TDERadioAction( i18n( "Field" ), "frame_field", 0, this, TQT_SLOT( slotAddItemField() ), actionCollection(), "field" ); itemsField->setExclusiveGroup( "itemsToolBar" ); - itemsSpecial = new TDERadioAction( i18n( "Special Field" ), "frame_query", 0, TQT_TQOBJECT(this), + itemsSpecial = new TDERadioAction( i18n( "Special Field" ), "frame_query", 0, this, TQT_SLOT( slotAddItemSpecial() ), actionCollection(), "special" ); itemsSpecial->setExclusiveGroup( "itemsToolBar" ); - itemsCalculated = new TDERadioAction( i18n( "Calculated Field" ), "frame_formula", 0, TQT_TQOBJECT(this), + itemsCalculated = new TDERadioAction( i18n( "Calculated Field" ), "frame_formula", 0, this, TQT_SLOT( slotAddItemCalculated() ), actionCollection(), "calcfield" ); itemsCalculated->setExclusiveGroup( "itemsToolBar" ); - itemsLine = new TDERadioAction( i18n( "Line" ), "frame_chart", 0, TQT_TQOBJECT(this), + itemsLine = new TDERadioAction( i18n( "Line" ), "frame_chart", 0, this, TQT_SLOT( slotAddItemLine() ), actionCollection(), "line" ); itemsLine->setExclusiveGroup( "itemsToolBar" ); - gridActionLabel = new KWidgetAction( gridLabel, i18n( "Grid Label" ), 0, TQT_TQOBJECT(this), + gridActionLabel = new KWidgetAction( gridLabel, i18n( "Grid Label" ), 0, this, 0, actionCollection(), "gridlabel" ); - gridAction = new KWidgetAction( gridBox, i18n( "Grid Size" ), 0, TQT_TQOBJECT(this), + gridAction = new KWidgetAction( gridBox, i18n( "Grid Size" ), 0, this, 0, actionCollection(), "gridaction" ); } diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index 602255ed..6fa20b8b 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( TQT_TQOBJECT(view), TQT_SLOT( slotPrevPage() ), actionCollection(), "kuPrevPage" ); - KStdAction::next( TQT_TQOBJECT(view), TQT_SLOT( slotNextPage() ), actionCollection(), "kuNextPage" ); - KStdAction::firstPage( TQT_TQOBJECT(view), TQT_SLOT( slotFirstPage() ), actionCollection(), "kuFirstPage" ); - KStdAction::lastPage( TQT_TQOBJECT(view), TQT_SLOT( slotLastPage() ), actionCollection(), "kuLastPage" ); + 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" ); setXMLFile( "kugarpart.rc" ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index de64037d..fdf776dc 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( TQT_TQOBJECT(this), TQT_SIGNAL( embeddImage( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotEmbedImage( const TQString & ) ) ); + TQObject::connect( this, TQT_SIGNAL( embeddImage( const TQString & ) ), + this, TQT_SLOT( slotEmbedImage( const TQString & ) ) ); setKeyCompression( TRUE ); setAcceptDrops( TRUE ); @@ -313,51 +313,51 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW } connect( m_doc, TQT_SIGNAL( modified( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( documentModified( bool )) ); + this, TQT_SLOT( documentModified( bool )) ); connect( m_doc, TQT_SIGNAL( numPagesChanged() ), - TQT_TQOBJECT(this), TQT_SLOT( numPagesChanged()) ); + this, TQT_SLOT( numPagesChanged()) ); connect( m_doc, TQT_SIGNAL( pageLayoutChanged( const KoPageLayout& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotPageLayoutChanged( const KoPageLayout& )) ); + this, TQT_SLOT( slotPageLayoutChanged( const KoPageLayout& )) ); connect( m_doc, TQT_SIGNAL( docStructureChanged(int) ), - TQT_TQOBJECT(this), TQT_SLOT( docStructChanged(int)) ); + this, TQT_SLOT( docStructChanged(int)) ); connect( m_doc, TQT_SIGNAL( unitChanged(KoUnit::Unit) ), - TQT_TQOBJECT(this), TQT_SLOT( slotUnitChanged(KoUnit::Unit) ) ); + this, TQT_SLOT( slotUnitChanged(KoUnit::Unit) ) ); connect( m_doc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), - TQT_TQOBJECT(this), TQT_SLOT( refreshCustomMenu())); + this, TQT_SLOT( refreshCustomMenu())); connect( m_doc, TQT_SIGNAL( completed() ), - TQT_TQOBJECT(this), TQT_SLOT( slotDocumentLoadingCompleted() ) ); + this, TQT_SLOT( slotDocumentLoadingCompleted() ) ); connect( frameViewManager(), TQT_SIGNAL(sigFrameSelectionChanged()), - TQT_TQOBJECT(this), TQT_SLOT( frameSelectedChanged())); + this, TQT_SLOT( frameSelectedChanged())); connect( frameViewManager(), TQT_SIGNAL(sigFrameSetRenamed()), - TQT_TQOBJECT(this), TQT_SLOT( updateFrameStatusBarItem())); + this, TQT_SLOT( updateFrameStatusBarItem())); connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_TQOBJECT(this), TQT_SLOT( clipboardDataChanged() ) ); + this, TQT_SLOT( clipboardDataChanged() ) ); connect( m_gui->canvasWidget(), TQT_SIGNAL(currentFrameSetEditChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotFrameSetEditChanged()) ); + this, TQT_SLOT(slotFrameSetEditChanged()) ); connect( m_gui->canvasWidget(), TQT_SIGNAL( currentMouseModeChanged(int) ), - TQT_TQOBJECT(this), TQT_SLOT( showMouseMode(int) ) ); + this, TQT_SLOT( showMouseMode(int) ) ); connect( m_gui->canvasWidget(), TQT_SIGNAL( overwriteModeChanged( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( changeOverwriteMode( bool ) ) ); + this, TQT_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)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeCutState(bool )) ); + this, TQT_SLOT(slotChangeCutState(bool )) ); connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaseState(bool ))); + this, TQT_SLOT(slotChangeCaseState(bool ))); } else { @@ -379,10 +379,10 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW m_actionSortText, TQT_SLOT(setEnabled(bool ))); connect( m_gui->canvasWidget(), TQT_SIGNAL(docStructChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(docStructChanged(int))); + this, TQT_SLOT(docStructChanged(int))); connect( m_gui->canvasWidget(), TQT_SIGNAL(updateRuler()), - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateRuler())); + this, TQT_SLOT(slotUpdateRuler())); if ( shell() ) { @@ -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, TQT_TQOBJECT(this), TQT_SLOT( slotSetInitialPosition() ) ); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotSetInitialPosition() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); } KWView::~KWView() @@ -563,72 +563,72 @@ void KWView::setupActions() // -------------- File menu m_actionExtraCreateTemplate = new TDEAction( i18n( "&Create Template From Document..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), + this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( fileStatistics() ), actionCollection(), "file_statistics" ); + m_actionFileStatistics = new TDEAction( i18n( "Statistics" ), 0, this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - m_actionEditCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - m_actionEditPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - m_actionEditFind = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); - m_actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - m_actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - m_actionEditReplace = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); - m_actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - new TDEAction( i18n( "Select All Frames" ), 0, TQT_TQOBJECT(this), TQT_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); + 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_actionEditSelectCurrentFrame = new TDEAction( i18n( "Select Frame" ), 0, - 0, TQT_TQOBJECT(this), TQT_SLOT( editSelectCurrentFrame() ), + 0, this, TQT_SLOT( editSelectCurrentFrame() ), actionCollection(), "edit_selectcurrentframe" ); - m_actionSpellCheck = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + m_actionSpellCheck = KStdAction::spelling( this, TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); m_actionDeletePage = new TDEAction( i18n( "Delete Page" ), "delslide", 0, - TQT_TQOBJECT(this), TQT_SLOT( deletePage() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( editMailMergeDataBase() ), + this, TQT_SLOT( editMailMergeDataBase() ), actionCollection(), "edit_sldatabase" ); (void) new KWMailMergeLabelAction( i18n("Drag Mail Merge Variable"), 0, - TQT_TQOBJECT(this), TQT_SLOT(editMailMergeDataBase()), actionCollection(), "mailmerge_draglabel" ); + this, TQT_SLOT(editMailMergeDataBase()), actionCollection(), "mailmerge_draglabel" ); -// (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,TQT_TQOBJECT(this), TQT_SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser"); +// (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,this, TQT_SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser"); // -------------- Frame menu m_actionEditDelFrame = new TDEAction( i18n( "&Delete Frame" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( editDeleteFrame() ), + this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( createLinkedFrame() ), actionCollection(), "create_linked_frame" ); + m_actionCreateLinkedFrame = new TDEAction( i18n( "Create Linked Copy" ), 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( raiseFrame() ), + TQt::CTRL +TQt::SHIFT+ TQt::Key_R, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( lowerFrame() ), + TQt::CTRL +TQt::SHIFT+ TQt::Key_L, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( bringToFront() ), + 0, this, TQT_SLOT( bringToFront() ), actionCollection(), "bring_tofront_frame" ); m_actionSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", - 0, TQT_TQOBJECT(this), TQT_SLOT( sendToBack() ), + 0, this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewTextMode() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewPageMode() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewPreviewMode() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( slotViewFormattingChars() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( slotViewFrameBorders() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewHeader() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewFooter() ), + this, TQT_SLOT( viewFooter() ), actionCollection(), "format_footer" ); m_actionViewFooter->setCheckedState(i18n("Disable Document Foo&ters")); m_actionViewFooter->setToolTip( i18n( "Shows and hides footer display." ) ); @@ -696,20 +696,20 @@ void KWView::setupActions() actionCollection(), "view_zoom" ); connect( m_actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( viewZoom( const TQString & ) ) ); + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertSpecialChar() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertFrameBreak() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), + this, TQT_SLOT( insertPage() ), actionCollection(), "insert_page" ); m_actionInsertLink = new TDEAction( i18n( "Link..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertLink() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertComment() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(editComment()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(removeComment()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(copyTextOfComment()), + this, TQT_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); m_actionInsertFootEndNote = new TDEAction( i18n( "&Footnote/Endnote..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertFootNote() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertContents() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( refreshAllVariable() ), + this, TQT_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,79 +798,79 @@ void KWView::setupActions() loadexpressionActions( m_actionInsertExpression); m_actionToolsCreateText = new TDEToggleAction( i18n( "Te&xt Frame" ), "frame_text", TQt::Key_F10 /*same as kpr*/, - TQT_TQOBJECT(this), TQT_SLOT( toolsCreateText() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertFormula() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertTable() ), + this, TQT_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*/, - TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), + this, TQT_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", - TQT_TQOBJECT(this), TQT_SLOT( toolsPart() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertFile() ), + this, TQT_SLOT( insertFile() ), actionCollection(), "insert_file" ); // ------------------------- Format menu m_actionFormatFont = new TDEAction( i18n( "&Font..." ), TQt::ALT + TQt::CTRL + TQt::Key_F, - TQT_TQOBJECT(this), TQT_SLOT( formatFont() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( formatParagraph() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( formatFrameSet() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( formatPage() ), + this, TQT_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?*/, - TQT_TQOBJECT(this), TQT_SLOT( extraFrameStylist() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( extraStylist() ), + this, TQT_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." ) ); @@ -878,10 +878,10 @@ void KWView::setupActions() m_actionFormatFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "format_fontsize" ); connect( m_actionFormatFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( textSizeSelected( int ) ) ); + this, TQT_SLOT( textSizeSelected( int ) ) ); - m_actionFontSizeIncrease = new TDEAction( i18n("Increase Font Size"), "fontsizeup", TQt::CTRL + TQt::Key_Greater, TQT_TQOBJECT(this), TQT_SLOT( increaseFontSize() ), actionCollection(), "increase_fontsize" ); - m_actionFontSizeDecrease = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", TQt::CTRL + TQt::Key_Less, TQT_TQOBJECT(this), TQT_SLOT( decreaseFontSize() ), actionCollection(), "decrease_fontsize" ); + 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" ); #ifdef KFONTACTION_HAS_CRITERIA_ARG m_actionFormatFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, @@ -892,7 +892,7 @@ void KWView::setupActions() actionCollection(), "format_fontfamily" ); #endif connect( m_actionFormatFontFamily, TQT_SIGNAL( activated( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( textFontSelected( const TQString & ) ) ); + this, TQT_SLOT( textFontSelected( const TQString & ) ) ); m_actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, actionCollection(), "format_stylemenu" ); @@ -901,11 +901,11 @@ void KWView::setupActions() // 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 ) ), - TQT_TQOBJECT(this), TQT_SLOT( textStyleSelected( int ) ) ); + this, TQT_SLOT( textStyleSelected( int ) ) ); updateStyleList(); m_actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( textDefaultFormat() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( textBold() ), + this, TQT_SLOT( textBold() ), actionCollection(), "format_bold" ); m_actionFormatItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", TQt::CTRL + TQt::Key_I, - TQT_TQOBJECT(this), TQT_SLOT( textItalic() ), + this, TQT_SLOT( textItalic() ), actionCollection(), "format_italic" ); m_actionFormatUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", TQt::CTRL + TQt::Key_U, - TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ), + this, TQT_SLOT( textUnderline() ), actionCollection(), "format_underline" ); m_actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 , - TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ), + this, TQT_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); m_actionFormatAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", TQt::CTRL + TQt::Key_L, - TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), + this, TQT_SLOT( textAlignRight() ), actionCollection(), "format_alignright" ); m_actionFormatAlignRight->setExclusiveGroup( "align" ); m_actionFormatAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", TQt::CTRL + TQt::Key_J, - TQT_TQOBJECT(this), TQT_SLOT( textAlignBlock() ), + this, TQT_SLOT( textAlignBlock() ), actionCollection(), "format_alignblock" ); m_actionFormatAlignBlock->setExclusiveGroup( "align" ); m_actionFormatSpacingSingle = new TDEToggleAction( i18n( "Line Spacing &1" ), "spacesimple", TQt::CTRL + TQt::Key_1, - TQT_TQOBJECT(this), TQT_SLOT( textSpacingSingle() ), + this, TQT_SLOT( textSpacingSingle() ), actionCollection(), "format_spacingsingle" ); m_actionFormatSpacingSingle->setExclusiveGroup( "spacing" ); m_actionFormatSpacingOneAndHalf = new TDEToggleAction( i18n( "Line Spacing 1.&5" ), "spacedouble", TQt::CTRL + TQt::Key_5, - TQT_TQOBJECT(this), TQT_SLOT( textSpacingOneAndHalf() ), + this, TQT_SLOT( textSpacingOneAndHalf() ), actionCollection(), "format_spacing15" ); m_actionFormatSpacingOneAndHalf->setExclusiveGroup( "spacing" ); m_actionFormatSpacingDouble = new TDEToggleAction( i18n( "Line Spacing &2" ), "spacetriple", TQt::CTRL + TQt::Key_2, - TQT_TQOBJECT(this), TQT_SLOT( textSpacingDouble() ), + this, TQT_SLOT( textSpacingDouble() ), actionCollection(), "format_spacingdouble" ); m_actionFormatSpacingDouble->setExclusiveGroup( "spacing" ); m_actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), + this, TQT_SLOT( textSuperScript() ), actionCollection(), "format_super" ); //m_actionFormatSuper->setExclusiveGroup( "valign" ); m_actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), + this, TQT_SLOT( textSubScript() ), actionCollection(), "format_sub" ); //m_actionFormatSub->setExclusiveGroup( "valign" ); m_actionFormatIncreaseIndent= new TDEAction( i18n( "Increase Indent" ), TQApplication::reverseLayout() ? "format_decreaseindent" : "format_increaseindent", 0, - TQT_TQOBJECT(this), TQT_SLOT( textIncreaseIndent() ), + this, TQT_SLOT( textIncreaseIndent() ), actionCollection(), "format_increaseindent" ); m_actionFormatDecreaseIndent= new TDEAction( i18n( "Decrease Indent" ), TQApplication::reverseLayout() ? "format_increaseindent" :"format_decreaseindent", 0, - TQT_TQOBJECT(this), TQT_SLOT( textDecreaseIndent() ), + this, TQT_SLOT( textDecreaseIndent() ), actionCollection(), "format_decreaseindent" ); m_actionFormatColor = new TTDESelectColorAction( i18n( "Text Color..." ), TTDESelectColorAction::TextColor, - TQT_TQOBJECT(this), TQT_SLOT( textColor() ), + this, TQT_SLOT( textColor() ), actionCollection(), "format_color", true ); m_actionFormatColor->setDefaultColor(TQColor()); //actionFormatList = new TDEToggleAction( i18n( "List" ), "enumList", 0, - // TQT_TQOBJECT(this), TQT_SLOT( textList() ), + // this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), + 0, this, TQT_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 @@ -1019,18 +1019,18 @@ void KWView::setupActions() m_actionFrameStyle = new TDESelectAction( i18n( "Framest&yle" ), 0, actionCollection(), "frame_style" ); connect( m_actionFrameStyle, TQT_SIGNAL( activated( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( frameStyleSelected( int ) ) ); + this, TQT_SLOT( frameStyleSelected( int ) ) ); updateFrameStyleList(); m_actionBorderOutline = new TDEToggleAction( i18n( "Border Outline" ), "borderoutline", - 0, TQT_TQOBJECT(this), TQT_SLOT( borderOutline() ), actionCollection(), "border_outline" ); + 0, this, TQT_SLOT( borderOutline() ), actionCollection(), "border_outline" ); m_actionBorderLeft = new TDEToggleAction( i18n( "Border Left" ), "borderleft", - 0, TQT_TQOBJECT(this), TQT_SLOT( borderLeft() ), actionCollection(), "border_left" ); + 0, this, TQT_SLOT( borderLeft() ), actionCollection(), "border_left" ); m_actionBorderRight = new TDEToggleAction( i18n( "Border Right" ), "borderright", - 0, TQT_TQOBJECT(this), TQT_SLOT( borderRight() ), actionCollection(), "border_right" ); + 0, this, TQT_SLOT( borderRight() ), actionCollection(), "border_right" ); m_actionBorderTop = new TDEToggleAction( i18n( "Border Top" ), "bordertop", - 0, TQT_TQOBJECT(this), TQT_SLOT( borderTop() ), actionCollection(), "border_top" ); + 0, this, TQT_SLOT( borderTop() ), actionCollection(), "border_top" ); m_actionBorderBottom = new TDEToggleAction( i18n( "Border Bottom" ), "borderbottom", - 0, TQT_TQOBJECT(this), TQT_SLOT( borderBottom() ), actionCollection(), "border_bottom" ); + 0, this, TQT_SLOT( borderBottom() ), actionCollection(), "border_bottom" ); m_actionBorderStyle = new TDESelectAction( i18n( "Border Style" ), 0, actionCollection(), "border_style" ); @@ -1063,50 +1063,50 @@ void KWView::setupActions() // ---------------------- Table menu m_actionTablePropertiesMenu = new TDEAction( i18n( "&Properties" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( tableProperties() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableInsertRow() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableInsertCol() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableDeleteRow() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableDeleteCol() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableResizeCol() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableJoinCells() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableSplitCells() ), + this, TQT_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." ) ); @@ -1120,20 +1120,20 @@ void KWView::setupActions() 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, - TQT_TQOBJECT(this), TQT_SLOT( tableUngroupTable() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableDelete() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( tableStylist() ), + this, TQT_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." ) ); @@ -1143,18 +1143,18 @@ void KWView::setupActions() m_actionTableStyle = new TDESelectAction( i18n( "Table&style" ), 0, actionCollection(), "table_style" ); connect( m_actionTableStyle, TQT_SIGNAL( activated( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( tableStyleSelected( int ) ) ); + this, TQT_SLOT( tableStyleSelected( int ) ) ); updateTableStyleList(); m_actionConvertTableToText = new TDEAction( i18n( "Convert Table to Text" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( convertTableToText() ), + this, TQT_SLOT( convertTableToText() ), actionCollection(), "convert_table_to_text" ); m_actionSortText= new TDEAction( i18n( "Sort Text..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( sortText() ), + this, TQT_SLOT( sortText() ), actionCollection(), "sort_text" ); m_actionAddPersonalExpression= new TDEAction( i18n( "Add Expression" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( addPersonalExpression() ), + this, TQT_SLOT( addPersonalExpression() ), actionCollection(), "add_personal_expression" ); @@ -1162,89 +1162,89 @@ void KWView::setupActions() m_actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAllowAutoFormat() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( extraAutoFormat() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( editCustomVars() ), // TODO: new dialog w add etc. + this, TQT_SLOT( editCustomVars() ), // TODO: new dialog w add etc. actionCollection(), "custom_vars" ); m_actionEditPersonnalExpr=new TDEAction( i18n( "Edit &Personal Expressions..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( editPersonalExpr() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( changeCaseOfText() ), + this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection(), "configure" ); + m_actionConfigure = KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection(), "configure" ); //------------------------ Menu frameSet TDEAction *actionChangePicture=new TDEAction( i18n( "Change Picture..." ),"frame_image",0, - TQT_TQOBJECT(this), TQT_SLOT( changePicture() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( configureHeaderFooter() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( inlineFrame() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( openLink() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(changeLink()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( copyLink() ), + this, TQT_SLOT( copyLink() ), actionCollection(), "copy_link" ); m_actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( addToBookmark() ), + this, TQT_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); m_actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( removeLink() ), + this, TQT_SLOT( removeLink() ), actionCollection(), "remove_link" ); m_actionShowDocStruct = new TDEToggleAction( i18n( "Show Doc Structure" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( showDocStructure() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( viewGrid() ), + this, TQT_SLOT( viewGrid() ), actionCollection(), "view_grid" ); m_actionViewShowGrid->setCheckedState(i18n("Hide Grid")); m_actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, - TQT_TQOBJECT(this), TQT_SLOT(viewSnapToGrid() ), + this, TQT_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); m_actionConfigureCompletion = new TDEAction( i18n( "Configure C&ompletion..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( configureCompletion() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + this, TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), TQt::CTRL+TQt::SHIFT+TQt::Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + this, TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); new TDEAction( i18n( "Insert Soft Hyphen" ), TQt::CTRL+TQt::Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + this, TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, - TQT_TQOBJECT(this), TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + this, TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); - new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), TQT_TQOBJECT(this), TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), this, TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); new TDEAction( i18n( "Increase Numbering Level" ), TQt::ALT+TQt::Key_Right, - TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + this, TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); new TDEAction( i18n( "Decrease Numbering Level" ), TQt::ALT+TQt::Key_Left, - TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + this, TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); // -------- m_actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( editCustomVariable() ), + this, TQT_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); m_actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( applyAutoFormat() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( createStyleFromSelection()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( configureFootEndNote()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( editFootEndNote()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( changeFootNoteType() ), + this, TQT_SLOT( changeFootNoteType() ), actionCollection(), "change_footendtype"); m_actionSavePicture= new TDEAction( i18n("Save Picture As..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( savePicture() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( autoSpellCheck() ), + this, TQT_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); m_actionGoToFootEndNote = new TDEAction( TQString() /*set dynamically*/, 0, - TQT_TQOBJECT(this), TQT_SLOT( goToFootEndNote() ), + this, TQT_SLOT( goToFootEndNote() ), actionCollection(), "goto_footendnote" ); // Document Structure Area popup menu. m_actionDocStructEdit = new TDEAction( i18n( "Edit Text" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( docStructEdit() ), + this, TQT_SLOT( docStructEdit() ), actionCollection(), "docstruct_edit" ); m_actionDocStructSpeak = new TDEAction( i18n("Speak Text" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( docStructSpeak() ), + this, TQT_SLOT( docStructSpeak() ), actionCollection(), "docstruct_speak" ); m_actionDocStructSelect = new TDEAction( i18n( "Show" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( docStructSelect() ), + this, TQT_SLOT( docStructSelect() ), actionCollection(), "docstruct_select" ); m_actionDocStructDelete = new TDEAction( i18n( "Delete Frame" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( docStructDelete() ), + this, TQT_SLOT( docStructDelete() ), actionCollection(), "docstruct_delete" ); m_actionDocStructProperties = new TDEAction( i18n( "Properties" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( docStructProperties() ), + this, TQT_SLOT( docStructProperties() ), actionCollection(), "docstruct_properties" ); m_actionAddBookmark= new TDEAction( i18n( "&Bookmark..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( addBookmark() ), + this, TQT_SLOT( addBookmark() ), actionCollection(), "add_bookmark" ); m_actionSelectBookmark= new TDEAction( i18n( "Select &Bookmark..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( selectBookmark() ), + this, TQT_SLOT( selectBookmark() ), actionCollection(), "select_bookmark" ); m_actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( importStyle() ), + this, TQT_SLOT( importStyle() ), actionCollection(), "import_style" ); m_actionCreateFrameStyle = new TDEAction( i18n( "&Create Framestyle From Frame..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( createFrameStyle()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( insertDirectCursor() ), + this, TQT_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif m_actionConvertToTextBox = new TDEAction( i18n( "Convert to Text Box" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( convertToTextBox() ), + this, TQT_SLOT( convertToTextBox() ), actionCollection(), "convert_to_text_box" ); m_actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddIgnoreAllWord() ), + this, TQT_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); m_actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, - TQT_TQOBJECT(this), TQT_SLOT( addWordToDictionary() ), + this, TQT_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); m_actionEmbeddedStoreInternal=new TDEToggleAction( i18n( "Store Document Internally" ),0, - TQT_TQOBJECT(this), TQT_SLOT( embeddedStoreInternal() ), + this, TQT_SLOT( embeddedStoreInternal() ), actionCollection(), "embedded_store_internal" ); m_actionGoToDocumentStructure=new TDEAction( i18n( "Go to Document Structure" ), TDEShortcut("Alt+1"), - TQT_TQOBJECT(this), TQT_SLOT( goToDocumentStructure() ), + this, TQT_SLOT( goToDocumentStructure() ), actionCollection(), "goto_document_structure" ); m_actionGoToDocument=new TDEAction( i18n( "Go to Document" ), TDEShortcut("Alt+2"), - TQT_TQOBJECT(this), TQT_SLOT( goToDocument() ), + this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), + TDEAction * act = new TDEAction( text, 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, this, TQT_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], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ),actionCollection(), name ); + act = new TDEAction( varName, shortCuts[varName], this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); + act = new TDEAction( i18n("New..."), 0, this, TQT_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], TQT_TQOBJECT(this), TQT_SLOT( slotStyleSelected() ), + shortCuts[name], this, TQT_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() - TQT_TQOBJECT(this), TQT_SLOT( slotFrameStyleSelected() ), + this, TQT_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], TQT_TQOBJECT(this), TQT_SLOT( slotTableStyleSelected() ), + shortCuts[name], this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: m_doc->setZoomMode(KoZoomMode::ZOOM_PAGE); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: m_doc->setZoomMode(KoZoomMode::ZOOM_PAGE); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); } ok = true; } @@ -3451,9 +3451,9 @@ void KWView::insertSpecialChar() { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); connect( m_specialCharDlg, TQT_SIGNAL( finished() ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); + this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -3463,9 +3463,9 @@ void KWView::slotSpecialCharDlgClosed() if ( m_specialCharDlg ) { disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); + this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } @@ -3650,7 +3650,7 @@ void KWView::formatFont() , this, "" ); connect( m_fontDlg, TQT_SIGNAL( applyFont() ), - TQT_TQOBJECT(this), TQT_SLOT( slotApplyFont() ) ); + this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplyParag())); + connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), this, TQT_SLOT( slotApplyParag())); m_paragDlg->exec(); delete m_paragDlg; @@ -5558,7 +5558,7 @@ TQPopupMenu * KWView::popupMenu( const TQString& name ) void KWView::startKSpell() { if ( !m_spell.kospell ) - m_spell.kospell = new KoSpell( m_broker, TQT_TQOBJECT(this) ); + m_spell.kospell = new KoSpell( m_broker, this ); // Spell-check the next paragraph Q_ASSERT( m_spell.textIterator ); @@ -5569,15 +5569,15 @@ void KWView::startKSpell() m_spell.dlg->activeAutoCorrect( true ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + this, TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + this, TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) ); + this, TQT_SLOT(spellCheckerDone(const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), - TQT_TQOBJECT(this), TQT_SLOT( spellCheckerCancel() ) ); + this, TQT_SLOT( spellCheckerCancel() ) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); + this, TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); m_spell.dlg->show(); //clearSpellChecker(); @@ -6298,14 +6298,14 @@ void KWView::showDocStructure() { m_doc->setShowDocStruct(m_actionShowDocStruct->isChecked()); m_doc->reorganizeGUI(); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); } void KWView::showRuler() { m_doc->setShowRuler( m_actionShowRuler->isChecked()); m_doc->reorganizeGUI(); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotCorrectWord()) ); + connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotCorrectWord()) ); listAction.append( act ); } } @@ -7645,10 +7645,10 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) 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 ) ), TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + 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 ) ), TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + connect( m_vertRuler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); m_horRuler->hide(); m_vertRuler->hide(); diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 65534802..04bd1830 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -206,7 +206,7 @@ void KWQtSqlDataSourceEditor::slotSetQuery() void KWQtSqlDataSourceEditor::editFilter() { - KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(parent())); + KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(static_cast<TQWidget*>(parent())); f->exec(); } diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp index 74c49a7e..e11654e9 100644 --- a/lib/kofficecore/KoContainerHandler.cpp +++ b/lib/kofficecore/KoContainerHandler.cpp @@ -71,7 +71,7 @@ public: KoPartResizeHandler::KoPartResizeHandler( TQWidget* widget, const TQWMatrix& matrix, KoView* view, KoChild* child, KoChild::Gadget gadget, const TQPoint& point ) - : KoEventHandler( TQT_TQOBJECT(widget) ) + : KoEventHandler( widget ) { child->lock(); d=new KoPartResizeHandlerPrivate(matrix, view, child, gadget, point); @@ -230,7 +230,7 @@ public: KoPartMoveHandler::KoPartMoveHandler( TQWidget* widget, const TQWMatrix& matrix, KoView* view, KoChild* child, const TQPoint& point ) - : KoEventHandler( TQT_TQOBJECT(widget) ) + : KoEventHandler( widget ) { child->lock(); d=new KoPartMoveHandlerPrivate(matrix, view, child, point); @@ -274,7 +274,7 @@ bool KoPartMoveHandler::eventFilter( TQObject*, TQEvent* ev ) // ------------------------------------------------------- KoContainerHandler::KoContainerHandler( KoView* view, TQWidget* widget ) - : KoEventHandler( TQT_TQOBJECT(widget) ) + : KoEventHandler( widget ) { m_view = view; } @@ -312,19 +312,19 @@ bool KoContainerHandler::eventFilter( TQObject*, TQEvent* ev ) } else if ( e->button() == TQt::LeftButton && gadget == KoChild::Move ) { - (void)new KoPartMoveHandler( TQT_TQWIDGET(target()), m_view->matrix(), m_view, ch, pos ); + (void)new KoPartMoveHandler( static_cast<TQWidget*>(target()), m_view->matrix(), m_view, ch, pos ); return true; } else if ( e->button() == TQt::LeftButton && gadget != KoChild::NoGadget ) { - (void)new KoPartResizeHandler( TQT_TQWIDGET(target()), m_view->matrix(), m_view, ch, gadget, pos ); + (void)new KoPartResizeHandler( static_cast<TQWidget*>(target()), m_view->matrix(), m_view, ch, gadget, pos ); return true; } return false; } else if ( ev->type() == TQEvent::MouseMove ) { - TQWidget *targetWidget = TQT_TQWIDGET( target() ); + TQWidget *targetWidget = static_cast<TQWidget*>( target() ); KoChild::Gadget gadget; TQPoint pos; TQMouseEvent *e=static_cast<TQMouseEvent*>(ev); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 99bd8459..6a6331de 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -184,7 +184,7 @@ public: { TQObject *wid = child( 0, "TQWidget" ); if ( wid ) - TQT_TQWIDGET(wid)->setGeometry( 0, 0, width(), height() ); + static_cast<TQWidget*>(wid)->setGeometry( 0, 0, width(), height() ); } virtual void childEvent( TQChildEvent *ev ) diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index a1675514..c2680b44 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -193,7 +193,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_manager = new KoPartManager( this ); connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotActivePartChanged( KParts::Part * ) ) ); + this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ), actionCollection(), "file_new" ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - m_recent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); - d->m_paSave = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection(), "file_save" ); - d->m_paSaveAs = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection(), "file_save_as" ); - d->m_paPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection(), "file_print" ); - d->m_paPrintPreview = KStdAction::printPreview( TQT_TQOBJECT(this), TQT_SLOT( slotFilePrintPreview() ), actionCollection(), "file_print_preview" ); - d->m_sendfile = KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT( slotEmailFile() ), actionCollection(), "file_send_file"); + 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"); - d->m_paCloseFile = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); + d->m_paCloseFile = KStdAction::close( this, TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" ); + KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); d->m_reloadfile = new TDEAction( i18n( "Reload"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotReloadFile() ), + this, TQT_SLOT( slotReloadFile() ), actionCollection(), "file_reload_file"); d->m_versionsfile = new TDEAction( i18n( "Versions..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotVersionsFile() ), + this, TQT_SLOT( slotVersionsFile() ), actionCollection(), "file_versions_file"); d->m_importFile = new TDEAction( i18n( "I&mport..." ), 0, // clashing accel key :( - TQT_TQOBJECT(this), TQT_SLOT( slotImportFile() ), + this, TQT_SLOT( slotImportFile() ), actionCollection(), "file_import_file"); d->m_exportFile = new TDEAction( i18n( "E&xport..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotExportFile() ), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( slotDocumentInfo() ), + this, TQT_SLOT( slotDocumentInfo() ), actionCollection(), "file_documentinfo" ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::configureToolbars( this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(slotCloseAllViews()), + "ctrl+shift+w", this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitView()), + this, TQT_SLOT(slotSplitView()), actionCollection(), "view_split")); d->m_removeView=new TDEAction(i18n("&Remove View"), "view_remove", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveView()), + this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT(slotSetOrientation()), + this, TQT_SLOT(slotSetOrientation()), actionCollection(), "view_splitter_orientation"); TQStringList items; items << i18n("&Vertical") @@ -281,7 +281,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_orientation->setItems(items); d->m_orientation->setCurrentItem(static_cast<int>(d->m_splitter->orientation())); d->m_splitViewActionList.append(d->m_orientation); - d->m_splitViewActionList.append(new TDEActionSeparator(TQT_TQOBJECT(this))); + d->m_splitViewActionList.append(new TDEActionSeparator(this)); // Load list of recent files TDEConfig * config = instance ? instance->config() : TDEGlobal::config(); @@ -596,9 +596,9 @@ bool KoMainWindow::openDocumentInternal( const KURL & url, KoDocument *newdoc ) return false; d->m_firstTime=true; - connect(newdoc, TQT_SIGNAL(sigProgress(int)), TQT_TQOBJECT(this), TQT_SLOT(slotProgress(int))); - connect(newdoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadCompleted())); - connect(newdoc, TQT_SIGNAL(canceled( const TQString & )), TQT_TQOBJECT(this), TQT_SLOT(slotLoadCanceled( const TQString & ))); + 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 & ))); 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)), TQT_TQOBJECT(this), TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), TQT_TQOBJECT(this), TQT_SLOT(slotLoadCanceled( const TQString & ))); + 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 & ))); } 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)), TQT_TQOBJECT(this), TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), TQT_TQOBJECT(this), TQT_SLOT(slotLoadCanceled( const TQString & ))); + 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 & ))); 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)), TQT_TQOBJECT(this), TQT_SLOT(slotProgress(int))); - disconnect(pDoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(slotSaveCompleted())); + 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 & )), - TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled( const TQString & ))); + this, TQT_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)), TQT_TQOBJECT(this), TQT_SLOT(slotProgress(int))); - connect(pDoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(slotSaveCompleted())); + 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 & )), - TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled( const TQString & ))); + this, TQT_SLOT(slotSaveCanceled( const TQString & ))); KURL oldURL = pDoc->url(); TQString oldFile = pDoc->file(); @@ -893,7 +893,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) // (not Save As) they won't be expecting that they are // using their File/Export settings // - // As a bad side-effect of TQT_TQOBJECT(this), the modified flag will not + // As a bad side-effect of this, the modified flag will not // be updated and it is possible that what is currently on // their screen is not what is stored on disk (through loss // of formatting). But if you are dumb enough to change @@ -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)), TQT_TQOBJECT(this), TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), TQT_TQOBJECT(this), TQT_SLOT(slotProgress(int))); + connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); + disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); if ( ( !doc && ( initDocFlags == KoDocument::InitDocFileNew ) ) || ( doc && !doc->isEmpty() ) ) { @@ -1447,7 +1447,7 @@ void KoMainWindow::slotProgress(int value) { TQObjectList *l = queryList( "TQStatusBar" ); if ( !l || !l->first() ) { statusBar()->show(); - TQApplication::sendPostedEvents( TQT_TQOBJECT(this), TQEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); setUpLayout(); } delete l; @@ -1506,7 +1506,7 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) if ( !d->bMainWindowGUIBuilt ) { // Load mainwindow plugins - KParts::Plugin::loadPlugins( TQT_TQOBJECT(this), this, instance(), true ); + KParts::Plugin::loadPlugins( this, this, instance(), true ); createShellGUI(); } @@ -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 ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) ); + connect( act, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToolbarToggled( bool ) ) ); act->setChecked ( !tb->isHidden() ); d->m_toolbarList.append( act ); } diff --git a/lib/kofficecore/KoMainWindowIface.cpp b/lib/kofficecore/KoMainWindowIface.cpp index 51d782b1..fda04670 100644 --- a/lib/kofficecore/KoMainWindowIface.cpp +++ b/lib/kofficecore/KoMainWindowIface.cpp @@ -27,7 +27,7 @@ #include <kdcopactionproxy.h> KoMainWindowIface::KoMainWindowIface( KoMainWindow *mainwindow ) - : DCOPObject( TQT_TQOBJECT(mainwindow) ) + : DCOPObject( mainwindow ) { m_pMainWindow = mainwindow; m_actionProxy = new KDCOPActionProxy( mainwindow->actionCollection(), this ); diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 322c1a7d..6bebf91e 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -114,7 +114,7 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) //kdDebug(30003) << "KoView::KoView " << this << endl; d = new KoViewPrivate; d->m_doc = document; - KParts::PartBase::setPartObject( TQT_TQOBJECT(this) ); + KParts::PartBase::setPartObject( this ); setFocusPolicy( TQWidget::StrongFocus ); @@ -533,7 +533,7 @@ void KoView::slotChildActivated( bool a ) // Is the new active view a child of this one ? // In this case we may not delete! // TQObject *n = d->m_manager->activeWidget(); - TQObject *n = TQT_TQOBJECT(activeWidget); + TQObject *n = activeWidget; while( n ) if ( n == (TQObject *)view ) return; @@ -627,7 +627,7 @@ void KoView::slotAutoScroll( ) void KoView::setupGlobalActions() { actionNewView = new TDEAction( i18n( "&New View" ), "window-new", 0, - TQT_TQOBJECT(this), TQT_SLOT( newView() ), + this, TQT_SLOT( newView() ), actionCollection(), "view_newview" ); } diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index b530a93c..2db2bd31 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -364,7 +364,7 @@ void KoHelpWidget::timerEvent( TQTimerEvent* ) void KoHelpWidget::stopScrolling() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); } // KoHelpWidget::stopScrolling KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent ) diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index bbe4145a..f202177c 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -75,7 +75,7 @@ TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, cons TQPainter p( &pixmap ); p.fillRect( 0, 0, 12, 12, defaultColor ); p.end(); - proxy = new KoColorPopupProxy( defaultColor, 0, TQT_TQOBJECT(menu), "color proxy" ); + 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() ) ); menu->insertSeparator(); @@ -92,7 +92,7 @@ TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, cons connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); menu->insertItem( panel ); if ( !proxy ) { - proxy = new KoColorPopupProxy( TQColor(), panel, TQT_TQOBJECT(menu), "color proxy" ); + proxy = new KoColorPopupProxy( TQColor(), panel, menu, "color proxy" ); connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); } else @@ -636,7 +636,7 @@ void KoColorPopupProxy::slotMoreColors() TQColor newColor; TQWidget* p = 0; if ( parent() && parent()->isWidgetType() ) - p = TQT_TQWIDGET( parent() ); + p = static_cast<TQWidget*>( parent() ); if ( KColorDialog::getColor( newColor, p ) == TQDialog::Accepted ) { m_recentColors->insertColor( newColor ); @@ -832,7 +832,7 @@ bool KoToolButton::eventFilter( TQObject* o, TQEvent* e ) void KoToolButton::init() { - m_popup = KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::yellow, TQT_TQOBJECT(this), + m_popup = KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::yellow, this, TQT_SLOT( colorSelected( const TQColor& ) ), this, "no-name" ); // We are interested in the mouse clicks on the arrow button diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 4c4a5c45..5c5bdbd9 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -124,7 +124,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name ) , m_stepInPoints( 1 ) { KDoubleSpinBox::setPrecision( 2 ); - m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); + m_validator = new KoUnitDoubleValidator( this, this ); TQSpinBox::setValidator( m_validator ); setAcceptLocalizedNumbers( true ); setUnit( KoUnit::U_PT ); @@ -145,7 +145,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, m_lowerInPoints( lower ), m_upperInPoints( upper ), m_stepInPoints( step ) { m_unit = KoUnit::U_PT; - m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); + m_validator = new KoUnitDoubleValidator( this, this ); TQSpinBox::setValidator( m_validator ); setAcceptLocalizedNumbers( true ); setUnit( unit ); @@ -224,7 +224,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name ) m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { setAlignment( TQt::AlignRight ); - m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); + m_validator = new KoUnitDoubleValidator( this, this ); setValidator( m_validator ); setUnit( KoUnit::U_PT ); changeValue( KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) ); @@ -236,7 +236,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub m_lowerInPoints( lower ), m_upperInPoints( upper ) { setAlignment( TQt::AlignRight ); - m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); + m_validator = new KoUnitDoubleValidator( this, this ); setValidator( m_validator ); setUnit( unit ); changeValue( KoUnit::ptToUnit( value, unit ) ); @@ -288,7 +288,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { lineEdit()->setAlignment( TQt::AlignRight ); - m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); + m_validator = new KoUnitDoubleValidator( this, this ); lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); changeValue( KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) ); @@ -301,7 +301,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub m_lowerInPoints( lower ), m_upperInPoints( upper ) { lineEdit()->setAlignment( TQt::AlignRight ); - m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); + m_validator = new KoUnitDoubleValidator( this, this ); lineEdit()->setValidator( m_validator ); setUnit( unit ); changeValue( KoUnit::ptToUnit( value, unit ) ); diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index b9ff452a..a000ca56 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -109,7 +109,7 @@ void KoLineWidthAction::execute(int index) d->m_currentWidth = (double) index + 1.0; ok = true; } if(index == 11) { // Custom width dialog... - KoLineWidthChooser dlg(TQT_TQWIDGET(tqApp->activeWindow())); + KoLineWidthChooser dlg(tqApp->activeWindow()); dlg.setUnit(d->m_unit); dlg.setWidth(d->m_currentWidth); diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index cf55a84a..8eaf1d9d 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -240,7 +240,7 @@ void TTDESelectColorAction::selectColorDialog() if ( d->defaultColorMenu ) { - if ( KColorDialog::getColor(c,d->defaultColor, TQT_TQWIDGET(tqApp->activeWindow())) == TQDialog::Accepted ) + if ( KColorDialog::getColor(c,d->defaultColor, tqApp->activeWindow()) == TQDialog::Accepted ) { setCurrentColor(c); m_pRecentColor->insertColor(m_pCurrentColor); @@ -250,7 +250,7 @@ void TTDESelectColorAction::selectColorDialog() } else { - if ( KColorDialog::getColor(c, TQT_TQWIDGET(tqApp->activeWindow())) == TQDialog::Accepted ) + if ( KColorDialog::getColor(c, tqApp->activeWindow()) == TQDialog::Accepted ) { setCurrentColor(c); m_pRecentColor->insertColor(m_pCurrentColor); diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index ddd23539..8dfb6e8b 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it) if (d->currentWidget) { if (d->currentWidget->visibleFlag()) { d->currentWidget->show(); - if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->focusWidget()) )) + if (hasParent( this, kapp->focusWidget() )) d->currentWidget->setFocus(); } } diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 81f0c1cb..3a53d9a0 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -40,7 +40,7 @@ IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntE installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); - TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first())); + TQSpinWidget* spin = static_cast<TQSpinWidget*>(spinwidgets->first()); if (spin) spin->installEventFilter(this); delete spinwidgets; @@ -155,7 +155,7 @@ void IntEdit::updateSpinWidgets() { TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); - TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first())); + TQSpinWidget* spin = static_cast<TQSpinWidget*>(spinwidgets->first()); if (spin) { spin->setUpEnabled(!isReadOnly()); spin->setDownEnabled(!isReadOnly()); @@ -183,7 +183,7 @@ DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double va installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); - TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first())); + TQSpinWidget* spin = static_cast<TQSpinWidget*>(spinwidgets->first()); if (spin) spin->installEventFilter(this); delete spinwidgets; @@ -308,7 +308,7 @@ void DoubleEdit::updateSpinWidgets() { TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); - TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first())); + TQSpinWidget* spin = static_cast<TQSpinWidget*>(spinwidgets->first()); if (spin) { spin->setUpEnabled(!isReadOnly()); spin->setDownEnabled(!isReadOnly()); diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index 23bb80f7..b5d9cae5 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -50,7 +50,7 @@ Test::Test() /* First, create the Set which will hold the properties. */ Property *p = 0; - m_set = new Set(TQT_TQOBJECT(this), "test"); + m_set = new Set(this, "test"); m_set->setReadOnly(readOnly); TQCString group; if (!flat) { |