From d5688771d8a6837975be512ee37f61bad7dbd345 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Dec 2023 11:50:23 +0900 Subject: [PATCH] Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- arts/kde/kvideowidget.cpp | 8 +- dcop/dcopobject.cpp | 4 +- interfaces/khexedit/byteseditinterface.h | 2 +- .../tdefileaudiopreview.cpp | 4 +- kate/data/isocpp.xml | 1 - kate/data/objectivec.xml | 1 - kate/data/objectivecpp.xml | 1 - kate/part/kateview.cpp | 190 +++++++++--------- kate/part/kateviewinternal.cpp | 2 +- libtdescreensaver/tdescreensaver.cpp | 2 +- tdeabc/resourceselectdialog.cpp | 4 +- tdecore/kcheckaccelerators.cpp | 2 +- tdecore/kclipboard.cpp | 2 +- tdecore/kextsock.cpp | 2 +- tdecore/kgenericfactory.h | 4 +- tdecore/kmanagerselection.cpp | 4 +- tdecore/knotifyclient.cpp | 2 +- tdecore/network/kresolver.cpp | 4 +- tdecore/tdeaccel.cpp | 2 +- tdecore/tdeaccelmanager.cpp | 4 +- tdecore/tdeapplication.cpp | 8 +- tdehtml/ecma/kjs_debugwin.cpp | 12 +- tdehtml/java/kjavaappletserver.cpp | 4 +- tdehtml/java/kjavaappletviewer.cpp | 2 +- tdehtml/java/kjavaappletwidget.cpp | 2 +- tdehtml/rendering/render_form.cpp | 10 +- tdehtml/tdehtml_part.cpp | 2 +- tdehtml/tdehtmlview.cpp | 16 +- tdeio/misc/uiserver.cpp | 6 +- tdeio/tdefile/kcustommenueditor.cpp | 8 +- tdeio/tdefile/kdirselectdialog.cpp | 6 +- tdeio/tdefile/kpreviewprops.cpp | 2 +- tdeio/tdefile/kpropertiesdialog.cpp | 2 +- tdeio/tdefile/kurlrequester.cpp | 8 +- tdeio/tdefile/tdediroperator.cpp | 28 +-- tdeio/tdefile/tdefiledialog.cpp | 6 +- tdeio/tdefile/tdefileiconview.cpp | 8 +- tdeio/tdefile/tdefilemetapreview.cpp | 2 +- tdeio/tdeio/kscan.cpp | 8 +- tdeio/tdeio/kservice.cpp | 2 +- tdeio/tdeio/renamedlg.cpp | 4 +- tdeio/tdeio/scheduler.cpp | 4 +- tdeio/tdeio/tdefilemetainfo.cpp | 2 +- tdemdi/tdemdi/dockcontainer.cpp | 2 +- tdemdi/tdemdi/guiclient.cpp | 4 +- tdemdi/tdemdi/mainwindow.cpp | 6 +- tdemdi/tdemdi/tabwidget.cpp | 4 +- tdemdi/tdemdichildfrm.cpp | 8 +- tdemdi/tdemdichildview.cpp | 4 +- tdemdi/tdemdidockcontainer.cpp | 2 +- tdemdi/tdemdiguiclient.cpp | 4 +- tdemdi/tdemdimainfrm.cpp | 12 +- tdenewstuff/provider.cpp | 6 +- tdeparts/dockmainwindow.cpp | 4 +- tdeparts/factory.cpp | 2 +- tdeparts/historyprovider.cpp | 2 +- tdeparts/mainwindow.cpp | 8 +- tdeparts/partmanager.cpp | 4 +- tdeprint/cups/kmcupsconfigwidget.cpp | 2 +- tdeprint/cups/kmwipp.cpp | 2 +- tdeprint/kmuimanager.cpp | 2 +- tdeprint/kprintdialog.cpp | 6 +- tdeprint/kprintpreview.cpp | 10 +- tdeprint/management/kmjobviewer.cpp | 16 +- tdeprint/management/kmmainview.cpp | 36 ++-- tdeprint/management/networkscanner.cpp | 2 +- tdeprint/rlpr/kmproxywidget.cpp | 2 +- tdeprint/tools/escputil/escpwidget.cpp | 4 +- tderandr/ktimerdialog.cpp | 2 +- tderesources/configpage.cpp | 8 +- tderesources/selectdialog.cpp | 4 +- tdespell2/ui/dialog.cpp | 24 +-- tdestyles/asteroid/asteroid.cpp | 2 +- tdestyles/highcolor/highcolor.cpp | 8 +- tdestyles/keramik/keramik.cpp | 26 +-- tdestyles/klegacy/klegacystyle.cpp | 2 +- tdestyles/kthemestyle/kthemestyle.cpp | 4 +- tdestyles/plastik/plastik.cpp | 8 +- tdeui/kcharselect.cpp | 2 +- tdeui/kcolordialog.cpp | 24 +-- tdeui/kdatetbl.cpp | 20 +- tdeui/kdockwidget.cpp | 22 +- tdeui/kjanuswidget.cpp | 10 +- tdeui/klineedit.cpp | 2 +- tdeui/knuminput.cpp | 2 +- tdeui/knumvalidator.cpp | 10 +- tdeui/kpanelapplet.cpp | 8 +- tdeui/kpixmapregionselectorwidget.cpp | 8 +- tdeui/ksystemtray.cpp | 4 +- tdeui/ktextedit.cpp | 2 +- tdeui/kxmlguibuilder.cpp | 2 +- tdeui/qxembed.cpp | 4 +- tdeui/tdeaboutdialog.cpp | 12 +- tdeui/tdemainwindow.cpp | 6 +- tdeui/tdemainwindowiface.cpp | 2 +- tdeui/tdemessagebox.cpp | 20 +- tdeui/tdetoolbar.cpp | 2 +- tdeui/twindowlistmenu.cpp | 2 +- tdeutils/kcmultidialog.cpp | 2 +- tdeutils/kfinddialog.cpp | 2 +- tdeutils/tdecmoduleloader.cpp | 2 +- tdewallet/client/tdewallet.cpp | 2 +- 102 files changed, 404 insertions(+), 407 deletions(-) diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index 5cd7030c3..2e0f77aea 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -102,16 +102,16 @@ void KVideoWidget::init(void) // Setup actions new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen", - CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()), + CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()), actionCollection(), "fullscreen_mode" ); new TDERadioAction( i18n("&Half Size"), ALT+Key_0, - TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()), + this, TQT_SLOT(halfSizeActivated()), actionCollection(), "half_size" ); new TDERadioAction( i18n("&Normal Size"), ALT+Key_1, - TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()), + this, TQT_SLOT(normalSizeActivated()), actionCollection(), "normal_size" ); new TDERadioAction( i18n("&Double Size"), ALT+Key_2, - TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()), + this, TQT_SLOT(doubleSizeActivated()), actionCollection(), "double_size" ); ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" ); diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp index f02d07325..fd39fb347 100644 --- a/dcop/dcopobject.cpp +++ b/dcop/dcopobject.cpp @@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj) while (currentObj != 0L) { ident.prepend( currentObj->name() ); ident.prepend("/"); - currentObj = TQT_TQOBJECT(currentObj->parent()); + currentObj = currentObj->parent(); } if ( ident[0] == '/' ) ident = ident.mid(1); @@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj ) { identity.prepend( currentObj->name() ); identity.prepend("/"); - currentObj = TQT_TQOBJECT(currentObj->parent()); + currentObj = currentObj->parent(); } if ( identity[0] == '/' ) identity = identity.mid(1); diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index 3bc5749d2..06749c4fe 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 ) { return KParts::ComponentFactory::createInstanceFromQuery - ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name ); + ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); } } diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp index 370805a74..72f870c7e 100644 --- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp @@ -25,7 +25,7 @@ protected: { Q_UNUSED(className); Q_UNUSED(args); - return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast( parent ), name )); + return new KFileAudioPreview( dynamic_cast( parent ), name ); } }; @@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate public: KFileAudioPreviewPrivate( TQWidget *parent ) { - player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) ); + player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", TQString(), parent ); } ~KFileAudioPreviewPrivate() diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml index 0637867fc..34b6e4c4e 100644 --- a/kate/data/isocpp.xml +++ b/kate/data/isocpp.xml @@ -204,7 +204,6 @@ TQ_UNUSED TQT_SIGNAL TQT_SLOT - TQT_TQOBJECT connect disconnect emit diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml index 612c1a4f5..59dfba5ad 100644 --- a/kate/data/objectivec.xml +++ b/kate/data/objectivec.xml @@ -127,7 +127,6 @@ TQ_UNUSED TQT_SIGNAL TQT_SLOT - TQT_TQOBJECT connect disconnect emit diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml index 8be78b2d4..6b8246afc 100644 --- a/kate/data/objectivecpp.xml +++ b/kate/data/objectivecpp.xml @@ -172,7 +172,6 @@ TQ_UNUSED TQT_SIGNAL TQT_SLOT - TQT_TQOBJECT connect disconnect emit diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index b40e3c19c..abf2941c7 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -187,21 +187,21 @@ KateView::~KateView() void KateView::setupConnections() { connect( m_doc, TQT_SIGNAL(undoChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotNewUndo()) ); + this, TQT_SLOT(slotNewUndo()) ); connect( m_doc, TQT_SIGNAL(hlChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotHlChanged()) ); + this, TQT_SLOT(slotHlChanged()) ); connect( m_doc, TQT_SIGNAL(canceled(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled(const TQString&)) ); + this, TQT_SLOT(slotSaveCanceled(const TQString&)) ); connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - TQT_TQOBJECT(this), TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); + this, TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg())); connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg())); - connect(m_doc, TQT_SIGNAL(undoChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg())); + connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotStatusMsg())); if ( m_doc->browserView() ) { connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(slotDropEventPass(TQDropEvent*)) ); + this, TQT_SLOT(slotDropEventPass(TQDropEvent*)) ); } } @@ -212,21 +212,21 @@ void KateView::setupActions() m_toggleWriteLock = 0; - m_cut = a=KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), ac); + m_cut = a=KStdAction::cut(this, TQT_SLOT(cut()), ac); a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard")); - m_paste = a=KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), ac); + m_paste = a=KStdAction::pasteText(this, TQT_SLOT(paste()), ac); a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents")); - m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); + m_copy = a=KStdAction::copy(this, TQT_SLOT(copy()), ac); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); - m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); + m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQT_SLOT(copyHTML()), ac, "edit_copy_html"); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); if (!m_doc->readOnly()) { - a=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), ac); + a=KStdAction::save(this, TQT_SLOT(save()), ac); a->setWhatsThis(i18n("Save the current document")); a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac); @@ -235,60 +235,60 @@ void KateView::setupActions() a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); a->setWhatsThis(i18n("Revert the most recent undo operation")); - (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( + (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( i18n("Use this command to wrap all lines of the current document which are longer than the width of the" " current view, to fit into this view.

This is a static word wrap, meaning it is not updated" " when the view is resized.")); // setup Tools menu - a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); + a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQT_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.

" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); + a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQT_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); - a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); + a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)

" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); + a=new TDEAction(i18n("&Align"), 0, this, TQT_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); - a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), + a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQT_SLOT(comment()), ac, "tools_comment"); a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.

" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), + a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQT_SLOT(uncomment()), ac, "tools_uncomment"); a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.

" "The characters for single/multiple line comments are defined within the language's highlighting.")); a = m_toggleWriteLock = new TDEToggleAction( i18n("&Read Only Mode"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ), + this, TQT_SLOT( toggleWriteLock() ), ac, "tools_toggle_write_lock" ); a->setWhatsThis( i18n("Lock/unlock the document for writing") ); - a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, this, TQT_SLOT(uppercase()), ac, "tools_uppercase" ); a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, this, TQT_SLOT(lowercase()), ac, "tools_lowercase" ); a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, this, TQT_SLOT(capitalize()), ac, "tools_capitalize" ); a->setWhatsThis( i18n("Capitalize the selection, or the word under the " "cursor if no text is selected.") ); - a = new TDEAction( i18n("Delete Line"), 0, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Delete Line"), 0, this, TQT_SLOT( killLine() ), ac, "tools_delete_line"); a->setWhatsThis(i18n("Use this to delete the current line.")); - a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, this, TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); a->setWhatsThis(i18n("Use this to join lines together.")); } @@ -303,13 +303,13 @@ void KateView::setupActions() a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); a->setWhatsThis(i18n("Print the current document.")); - a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); + a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQT_SLOT(reloadFile()), ac, "file_reload"); a->setWhatsThis(i18n("Reload the current document from disk.")); - a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac); + a=KStdAction::saveAs(this, TQT_SLOT(saveAs()), ac); a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice.")); - a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac); + a=KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), ac); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); @@ -329,45 +329,45 @@ void KateView::setupActions() new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); // html export - a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); + a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQT_SLOT(exportAsHTML()), ac, "file_export_html"); a->setWhatsThis(i18n("This command allows you to export the current document" " with all highlighting information into a HTML document.")); - m_selectAll = a=KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAll()), ac); + m_selectAll = a=KStdAction::selectAll(this, TQT_SLOT(selectAll()), ac); a->setWhatsThis(i18n("Select the entire text of the current document.")); - m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac); + m_deSelect = a=KStdAction::deselect(this, TQT_SLOT(clearSelection()), ac); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); - a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); + a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a->setWhatsThis(i18n("This increases the display font size.")); - a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); + a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a->setWhatsThis(i18n("This decreases the display font size.")); a= m_toggleBlockSelection = new TDEToggleAction( i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()), + this, TQT_SLOT(toggleBlockSelectionMode()), ac, "set_verticalSelect"); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); a= m_toggleInsert = new TDEToggleAction( i18n("Overwr&ite Mode"), Key_Insert, - TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()), + this, TQT_SLOT(toggleInsert()), ac, "set_insert" ); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); TDEToggleAction *toggleAction; a= m_toggleDynWrap = toggleAction = new TDEToggleAction( i18n("&Dynamic Word Wrap"), Key_F10, - TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()), + this, TQT_SLOT(toggleDynWordWrap()), ac, "view_dynamic_word_wrap" ); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); - connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int))); + connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDynWrapIndicators(int))); TQStringList list2; list2.append(i18n("&Off")); list2.append(i18n("Follow &Line Numbers")); @@ -376,14 +376,14 @@ void KateView::setupActions() a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction( i18n("Show Folding &Markers"), Key_F9, - TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()), + this, TQT_SLOT(toggleFoldingMarkers()), ac, "view_folding_markers" ); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); toggleAction->setCheckedState(i18n("Hide Folding &Markers")); a= m_toggleIconBar = toggleAction = new TDEToggleAction( i18n("Show &Icon Border"), Key_F6, - TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()), + this, TQT_SLOT(toggleIconBorder()), ac, "view_border"); a=toggleAction; a->setWhatsThis(i18n("Show/hide the icon border.

The icon border shows bookmark symbols, for instance.")); @@ -391,21 +391,21 @@ void KateView::setupActions() a= toggleAction=m_toggleLineNumbers = new TDEToggleAction( i18n("Show &Line Numbers"), Key_F11, - TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()), + this, TQT_SLOT(toggleLineNumbersOn()), ac, "view_line_numbers" ); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); toggleAction->setCheckedState(i18n("Hide &Line Numbers")); a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction( i18n("Show Scroll&bar Marks"), 0, - TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()), + this, TQT_SLOT(toggleScrollBarMarks()), ac, "view_scrollbar_marks"); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.

The marks, for instance, show bookmarks.")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); a = toggleAction = m_toggleWWMarker = new TDEToggleAction( i18n("Show Static &Word Wrap Marker"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ), + this, TQT_SLOT( toggleWWMarker() ), ac, "view_word_wrap_marker" ); a->setWhatsThis( i18n( "Show/hide the Word Wrap Marker, a vertical line drawn at the word " @@ -414,7 +414,7 @@ void KateView::setupActions() a= m_switchCmdLine = new TDEAction( i18n("Switch to Command Line"), Key_F7, - TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()), + this, TQT_SLOT(switchToCmdLine()), ac, "switch_to_cmd_line" ); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); @@ -426,10 +426,10 @@ void KateView::setupActions() list.append("&Macintosh"); m_setEndOfLine->setItems(list); m_setEndOfLine->setCurrentItem (m_doc->config()->eol()); - connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setEol(int))); + connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEol(int))); // encoding menu - new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), TQT_TQOBJECT(ac), "set_encoding"); + new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding"); m_search->createActions( ac ); m_spell->createActions( ac ); @@ -437,144 +437,144 @@ void KateView::setupActions() slotSelectionChanged (); - connect (this, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged())); + connect (this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); } void KateView::setupEditActions() { - m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); + m_editActions = new TDEActionCollection( m_viewInternal, this, "edit_actions" ); TDEActionCollection* ac = m_editActions; new TDEAction( i18n("Move Word Left"), CTRL + Key_Left, - TQT_TQOBJECT(this),TQT_SLOT(wordLeft()), + this,TQT_SLOT(wordLeft()), ac, "word_left" ); new TDEAction( i18n("Select Character Left"), SHIFT + Key_Left, - TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()), + this,TQT_SLOT(shiftCursorLeft()), ac, "select_char_left" ); new TDEAction( i18n("Select Word Left"), SHIFT + CTRL + Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()), + this, TQT_SLOT(shiftWordLeft()), ac, "select_word_left" ); new TDEAction( i18n("Move Word Right"), CTRL + Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(wordRight()), + this, TQT_SLOT(wordRight()), ac, "word_right" ); new TDEAction( i18n("Select Character Right"), SHIFT + Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()), + this, TQT_SLOT(shiftCursorRight()), ac, "select_char_right" ); new TDEAction( i18n("Select Word Right"), SHIFT + CTRL + Key_Right, - TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()), + this,TQT_SLOT(shiftWordRight()), ac, "select_word_right" ); new TDEAction( i18n("Move to Beginning of Line"), Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(home()), + this, TQT_SLOT(home()), ac, "beginning_of_line" ); new TDEAction( i18n("Move to Beginning of Document"), TDEStdAccel::home(), - TQT_TQOBJECT(this), TQT_SLOT(top()), + this, TQT_SLOT(top()), ac, "beginning_of_document" ); new TDEAction( i18n("Select to Beginning of Line"), SHIFT + Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(shiftHome()), + this, TQT_SLOT(shiftHome()), ac, "select_beginning_of_line" ); new TDEAction( i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(shiftTop()), + this, TQT_SLOT(shiftTop()), ac, "select_beginning_of_document" ); new TDEAction( i18n("Move to End of Line"), Key_End, - TQT_TQOBJECT(this), TQT_SLOT(end()), + this, TQT_SLOT(end()), ac, "end_of_line" ); new TDEAction( i18n("Move to End of Document"), TDEStdAccel::end(), - TQT_TQOBJECT(this), TQT_SLOT(bottom()), + this, TQT_SLOT(bottom()), ac, "end_of_document" ); new TDEAction( i18n("Select to End of Line"), SHIFT + Key_End, - TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()), + this, TQT_SLOT(shiftEnd()), ac, "select_end_of_line" ); new TDEAction( i18n("Select to End of Document"), SHIFT + CTRL + Key_End, - TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()), + this, TQT_SLOT(shiftBottom()), ac, "select_end_of_document" ); new TDEAction( i18n("Select to Previous Line"), SHIFT + Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(shiftUp()), + this, TQT_SLOT(shiftUp()), ac, "select_line_up" ); new TDEAction( i18n("Scroll Line Up"),"", CTRL + Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(scrollUp()), + this, TQT_SLOT(scrollUp()), ac, "scroll_line_up" ); - new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), + new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQT_SLOT(down()), ac, "move_line_down"); - new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), + new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQT_SLOT(up()), ac, "move_line_up"); - new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), + new TDEAction(i18n("Move Character Right"), Key_Right, this, TQT_SLOT(cursorRight()), ac, "move_cursor_right"); - new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), + new TDEAction(i18n("Move Character Left"), Key_Left, this, TQT_SLOT(cursorLeft()), ac, "move_cusor_left"); new TDEAction( i18n("Select to Next Line"), SHIFT + Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(shiftDown()), + this, TQT_SLOT(shiftDown()), ac, "select_line_down" ); new TDEAction( i18n("Scroll Line Down"), CTRL + Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(scrollDown()), + this, TQT_SLOT(scrollDown()), ac, "scroll_line_down" ); new TDEAction( i18n("Scroll Page Up"), TDEStdAccel::prior(), - TQT_TQOBJECT(this), TQT_SLOT(pageUp()), + this, TQT_SLOT(pageUp()), ac, "scroll_page_up" ); new TDEAction( i18n("Select Page Up"), SHIFT + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()), + this, TQT_SLOT(shiftPageUp()), ac, "select_page_up" ); new TDEAction( i18n("Move to Top of View"), CTRL + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(topOfView()), + this, TQT_SLOT(topOfView()), ac, "move_top_of_view" ); new TDEAction( i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()), + this, TQT_SLOT(shiftTopOfView()), ac, "select_top_of_view" ); new TDEAction( i18n("Scroll Page Down"), TDEStdAccel::next(), - TQT_TQOBJECT(this), TQT_SLOT(pageDown()), + this, TQT_SLOT(pageDown()), ac, "scroll_page_down" ); new TDEAction( i18n("Select Page Down"), SHIFT + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()), + this, TQT_SLOT(shiftPageDown()), ac, "select_page_down" ); new TDEAction( i18n("Move to Bottom of View"), CTRL + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()), + this, TQT_SLOT(bottomOfView()), ac, "move_bottom_of_view" ); new TDEAction( i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()), + this, TQT_SLOT(shiftBottomOfView()), ac, "select_bottom_of_view" ); new TDEAction( i18n("Move to Matching Bracket"), CTRL + Key_6, - TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()), + this, TQT_SLOT(toMatchingBracket()), ac, "to_matching_bracket" ); new TDEAction( i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, - TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()), + this, TQT_SLOT(shiftToMatchingBracket()), ac, "select_matching_bracket" ); // anders: shortcuts doing any changes should not be created in browserextension @@ -582,30 +582,30 @@ void KateView::setupEditActions() { new TDEAction( i18n("Transpose Characters"), CTRL + Key_T, - TQT_TQOBJECT(this), TQT_SLOT(transpose()), + this, TQT_SLOT(transpose()), ac, "transpose_char" ); new TDEAction( i18n("Delete Line"), CTRL + Key_K, - TQT_TQOBJECT(this), TQT_SLOT(killLine()), + this, TQT_SLOT(killLine()), ac, "delete_line" ); new TDEAction( i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(), - TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()), + this, TQT_SLOT(deleteWordLeft()), ac, "delete_word_left" ); new TDEAction( i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(), - TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()), + this, TQT_SLOT(deleteWordRight()), ac, "delete_word_right" ); new TDEAction(i18n("Delete Next Character"), Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(keyDelete()), + this, TQT_SLOT(keyDelete()), ac, "delete_next_character"); TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace, - TQT_TQOBJECT(this), TQT_SLOT(backspace()), + this, TQT_SLOT(backspace()), ac, "backspace"); TDEShortcut cut = a->shortcut(); cut.append( KKey( SHIFT + Key_Backspace ) ); @@ -613,9 +613,9 @@ void KateView::setupEditActions() } connect( this, TQT_SIGNAL(gotFocus(Kate::View*)), - TQT_TQOBJECT(this), TQT_SLOT(slotGotFocus()) ); + this, TQT_SLOT(slotGotFocus()) ); connect( this, TQT_SIGNAL(lostFocus(Kate::View*)), - TQT_TQOBJECT(this), TQT_SLOT(slotLostFocus()) ); + this, TQT_SLOT(slotLostFocus()) ); m_editActions->readShortcutSettings( "Katepart Shortcuts" ); @@ -633,14 +633,14 @@ void KateView::setupCodeFolding() new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, - TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); + this,TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, - TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); + this,TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus, - TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); + this,TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); #ifdef DEBUGACCELS - TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this)); + TDEAccel* debugAccels = new TDEAccel(this,this); debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); debugAccels->setEnabled(true); @@ -670,15 +670,15 @@ void KateView::setupCodeCompletion() { m_codeCompletion = new KateCodeCompletion(this); connect( m_codeCompletion, TQT_SIGNAL(completionAborted()), - TQT_TQOBJECT(this), TQT_SIGNAL(completionAborted())); + this, TQT_SIGNAL(completionAborted())); connect( m_codeCompletion, TQT_SIGNAL(completionDone()), - TQT_TQOBJECT(this), TQT_SIGNAL(completionDone())); + this, TQT_SIGNAL(completionDone())); connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()), - TQT_TQOBJECT(this), TQT_SIGNAL(argHintHidden())); + this, TQT_SIGNAL(argHintHidden())); connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - TQT_TQOBJECT(this), TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry))); + this, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry))); connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), - TQT_TQOBJECT(this), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); + this, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); } void KateView::slotGotFocus() diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 732aa06a5..8a1ab6f05 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -57,7 +57,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) , editIsRunning (false) , m_view (view) , m_doc (doc) - , cursor (doc, true, 0, 0, TQT_TQOBJECT(this)) + , cursor (doc, true, 0, 0, this) , possibleTripleClick (false) , m_dummy (0) , m_startPos(doc, true, 0,0) diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp index 16449c189..bedb124cd 100644 --- a/libtdescreensaver/tdescreensaver.cpp +++ b/libtdescreensaver/tdescreensaver.cpp @@ -50,7 +50,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget() XSync(tqt_xdisplay(), false); d = new KScreenSaverPrivate; - d->owner = TQT_TQWIDGET(find( id )); + d->owner = find( id ); if ( d->owner ) installEventFilter( this ); diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp index 0dc2aec04..186924aa2 100644 --- a/tdeabc/resourceselectdialog.cpp +++ b/tdeabc/resourceselectdialog.cpp @@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index b71084243..fd722a964 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on) void KCheckAccelerators::checkAccelerators( bool automatic ) { - TQWidget* actWin = TQT_TQWIDGET(tqApp->activeWindow()); + TQWidget* actWin = tqApp->activeWindow(); if ( !actWin ) return; diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 8ab23cccc..5937a3392 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false; TDEClipboardSynchronizer * TDEClipboardSynchronizer::self() { if ( !s_self ) - s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); + s_self = new TDEClipboardSynchronizer( kapp, "KDE Clipboard" ); return s_self; } diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index 933691855..2e10f873e 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -1228,7 +1228,7 @@ int KExtendedSocket::startAsyncConnect() // here we have d->status >= lookupDone and <= connecting // we can do our connection d->status = connecting; - TQGuardedPtr p = TQT_TQOBJECT(this); + TQGuardedPtr p = this; connectionEvent(); if (!p) return -1; // We have been deleted. diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h index e229e73fd..e6722b8dd 100644 --- a/tdecore/kgenericfactory.h +++ b/tdecore/kgenericfactory.h @@ -190,8 +190,8 @@ protected: const char *className, const TQStringList &args ) { KGenericFactoryBase::initializeMessageCatalogue(); - return TQT_TQOBJECT((KDEPrivate::ConcreteFactory - ::create( 0, 0, parent, name, className, args ))); + return (KDEPrivate::ConcreteFactory + ::create( 0, 0, parent, name, className, args )); } }; diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp index 0655a4d7e..5bda6d6ed 100644 --- a/tdecore/kmanagerselection.cpp +++ b/tdecore/kmanagerselection.cpp @@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P ) : owner( owner_P ) { - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + kapp->installX11EventFilter( this ); } bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P ) @@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P ) : watcher( watcher_P ) { - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + kapp->installX11EventFilter( this ); } bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P ) diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index b1989fbf6..a1fad6a36 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -97,7 +97,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure! // knotify daemon needs toplevel window - TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId )); + TQWidget* widget = TQWidget::find( (WId)winId ); if( widget ) winId = (int)widget->topLevelWidget()->winId(); diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index 4c2f34ff5..17ab2f068 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -591,7 +591,7 @@ KResolverResults KResolver::resolve(const TQString& host, const TQString& service, int flags, int families) { - KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver"); + KResolver qres(host, service, tqApp, "synchronous KResolver"); qres.setFlags(flags); qres.setFamily(families); qres.start(); @@ -603,7 +603,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot, const TQString& host, const TQString& service, int flags, int families) { - KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver"); + KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver"); TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot); qres->setFlags(flags); qres->setFamily(families); diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp index eaa33a9c0..58499f7e4 100644 --- a/tdecore/tdeaccel.cpp +++ b/tdecore/tdeaccel.cpp @@ -111,7 +111,7 @@ TDEAccelEventHandler::TDEAccelEventHandler() { # ifdef Q_WS_X11 if ( kapp ) - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + kapp->installX11EventFilter( this ); # endif } diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp index 2c0e10aa3..e7cfb10eb 100644 --- a/tdecore/tdeaccelmanager.cpp +++ b/tdecore/tdeaccelmanager.cpp @@ -265,7 +265,7 @@ void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item TQObjectList *childList = widget->queryList("TQWidget", 0, false, false); for ( TQObject *it = childList->first(); it; it = childList->next() ) { - TQWidget *w = TQT_TQWIDGET(it); + TQWidget *w = static_cast(it); if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast(w) == NULL ) ) continue; @@ -846,7 +846,7 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack) bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e ) { if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) { - TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) ); + TDEAcceleratorManager::manage( tqApp->activeWindow() ); watched->removeEventFilter( this ); } return false; diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index fd1e04c32..810942e21 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -626,7 +626,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) } if( t == TQEvent::Show && receiver->isWidgetType()) { - TQWidget* w = TQT_TQWIDGET( receiver ); + TQWidget* w = static_cast( receiver ); #if defined Q_WS_X11 if( w->isTopLevel() && !startupId().isEmpty() && !static_cast(event)->spontaneous()) // TODO better done using window group leader? TDEStartupInfo::setWindowStartupId( w->winId(), startupId()); @@ -1099,7 +1099,7 @@ void TDEApplication::init(bool GUIenabled) TQMimeSourceFactory::addFactory( oldDefaultFactory ); } - d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) ); + d->checkAccelerators = new KCheckAccelerators( this ); } #ifdef Q_WS_MACX @@ -1132,7 +1132,7 @@ void TDEApplication::init(bool GUIenabled) // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage, // which makes it impossible to use the -reverse cmdline switch with KDE apps bool rtl = reverseLayout(); - installTranslator(new KDETranslator(TQT_TQOBJECT(this))); + installTranslator(new KDETranslator(this)); setReverseLayout( rtl ); if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in " "left-to-right languages (as english) or to 'RTL' in right-to-left " @@ -2307,7 +2307,7 @@ void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigne void TDEApplication::invokeEditSlot( const char *slot ) { - TQObject *object = TQT_TQOBJECT(focusWidget()); + TQObject *object = focusWidget(); if( !object ) return; diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index 2b6cef798..1a75709f8 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -445,18 +445,18 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) // Venkman use F12, KDevelop F10 TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12))); scNext.append(KKeySequence(KKey(TQt::Key_F10))); - m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()), + m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQT_SLOT(slotNext()), m_actionCollection,"next"); - m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()), + m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQT_SLOT(slotStep()), m_actionCollection,"step"); // Venkman use F5, Kdevelop F9 TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5))); scCont.append(KKeySequence(KKey(TQt::Key_F9))); - m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()), + m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQT_SLOT(slotContinue()), m_actionCollection,"cont"); - m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()), + m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQT_SLOT(slotStop()), m_actionCollection,"stop"); - m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()), + m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQT_SLOT(slotBreakNext()), m_actionCollection,"breaknext"); @@ -677,7 +677,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Close: case TQEvent::Quit: while (o->parent()) - o = TQT_TQOBJECT(o->parent()); + o = o->parent(); if (o == this) return TQWidget::eventFilter(o,e); else diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp index 64e87c5e5..a83dad118 100644 --- a/tdehtml/java/kjavaappletserver.cpp +++ b/tdehtml/java/kjavaappletserver.cpp @@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) KSSLCertChain chain; chain.setChain( certs ); if ( chain.isValid() ) - answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] ); + answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] ); } } sl.push_front( TQString(answer) ); @@ -777,7 +777,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent ) {} TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) { - TQGuardedPtr dialog = new TQDialog( TQT_TQWIDGET(parent()), "PermissionDialog"); + TQGuardedPtr dialog = new TQDialog( static_cast(parent()), "PermissionDialog"); dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); dialog->setModal( true ); diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp index 6c3f13ace..6145470bf 100644 --- a/tdehtml/java/kjavaappletviewer.cpp +++ b/tdehtml/java/kjavaappletviewer.cpp @@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { KJavaAppletViewer::~KJavaAppletViewer () { m_view = 0L; - serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl); + serverMaintainer->releaseContext (parent(), baseurl); if (m_statusbar_icon) { m_statusbar->removeStatusBarItem (m_statusbar_icon); delete m_statusbar_icon; diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp index 2537abed7..7f1d7f00f 100644 --- a/tdehtml/java/kjavaappletwidget.cpp +++ b/tdehtml/java/kjavaappletwidget.cpp @@ -46,7 +46,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name ) m_applet = new KJavaApplet( this ); d = new KJavaAppletWidgetPrivate; - m_kwm = new KWinModule( TQT_TQOBJECT(this) ); + m_kwm = new KWinModule( this ); d->tmplabel = new TQLabel( this ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 8462f711b..0fd9029db 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi { setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac ); + m_spellAction = KStdAction::spelling( this, TQT_SLOT( slotCheckSpelling() ), ac ); } LineEditWidget::~LineEditWidget() @@ -328,7 +328,7 @@ void LineEditWidget::slotCheckSpelling() } delete m_spell; - m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) ); connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); @@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent) setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac ); - m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac ); - m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac ); + m_findAction = KStdAction::find( this, TQT_SLOT( slotFind() ), ac ); + m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac ); + m_replaceAction = KStdAction::replace( this, TQT_SLOT( slotReplace() ), ac ); } diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index df8ad1403..6e9d77619 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -4684,7 +4684,7 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha if ( factory->inherits( "KParts::Factory" ) ) res = static_cast(static_cast( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); else - res = static_cast(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className )); + res = static_cast(factory->create( parentWidget, widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 5a3e1ffc1..12087e4a3 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -499,7 +499,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) // initialize QScrollView enableClipper(true); // hack to get unclipped painting on the viewport. - static_cast(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped); + static_cast(viewport())->setWFlags(WPaintUnclipped); setResizePolicy(Manual); viewport()->setMouseTracking(true); @@ -579,7 +579,7 @@ void TDEHTMLView::clear() if ( d->cursor_icon_widget ) d->cursor_icon_widget->hide(); d->reset(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); emit cleared(); TQScrollView::setHScrollBarMode(d->hmode); @@ -911,8 +911,8 @@ void TDEHTMLView::closeChildDialogs() } else { - kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl; - TQT_TQWIDGET(dlg)->hide(); + kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast(dlg) << endl; + static_cast(dlg)->hide(); } } delete dlgs; @@ -1899,9 +1899,9 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) // we need to install an event filter on all children of the viewport to // be able to get correct stacking of children within the document. if(e->type() == TQEvent::ChildInserted) { - TQObject *c = TQT_TQOBJECT(static_cast(e)->child()); + TQObject *c = static_cast(e)->child(); if (c->isWidgetType()) { - TQWidget *w = TQT_TQWIDGET(c); + TQWidget *w = static_cast(c); // don't install the event filter on toplevels if (w->parentWidget(true) == view) { if (!strcmp(w->name(), "__tdehtml")) { @@ -1927,7 +1927,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) } } } else if (o->isWidgetType()) { - TQWidget *v = TQT_TQWIDGET(o); + TQWidget *v = static_cast(o); TQWidget *c = v; while (v && v != view) { c = v; @@ -1936,7 +1936,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) if (v && !strcmp(c->name(), "__tdehtml")) { bool block = false; - TQWidget *w = TQT_TQWIDGET(o); + TQWidget *w = static_cast(o); switch(e->type()) { case TQEvent::Paint: if (!allowWidgetPaintEvents) { diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index 128b77bff..a6ed43f03 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -98,7 +98,7 @@ class UIServerSystemTray:public KSystemTray pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); setPixmap(loadIcon("document-save")); //actionCollection()->action("file_quit")->setEnabled(true); - KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection()); } }; @@ -595,10 +595,10 @@ UIServer::UIServer() // setup toolbar toolBar()->insertButton("edit-delete", TOOL_CANCEL, - TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, - TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()), true, i18n("Settings...")); toolBar()->setBarPos( TDEToolBar::Left ); diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp index 3e6056edd..802acf739 100644 --- a/tdeio/tdefile/kcustommenueditor.cpp +++ b/tdeio/tdefile/kcustommenueditor.cpp @@ -95,10 +95,10 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) m_listView->setFullWidth(true); m_listView->setSorting(-1); KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical); - buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem())); - d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem())); - d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp())); - d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown())); + buttonBox->addButton(i18n("New..."), this, TQT_SLOT(slotNewItem())); + d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem())); + d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp())); + d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown())); buttonBox->layout(); connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); refreshButton(); diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index 8087f206d..cae383742 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -122,11 +122,11 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQT_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); + TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQT_SLOT( slotMkdir() ), this); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); - m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this)); + m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this, + TQT_SLOT( slotShowHiddenFoldersToggled() ), this); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp index c45330893..069746fac 100644 --- a/tdeio/tdefile/kpreviewprops.cpp +++ b/tdeio/tdefile/kpreviewprops.cpp @@ -79,7 +79,7 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items ) void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget ) { - if ( TQT_TQOBJECT(widget) != TQT_TQOBJECT(preview->parent()) ) + if ( widget != preview->parent() ) return; disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index c478058b7..c4be31d02 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages() { KPropsDlgPlugin *plugin = KParts::ComponentFactory ::createInstanceFromLibrary( (*it)->library().local8Bit().data(), - TQT_TQOBJECT(this), + this, (*it)->name().latin1() ); if ( !plugin ) continue; diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index 3d54b9c95..a28512c13 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -112,9 +112,9 @@ public: void connectSignals( TQObject *receiver ) { TQObject *sender; if ( combo ) - sender = TQT_TQOBJECT(combo); + sender = combo; else - sender = TQT_TQOBJECT(edit); + sender = edit; connect( sender, TQT_SIGNAL( textChanged( const TQString& )), receiver, TQT_SIGNAL( textChanged( const TQString& ))); @@ -220,14 +220,14 @@ void KURLRequester::init() widget->installEventFilter( this ); setFocusProxy( widget ); - d->connectSignals( TQT_TQOBJECT(this) ); + d->connectSignals( this ); connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); myCompletion = new KURLCompletion(); d->setCompletionObject( myCompletion ); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() )); + accel->insert( TDEStdAccel::Open, this, TQT_SLOT( slotOpenDialog() )); accel->readSettings(); } diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index c59a6ebff..8d9a27962 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -1253,25 +1253,25 @@ void KDirOperator::slotCompletionMatch(const TQString& match) void KDirOperator::setupActions() { - myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" ); + myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); - upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" ); + upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" ); upAction->setText( i18n("Parent Folder") ); - backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" ); - forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" ); - homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" ); + backAction = KStdAction::back( this, TQT_SLOT( back() ), myActionCollection, "back" ); + forwardAction = KStdAction::forward( this, TQT_SLOT(forward()), myActionCollection, "forward" ); + homeAction = KStdAction::home( this, TQT_SLOT( home() ), myActionCollection, "home" ); homeAction->setText(i18n("Home Folder")); - reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" ); + reloadAction = KStdAction::redisplay( this, TQT_SLOT(rereadDir()), myActionCollection, "reload" ); actionSeparator = new TDEActionSeparator( myActionCollection, "separator" ); d->viewActionSeparator = new TDEActionSeparator( myActionCollection, "viewActionSeparator" ); mkdirAction = new TDEAction( i18n("New Folder..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); + this, TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), + new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this, TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); reloadAction->setText( i18n("Reload") ); @@ -1281,16 +1281,16 @@ void KDirOperator::setupActions() // the sort menu actions sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); byNameAction = new TDERadioAction( i18n("By Name"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ), + this, TQT_SLOT( slotSortByName() ), myActionCollection, "by name" ); byDateAction = new TDERadioAction( i18n("By Date"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ), + this, TQT_SLOT( slotSortByDate() ), myActionCollection, "by date" ); bySizeAction = new TDERadioAction( i18n("By Size"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ), + this, TQT_SLOT( slotSortBySize() ), myActionCollection, "by size" ); reverseAction = new TDEToggleAction( i18n("Reverse"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ), + this, TQT_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); TQString sortGroup = TQString::fromLatin1("sort"); @@ -1325,7 +1325,7 @@ void KDirOperator::setupActions() myActionCollection, "show hidden" ); // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(), - TQT_TQOBJECT(this), + this, TQT_SLOT(slotSeparateDirs()), myActionCollection, "separate dirs" ); TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"), @@ -1348,7 +1348,7 @@ void KDirOperator::setupActions() connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleHidden( bool ) )); - new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this), + new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this, TQT_SLOT(slotProperties()), myActionCollection, "properties" ); } diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 5150d18c1..1b12e8a5b 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -937,7 +937,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleBookmarks( bool )) ); - TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" ); + TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("This is the configuration menu for the file dialog. " "Various options can be accessed from this menu including:
    " "
  • how files are sorted in the list
    • " @@ -1336,7 +1336,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir, const TQString& filter, WId parent_id, const TQString& caption) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KFileDialog dlg(startDir, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1618,7 +1618,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi const TQString& caption) { bool specialDir = dir.at(0) == ':'; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index 4d1fb8a1c..01e14b014 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -59,12 +59,12 @@ public: noArrangement = false; ignoreMaximumSize = false; - smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent), + smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent, TQT_SLOT( slotSmallColumns() ), parent->actionCollection(), "small columns" ); - largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent), + largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent, TQT_SLOT( slotLargeRows() ), parent->actionCollection(), "large rows" ); @@ -75,9 +75,9 @@ public: previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), "show previews" ); - zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ), + zoomIn = KStdAction::zoomIn( parent, TQT_SLOT( zoomIn() ), parent->actionCollection(), "zoomIn" ); - zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ), + zoomOut = KStdAction::zoomOut( parent, TQT_SLOT( zoomOut() ), parent->actionCollection(), "zoomOut" ); previews->setGroup("previews"); diff --git a/tdeio/tdefile/tdefilemetapreview.cpp b/tdeio/tdefile/tdefilemetapreview.cpp index d587511e4..42f40ef9b 100644 --- a/tdeio/tdefile/tdefilemetapreview.cpp +++ b/tdeio/tdefile/tdefilemetapreview.cpp @@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent ) return 0L; } - return dynamic_cast( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" )); + return dynamic_cast( factory->create( parent, "tdefileaudiopreview" )); } void KFileMetaPreview::virtual_hook( int, void* ) {} diff --git a/tdeio/tdeio/kscan.cpp b/tdeio/tdeio/kscan.cpp index b49459771..3ca269da9 100644 --- a/tdeio/tdeio/kscan.cpp +++ b/tdeio/tdeio/kscan.cpp @@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args ); + TQObject *res = factory->create( parent, name, "KScanDialog", args ); return dynamic_cast( res ); } @@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args ); + TQObject *res = factory->create( parent, name, "KOCRDialog", args ); return dynamic_cast( res ); } @@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); + return createDialog( static_cast( parent ), name, modal ); } @@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); + return createDialog( static_cast( parent ), name, modal ); } void KScanDialog::virtual_hook( int id, void* data ) diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 05cf554c0..3f431cb2c 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -927,7 +927,7 @@ void KService::rebuildKSycoca(TQWidget *parent) DCOPClient *client = kapp->dcopClient(); int result = client->callAsync("kded", "tdebuildsycoca", "recreate()", - data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished())); + data, &dlg, TQT_SLOT(slotFinished())); if (result) { diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp index 9b1959110..c41c94a00 100644 --- a/tdeio/tdeio/renamedlg.cpp +++ b/tdeio/tdeio/renamedlg.cpp @@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, lib->unload(); continue; } - TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() ); + TQObject *obj = factory->create( this, (*it)->name().latin1() ); if(!obj) { lib->unload(); continue; } - RenameDlgPlugin *plugin = static_cast(TQT_TQWIDGET(obj)); + RenameDlgPlugin *plugin = static_cast(static_cast(obj)); if(!plugin ){ delete obj; continue; diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp index 3935a91cf..77e6eed99 100644 --- a/tdeio/tdeio/scheduler.cpp +++ b/tdeio/tdeio/scheduler.cpp @@ -865,7 +865,7 @@ Scheduler::_registerWindow(TQWidget *wid) if (!wid) return; - TQObject *obj = TQT_TQOBJECT(wid); + TQObject *obj = wid; if (!m_windowList.contains(obj)) { // We must store the window Id because by the time @@ -873,7 +873,7 @@ Scheduler::_registerWindow(TQWidget *wid) // access TQWidget::winId() (already destructed) WId windowId = wid->winId(); m_windowList.insert(obj, windowId); - connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)), + connect(wid, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotUnregisterWindow(TQObject*))); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); diff --git a/tdeio/tdeio/tdefilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp index c1389695d..d6be6e17c 100644 --- a/tdeio/tdeio/tdefilemetainfo.cpp +++ b/tdeio/tdeio/tdefilemetainfo.cpp @@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const return 0; KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService - ( service, TQT_TQOBJECT(this), mimeType.local8Bit() ); + ( service, this, mimeType.local8Bit() ); if (!plugin) kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl; diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp index 8b2cf86cf..d6ae0f2f2 100644 --- a/tdemdi/tdemdi/dockcontainer.cpp +++ b/tdemdi/tdemdi/dockcontainer.cpp @@ -261,7 +261,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) break; } m_dockManager=w->dockManager(); - m_dragPanel=TQT_TQOBJECT(hdr->dragPanel()); + m_dragPanel=hdr->dragPanel(); if (m_dragPanel) m_movingState=WaitingForMoveStart; delete m_startEvent; m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event)); diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp index 718e9eeee..e4b29eeed 100644 --- a/tdemdi/tdemdi/guiclient.cpp +++ b/tdemdi/tdemdi/guiclient.cpp @@ -88,9 +88,9 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()), actionCollection(),"tdemdi_activate_bottom")); m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQT_SLOT(prevToolViewInDock()), actionCollection(),"tdemdi_prev_toolview")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQT_SLOT(nextToolViewInDock()), actionCollection(),"tdemdi_next_toolview")); actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp index 380c7c2aa..24a3c0fdf 100644 --- a/tdemdi/tdemdi/mainwindow.cpp +++ b/tdemdi/tdemdi/mainwindow.cpp @@ -153,7 +153,7 @@ void MainWindow::setupToolViews () KDockWidget *w=mainDock; if (mainDock->parentDockTabGroup()) { - w=static_cast(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); + w=static_cast(mainDock->parentDockTabGroup()->parent()); } TQPtrList leftReparentWidgets; @@ -162,7 +162,7 @@ void MainWindow::setupToolViews () TQPtrList topReparentWidgets; if (mainDock->parentDockTabGroup()) { - mainDock=static_cast(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); + mainDock=static_cast(mainDock->parentDockTabGroup()->parent()); } findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft); @@ -380,7 +380,7 @@ void MainWindow::findToolViewsDockedToMain(TQPtrList* list,KDockWid KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw); if (widget) { if (widget->parentDockTabGroup()) { - widget=static_cast(TQT_TQWIDGET(widget->parentDockTabGroup()->parent())); + widget=static_cast(widget->parentDockTabGroup()->parent()); } if (widget) { diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp index 19c201800..35ea557a5 100644 --- a/tdemdi/tdemdi/tabwidget.cpp +++ b/tdemdi/tdemdi/tabwidget.cpp @@ -89,7 +89,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child()); + TQObject* pLostChild = ((TQChildEvent*)e)->child(); if ((pLostChild != 0L) && (pLostChild->isWidgetType())) { TQObjectList *list = pLostChild->queryList( "TQWidget" ); list->insert(0, pLostChild); // add the lost child to the list too, just to save code @@ -108,7 +108,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e ) // if we got a new child and we are attached to the MDI system we // install ourself as event filter for the new child and its children // (as we did when we were added to the MDI system). - TQObject* pNewChild = TQT_TQOBJECT(((TQChildEvent*)e)->child()); + TQObject* pNewChild = ((TQChildEvent*)e)->child(); if ((pNewChild != 0L) && (pNewChild->isWidgetType())) { TQWidget* pNewWidget = (TQWidget*)pNewChild; diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp index 48fd7c50d..4bb5d2cf9 100644 --- a/tdemdi/tdemdichildfrm.cpp +++ b/tdemdi/tdemdichildfrm.cpp @@ -1095,7 +1095,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) break; case TQEvent::MouseButtonPress: { - if ( !hasParent( TQT_TQOBJECT(m_pClient), obj ) ) + if ( !hasParent( m_pClient, obj ) ) { bool bIsSecondClick = false; if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() ) @@ -1154,7 +1154,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child()); + TQObject* pLostChild = ( ( TQChildEvent* ) e )->child(); if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) { TQObjectList* list = pLostChild->queryList(); @@ -1176,10 +1176,10 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child we install ourself as event filter for the new // child and its children (as we did when we got our client). // XXX see linkChildren() and focus policy stuff - TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pNewChild != 0L ) && ::tqt_cast( pNewChild ) ) { - TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild ); + TQWidget * pNewWidget = static_cast( pNewChild ); TQObjectList *list = pNewWidget->queryList( "TQWidget" ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp index d2c273175..158920059 100644 --- a/tdemdi/tdemdichildview.cpp +++ b/tdemdi/tdemdichildview.cpp @@ -566,7 +566,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { TQObjectList * list = pLostChild->queryList( "TQWidget" ); @@ -596,7 +596,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child and we are attached to the MDI system we // install ourself as event filter for the new child and its children // (as we did when we were added to the MDI system). - TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) ) { TQWidget * pNewWidget = ( TQWidget* ) pNewChild; diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp index 1e4c95eaf..2d835522d 100644 --- a/tdemdi/tdemdidockcontainer.cpp +++ b/tdemdi/tdemdidockcontainer.cpp @@ -280,7 +280,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) } m_dockManager = w->dockManager(); - m_dragPanel = TQT_TQOBJECT(hdr->dragPanel()); + m_dragPanel = hdr->dragPanel(); if ( m_dragPanel ) m_movingState = WaitingForMoveStart; diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp index 1623da985..0fa6d92d4 100644 --- a/tdemdi/tdemdiguiclient.cpp +++ b/tdemdi/tdemdiguiclient.cpp @@ -161,9 +161,9 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ), actionCollection(), "tdemdi_activate_bottom" ) ); m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ), actionCollection(), "tdemdi_prev_toolview" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ), actionCollection(), "tdemdi_next_toolview" ) ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp index 105b5b099..c265503ff 100644 --- a/tdemdi/tdemdimainfrm.cpp +++ b/tdemdi/tdemdimainfrm.cpp @@ -218,7 +218,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" ); d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(), - TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); + this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); // the MDI view taskbar createTaskBar(); @@ -1291,7 +1291,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList* rootDockWidgetLis KDockWidget* dockWindow = 0L; /* pDockW */ KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */ KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ - TQWidget* pW = TQT_TQWIDGET( ( *it ) ); + TQWidget* pW = static_cast( ( *it ) ); // find the oldest ancestor of the current dockwidget that can be undocked while ( !pW->isTopLevel() ) @@ -1899,7 +1899,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList* list, KDock KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { - widget = static_cast( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) ); + widget = static_cast( widget->parentDockTabGroup() ->parent() ); if ( widget ) { @@ -1931,7 +1931,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock; if ( mainDock->parentDockTabGroup() ) - w = static_cast( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) ); + w = static_cast( mainDock->parentDockTabGroup()->parent() ); TQPtrList leftReparentWidgets; TQPtrList rightReparentWidgets; @@ -1939,7 +1939,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() TQPtrList topReparentWidgets; if ( mainDock->parentDockTabGroup() ) - mainDock = static_cast( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast( mainDock->parentDockTabGroup() ->parent() ); findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); @@ -2137,7 +2137,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW KDockWidget * mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = static_cast( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast( mainDock->parentDockTabGroup() ->parent() ); } if ( widgetNames.count() > 0 ) diff --git a/tdenewstuff/provider.cpp b/tdenewstuff/provider.cpp index 022570b01..862f31ef0 100644 --- a/tdenewstuff/provider.cpp +++ b/tdenewstuff/provider.cpp @@ -389,7 +389,7 @@ void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data ) void ProviderLoader::slotJobResult( TDEIO::Job *job ) { if ( job->error() ) { - job->showErrorDialog( TQT_TQWIDGET(parent()) ); + job->showErrorDialog( static_cast(parent()) ); emit error(); return; } @@ -399,7 +399,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job ) TQDomDocument doc; if ( !doc.setContent( mJobData ) ) { - KMessageBox::error( TQT_TQWIDGET(parent()), i18n("Error parsing providers list.") ); + KMessageBox::error( static_cast(parent()), i18n("Error parsing providers list.") ); emit error(); return; } @@ -417,7 +417,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job ) TQDomElement p = n.toElement(); if ( p.tagName() == "provider" ) { - Provider* prov = new Provider( p, mContentType, TQT_TQWIDGET(parent()) ); + Provider* prov = new Provider( p, mContentType, static_cast(parent()) ); mProviders.append( prov ); connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) ); } diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp index 9c8d72112..7aa5d0212 100644 --- a/tdeparts/dockmainwindow.cpp +++ b/tdeparts/dockmainwindow.cpp @@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f ) : KDockMainWindow( parent, name, f ) { d = new DockMainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } DockMainWindow::~DockMainWindow() @@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp index ce758288b..0b7d1c84c 100644 --- a/tdeparts/factory.cpp +++ b/tdeparts/factory.cpp @@ -77,6 +77,6 @@ Part *Factory::createPartObject( TQWidget *, const char *, TQObject *, const cha TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { assert( !parent || parent->isWidgetType() ); - return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args ); + return createPart( static_cast( parent ), name, parent, name, classname, args ); } #include "factory.moc" diff --git a/tdeparts/historyprovider.cpp b/tdeparts/historyprovider.cpp index 9c893ae53..067895872 100644 --- a/tdeparts/historyprovider.cpp +++ b/tdeparts/historyprovider.cpp @@ -40,7 +40,7 @@ public: HistoryProvider * HistoryProvider::self() { if ( !s_self ) - s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" ); + s_self = new HistoryProvider( kapp, "history provider" ); return s_self; } diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp index b3245da9b..80bfb6071 100644 --- a/tdeparts/mainwindow.cpp +++ b/tdeparts/mainwindow.cpp @@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) : TDEMainWindow( parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::MainWindow( const char *name, WFlags f ) : TDEMainWindow( 0L, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::MainWindow( int cflags, TQWidget* parent, const char *name, WFlags f ) : TDEMainWindow( cflags, parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::~MainWindow() @@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp index 140db74e2..8a41eb18c 100644 --- a/tdeparts/partmanager.cpp +++ b/tdeparts/partmanager.cpp @@ -183,7 +183,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) if ( !obj->isWidgetType() ) return false; - TQWidget *w = TQT_TQWIDGET( obj ); + TQWidget *w = static_cast( obj ); if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) || w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) @@ -419,7 +419,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) //tree recursively (Simon) if ( part && !d->m_bAllowNestedParts ) { - TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory! + TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory! if ( parentPart && parentPart->inherits( "KParts::Part" ) ) { KParts::Part *parPart = static_cast( parentPart ); diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index 608940574..08ec61911 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -41,7 +41,7 @@ public: }; PortValidator::PortValidator(TQWidget *parent, const char *name) -: TQIntValidator(1, 65535, TQT_TQOBJECT(parent), name) +: TQIntValidator(1, 65535, parent, name) { } diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp index a8ec8d425..e2b4423d0 100644 --- a/tdeprint/cups/kmwipp.cpp +++ b/tdeprint/cups/kmwipp.cpp @@ -34,7 +34,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name) m_ID = KMWizard::IPP; m_title = i18n("Remote IPP server"); m_nextpage = KMWizard::IPPSelect; - lineEdit( 1 )->setValidator( new TQIntValidator( TQT_TQOBJECT(this) ) ); + lineEdit( 1 )->setValidator( new TQIntValidator( this ) ); setInfo(i18n("

    Enter the information concerning the remote IPP server " "owning the targeted printer. This wizard will poll the server " diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp index 4dd6966d3..c1a7a442a 100644 --- a/tdeprint/kmuimanager.cpp +++ b/tdeprint/kmuimanager.cpp @@ -144,7 +144,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg) // retrieve the KPrinter object KPrinter *prt(0); if (dlg->parent() && dlg->parent()->isA("KPrintDialog")) - prt = static_cast(TQT_TQWIDGET(dlg->parent()))->printer(); + prt = static_cast(dlg->parent())->printer(); // add margin page if ( ( prt && !prt->fullPage() && prt->applicationType() == KPrinter::Dialog ) diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 849bd9f75..d6cf3a03b 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -489,7 +489,7 @@ void KPrintDialog::setDialogPages(TQPtrList *pages) else { // more than one page. - TQTabWidget *tabs = static_cast(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); + TQTabWidget *tabs = static_cast(d->m_dummy->child("TabWidget", "TQTabWidget")); if (!tabs) { // TQTabWidget doesn't exist. Create it and reparent all @@ -822,7 +822,7 @@ void KPrintDialog::slotWizard() void KPrintDialog::reload() { // remove printer dependent pages (usually from plugin) - TQTabWidget *tabs = static_cast(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); + TQTabWidget *tabs = static_cast(d->m_dummy->child("TabWidget", "TQTabWidget")); for (uint i=0; im_pages.count(); i++) if (d->m_pages.at(i)->onlyRealPrinters()) { @@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { - TQTabWidget *tabs = static_cast(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); + TQTabWidget *tabs = static_cast(d->m_dummy->child("TabWidget", "TQTabWidget")); tabs->setTabEnabled( d->m_pages.at( index ), flag ); } else diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index e7d8f5728..0684c3428 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) // create main view and actions setMainWidget(d->mainwidget_); if (previewOnly) - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); + KStdAction::close(this, TQT_SLOT(reject()), d->actions_, "close_print"); else { - new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); - new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); + new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQT_SLOT(accept()), d->actions_, "continue_print"); + new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQT_SLOT(reject()), d->actions_, "stop_print"); } } @@ -171,7 +171,7 @@ KPrintPreview::~KPrintPreview() void KPrintPreview::initView(KLibFactory *factory) { // load the component - d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(TQT_TQOBJECT(d->mainwidget_), "gvpart", "KParts::ReadOnlyPart"); + d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(d->mainwidget_, "gvpart", "KParts::ReadOnlyPart"); // populate the toolbar if (d->previewonly_) @@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId conf->setGroup("General"); KLibFactory *factory(0); bool externalPreview = conf->readBoolEntry("ExternalPreview", false); - TQWidget *parentW = TQT_TQWIDGET(TQWidget::find(parentId)); + TQWidget *parentW = TQWidget::find(parentId); TQString exe; if (!externalPreview && isPS && (factory = componentFactory()) != 0) { diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 6511a8d61..ba1e30204 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -261,10 +261,10 @@ void KMJobViewer::init() void KMJobViewer::initActions() { // job actions - TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); - TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); - TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); - TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); + TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQT_SLOT(slotHold()),actionCollection(),"job_hold"); + TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQT_SLOT(slotResume()),actionCollection(),"job_resume"); + TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); + TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); mact->setDelayed(false); connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); @@ -324,12 +324,12 @@ void KMJobViewer::initActions() } else {// stand-alone application - KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection()); - KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); + KStdAction::quit(kapp,TQT_SLOT(quit()),actionCollection()); + KStdAction::close(this,TQT_SLOT(slotClose()),actionCollection()); + KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); // refresh action - new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); + new TDEAction(i18n("Refresh"),"reload",0,this,TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); // create status bar KStatusBar *statusbar = statusBar(); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index 6b75edba6..c13c6930c 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -183,23 +183,23 @@ void KMMainView::initActions() TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); - - new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); - new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); - new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); - new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); - new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); - new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); + stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + + new TDEAction(i18n("&Remove"),"edittrash",0,this,TQT_SLOT(slotRemove()),m_actions,"printer_remove"); + new TDEAction(i18n("&Configure..."),"configure",0,this,TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); + new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQT_SLOT(slotAdd()),m_actions,"printer_add"); + new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQT_SLOT(slotTest()),m_actions,"printer_test"); + new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQT_SLOT(slotInit()),m_actions,"view_refresh"); TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); iconlst.clear(); @@ -208,9 +208,9 @@ void KMMainView::initActions() dact->setCurrentItem(0); connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); - new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); - new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); - new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); + new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); + new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); @@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID) { TQStringList args; args << m_current->device() << m_current->printerName(); - KDialogBase *dlg = static_cast(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args))); + KDialogBase *dlg = static_cast(factory->create(this, "Tool", 0, args)); if (dlg) dlg->exec(); delete dlg; diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index aa0648e6b..d97f66646 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this ); d->timer = new TQTimer( this ); #ifdef USE_QSOCKET - d->socket = new TQSocket( TQT_TQOBJECT(this) ); + d->socket = new TQSocket( this ); #else d->socket = new KExtendedSocket(); #endif diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index 984880190..1ca19fecd 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -37,7 +37,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_useproxy->setCursor(KCursor::handCursor()); m_proxyhost = new TQLineEdit(this); m_proxyport = new TQLineEdit(this); - m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport))); + m_proxyport->setValidator(new TQIntValidator(m_proxyport)); m_hostlabel->setBuddy(m_proxyhost); m_portlabel->setBuddy(m_proxyport); diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index a3a395aaf..f1584bbe3 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -42,14 +42,14 @@ protected: TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList()) { Q_UNUSED(className); - KDialogBase *dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); + KDialogBase *dlg = new KDialogBase(static_cast(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); EscpWidget *w = new EscpWidget(dlg); if (args.count() > 0) w->setDevice(args[0]); if (args.count() > 1) w->setPrinterName(args[1]); dlg->setMainWidget(w); - return TQT_TQOBJECT(dlg); + return dlg; } }; diff --git a/tderandr/ktimerdialog.cpp b/tderandr/ktimerdialog.cpp index eba497372..ed59dac97 100644 --- a/tderandr/ktimerdialog.cpp +++ b/tderandr/ktimerdialog.cpp @@ -98,7 +98,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget ) if ( widget->parentWidget() != mainWidget ) { widget->reparent( newWidget, 0, TQPoint(0,0) ); } else { - newWidget->insertChild( TQT_TQOBJECT(widget) ); + newWidget->insertChild( widget ); } timerWidget->reparent( newWidget, 0, TQPoint(0, 0) ); diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp index 917380957..50173beae 100644 --- a/tderesources/configpage.cpp +++ b/tderesources/configpage.cpp @@ -123,12 +123,12 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) groupBoxLayout->addWidget( mListView, 1, 0 ); connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) ); KButtonBox *buttonBox = new KButtonBox( groupBox, TQt::Vertical ); - mAddButton = buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()) ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT(slotRemove()) ); + mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT(slotAdd()) ); + mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT(slotRemove()) ); mRemoveButton->setEnabled( false ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT(slotEdit()) ); + mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT(slotEdit()) ); mEditButton->setEnabled( false ); - mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), TQT_TQOBJECT(this), TQT_SLOT(slotStandard()) ); + mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQT_SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); buttonBox->layout(); diff --git a/tderesources/selectdialog.cpp b/tderesources/selectdialog.cpp index e6207cc3c..55adffcb1 100644 --- a/tderesources/selectdialog.cpp +++ b/tderesources/selectdialog.cpp @@ -57,8 +57,8 @@ SelectDialog::SelectDialog( TQPtrList list, TQWidget *parent, KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp index 0c45f3cd1..a47c7664b 100644 --- a/tdespell2/ui/dialog.cpp +++ b/tdespell2/ui/dialog.cpp @@ -69,7 +69,7 @@ Dialog::Dialog( BackgroundChecker *checker, initGui(); initConnections(); - setMainWidget( TQT_TQWIDGET(d->ui) ); + setMainWidget( static_cast(d->ui) ); } Dialog::~Dialog() @@ -79,27 +79,27 @@ Dialog::~Dialog() void Dialog::initConnections() { - connect( TQT_TQOBJECT(d->ui->m_addBtn), TQT_SIGNAL(clicked()), + connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWord()) ); - connect( TQT_TQOBJECT(d->ui->m_replaceBtn), TQT_SIGNAL(clicked()), + connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotReplaceWord()) ); - connect( TQT_TQOBJECT(d->ui->m_replaceAllBtn), TQT_SIGNAL(clicked()), + connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotReplaceAll()) ); - connect( TQT_TQOBJECT(d->ui->m_skipBtn), TQT_SIGNAL(clicked()), + connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSkip()) ); - connect( TQT_TQOBJECT(d->ui->m_skipAllBtn), TQT_SIGNAL(clicked()), + connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSkipAll()) ); - connect( TQT_TQOBJECT(d->ui->m_suggestBtn), TQT_SIGNAL(clicked()), + connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuggest()) ); - connect( TQT_TQOBJECT(d->ui->m_language), TQT_SIGNAL(activated(const TQString&)), + connect( d->ui->m_language, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotChangeLanguage(const TQString&)) ); - connect( TQT_TQOBJECT(d->ui->m_suggestions), TQT_SIGNAL(selectionChanged(TQListViewItem*)), + connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), + connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)), TQT_SIGNAL(misspelling(const TQString&, int)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), + connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)), TQT_SLOT(slotMisspelling(const TQString&, int)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(done()), + connect( d->checker, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) ); connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT( slotReplaceWord() ) ); diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp index 45739cff9..ab6123fb4 100644 --- a/tdestyles/asteroid/asteroid.cpp +++ b/tdestyles/asteroid/asteroid.cpp @@ -107,7 +107,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to? bool isProtectedObject = false; - TQObject *curparent = TQT_TQOBJECT(w); + TQObject *curparent = w; while (curparent) { if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem") || curparent->inherits("KJanusWidget") diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp index e2b2ccdaa..5f82d8f0a 100644 --- a/tdestyles/highcolor/highcolor.cpp +++ b/tdestyles/highcolor/highcolor.cpp @@ -2032,14 +2032,14 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *widget = TQT_TQWIDGET(object); - TQWidget *parent = TQT_TQWIDGET(object->parent()); + TQWidget *widget = static_cast(object); + TQWidget *parent = static_cast(object->parent()); int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = TQT_TQWIDGET(parent->parent()); + parent = static_cast(parent->parent()); } TQRect r = ceData.rect; @@ -2067,7 +2067,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData if ( event->type() == TQEvent::Paint ) { - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast(object); TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect; TQPainter p( widget ); renderGradient(&p, wr, toolbar->colorGroup().button(), diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index 23642ac99..1955554ba 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -423,7 +423,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void KeramikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(static_cast(TQT_TQWIDGET(obj))); + progAnimWidgets.remove(static_cast(obj)); } @@ -487,13 +487,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *parent = (widget)?TQT_TQWIDGET(widget->parentWidget()):(TQWidget*)NULL; + TQWidget *parent = (widget)?widget->parentWidget():NULL; int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = TQT_TQWIDGET(parent->parent()); + parent = static_cast(parent->parent()); } TQRect pr = ceData.parentWidgetData.rect; @@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, if (kickerMode) { if (p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(p->device())->className()) == "FittsLawFrame" ) + TQCString(static_cast(p->device())->className()) == "FittsLawFrame" ) { int x2 = x + r.width() - 1; int y2 = y + r.height() - 1; @@ -1284,7 +1284,7 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQToolBar* parent = 0; if (widget && widget->parent() && widget->parent()->inherits("TQToolBar")) - parent = static_cast(TQT_TQWIDGET(widget->parent())); + parent = static_cast(widget->parent()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal)); if (flags & Style_Horizontal) { @@ -2312,8 +2312,8 @@ void KeramikStyle::drawComplexControl( ComplexControl control, { // This assumes floating toolbars can't have extenders, //(so if we're on an extender, we're not floating) - TQWidget* parent = static_cast (TQT_TQWIDGET(widget->parent())); - TQToolBar* toolbar = static_cast(TQT_TQWIDGET(parent->parent())); + TQWidget* parent = static_cast (static_cast(widget->parent())); + TQToolBar* toolbar = static_cast(parent->parent()); TQRect tr = ceData.parentWidgetData.rect; bool horiz = ceData.toolBarData.orientation == TQt::Horizontal; @@ -2809,7 +2809,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, recursion = true; object->event( static_cast( event ) ); - TQWidget* widget = TQT_TQWIDGET( object ); + TQWidget* widget = static_cast( object ); TQPainter p( widget ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, widget->palette().color( TQPalette::Active, TQColorGroup::Button ), @@ -2826,7 +2826,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, //Combo dropdowns are shaped case TQEvent::Resize: { - TQListBox* listbox = static_cast(TQT_TQWIDGET(object)); + TQListBox* listbox = static_cast(object); TQResizeEvent* resize = static_cast(event); if (resize->size().height() < 6) return false; @@ -2892,7 +2892,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, firstComboPopupRelease = false; TQMouseEvent* mev = static_cast(event); - TQListBox* box = static_cast(TQT_TQWIDGET(object)); + TQListBox* box = static_cast(object); TQWidget* parent = box->parentWidget(); if (!parent) @@ -2919,7 +2919,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { // Draw a gradient background for custom widgets in the toolbar // that have specified a "tde toolbar widget" name. - renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object)); + renderToolbarWidgetBackground(0, ceData, elementFlags, static_cast(object)); return false; // Now draw the contents } @@ -2931,8 +2931,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { // We need to override the paint event to draw a // gradient on a QToolBarExtensionWidget. - TQToolBar* toolbar = static_cast(TQT_TQWIDGET(object->parent())); - TQWidget* widget = TQT_TQWIDGET(object); + TQToolBar* toolbar = static_cast(object->parent()); + TQWidget* widget = static_cast(object); TQRect wr = widget->rect (), tr = toolbar->rect(); TQPainter p( widget ); diff --git a/tdestyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp index 823e737ea..1dcfadf56 100644 --- a/tdestyles/klegacy/klegacystyle.cpp +++ b/tdestyles/klegacy/klegacystyle.cpp @@ -2214,7 +2214,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { key.data.shadow = KLegacy::In; } else { key.data.state = ((btn->isEnabled()) ? - ((static_cast( btn ) == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) : + ((btn == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) : KLegacy::Insensitive); key.data.shadow = ((btn->isOn() || btn->isDown()) ? KLegacy::In : KLegacy::Out); diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp index ba59f5b7f..0316ded89 100644 --- a/tdestyles/kthemestyle/kthemestyle.cpp +++ b/tdestyles/kthemestyle/kthemestyle.cpp @@ -486,7 +486,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C if(event->type() == TQEvent::Move || event->type() == TQEvent::Resize || event->type() == TQEvent::Show) { - TQWidget *w = TQT_TQWIDGET(object); + TQWidget *w = static_cast(object); TQPoint pos(0, 0); pos = w->mapTo(w->topLevelWidget(), pos); TQPixmap pix(uncached( Background )->size()); @@ -508,7 +508,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C } if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits("TQLabel")) { - TQWidget* lb = TQT_TQWIDGET(object); + TQWidget* lb = static_cast(object); if (lb->backgroundMode() == TQt::PaletteButton) lb->setBackgroundMode(TQt::PaletteBackground); removeObjectEventHandler(ceData, elementFlags, source, this); diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 2cca2613f..29e724418 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -316,12 +316,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj) { - tdehtmlWidgets.remove(TQT_TQWIDGET(obj)); + tdehtmlWidgets.remove(static_cast(obj)); } void PlastikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(TQT_TQWIDGET(obj)); + progAnimWidgets.remove(static_cast(obj)); } void PlastikStyle::renderContour(TQPainter *p, @@ -894,7 +894,7 @@ void PlastikStyle::renderPanel(TQPainter *p, if (kickerMode && p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(p->device())->className()) == "FittsLawFrame") { + TQCString(static_cast(p->device())->className()) == "FittsLawFrame") { // Stolen wholesale from Keramik. I don't like it, but oh well. if (sunken) { const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; @@ -3512,7 +3512,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, } if ( !qstrcmp(obj->name(), "tde toolbar widget") ) { - TQWidget* lb = TQT_TQWIDGET(obj); + TQWidget* lb = static_cast(obj); if (lb->backgroundMode() == TQt::PaletteButton) lb->setBackgroundMode(TQt::PaletteBackground); removeObjectEventHandler(ceData, elementFlags, source, this); diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 76ec10bf2..485c5e06e 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -407,7 +407,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); - TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); + TQValidator* const validator = new TQRegExpValidator( rx, this ); d->unicodeLine = new KLineEdit( bar ); d->unicodeLine->setValidator(validator); diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index d80e317af..8bfcd8084 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -1006,7 +1006,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 2); d->hedit = new KColorSpinBox( 0, 359, 1, page ); - d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) ); + d->hedit->setValidator( new TQIntValidator( d->hedit ) ); l_lbot->addWidget(d->hedit, 0, 3); connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1015,7 +1015,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 1, 2); d->sedit = new KColorSpinBox( 0, 255, 1, page ); - d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) ); + d->sedit->setValidator( new TQIntValidator( d->sedit ) ); l_lbot->addWidget(d->sedit, 1, 3); connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1024,7 +1024,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 2); d->vedit = new KColorSpinBox( 0, 255, 1, page ); - d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) ); + d->vedit->setValidator( new TQIntValidator( d->vedit ) ); l_lbot->addWidget(d->vedit, 2, 3); connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1036,7 +1036,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 4); d->redit = new KColorSpinBox( 0, 255, 1, page ); - d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) ); + d->redit->setValidator( new TQIntValidator( d->redit ) ); l_lbot->addWidget(d->redit, 0, 5); connect( d->redit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1045,7 +1045,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget( label, 1, 4); d->gedit = new KColorSpinBox( 0, 255,1, page ); - d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) ); + d->gedit->setValidator( new TQIntValidator( d->gedit ) ); l_lbot->addWidget(d->gedit, 1, 5); connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1054,7 +1054,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 4); d->bedit = new KColorSpinBox( 0, 255, 1, page ); - d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) ); + d->bedit->setValidator( new TQIntValidator( d->bedit ) ); l_lbot->addWidget(d->bedit, 2, 5); connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1131,28 +1131,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label = new TQLabel( page ); label->setText(i18n("Name:")); - l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, TQt::AlignLeft); + l_grid->addWidget(label, 0, 1, TQt::AlignLeft); d->colorName = new TQLabel( page ); - l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, TQt::AlignLeft); + l_grid->addWidget(d->colorName, 0, 2, TQt::AlignLeft); label = new TQLabel( page ); label->setText(i18n("HTML:")); - l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, TQt::AlignLeft); + l_grid->addWidget(label, 1, 1, TQt::AlignLeft); d->htmlName = new KLineEdit( page ); d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); d->htmlName->setFixedWidth(w); - l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, TQt::AlignLeft); + l_grid->addWidget(d->htmlName, 1, 2, TQt::AlignLeft); connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( slotHtmlChanged() ) ); d->patch = new KColorPatch( page ); d->patch->setFixedSize(48, 48); - l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); + l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), TQT_SLOT( setColor( const TQColor&))); @@ -1532,7 +1532,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e ) TQColor KColorDialog::grabColor(const TQPoint &p) { - TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget *desktop = TQApplication::desktop(); TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1); TQImage i = pm.convertToImage(); return i.pixel(0,0); diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index 6212b4e52..b0d55f246 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -84,7 +84,7 @@ public: KDateValidator::KDateValidator(TQWidget* parent, const char* name) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { } @@ -158,12 +158,12 @@ KDateTable::~KDateTable() void KDateTable::initAccels() { TDEAccel* accel = new TDEAccel(this, "date table accel"); - accel->insert(TDEStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth())); - accel->insert(TDEStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth())); - accel->insert(TDEStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth())); - accel->insert(TDEStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth())); - accel->insert(TDEStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek())); - accel->insert(TDEStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek())); + accel->insert(TDEStdAccel::Next, this, TQT_SLOT(nextMonth())); + accel->insert(TDEStdAccel::Prior, this, TQT_SLOT(previousMonth())); + accel->insert(TDEStdAccel::Home, this, TQT_SLOT(beginningOfMonth())); + accel->insert(TDEStdAccel::End, this, TQT_SLOT(endOfMonth())); + accel->insert(TDEStdAccel::BeginningOfLine, this, TQT_SLOT(beginningOfWeek())); + accel->insert(TDEStdAccel::EndOfLine, this, TQT_SLOT(endOfWeek())); accel->readSettings(); } @@ -609,7 +609,7 @@ void KDateTable::unsetCustomDatePainting( const TQDate &date ) KDateInternalWeekSelector::KDateInternalWeekSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -850,7 +850,7 @@ KDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) KDateInternalYearSelector::KDateInternalYearSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -1008,7 +1008,7 @@ TDEPopupFrame::exec(TQPoint pos) popup(pos); repaint(); d->exec = true; - const TQGuardedPtr that = TQT_TQOBJECT(this); + const TQGuardedPtr that = this; tqApp->enter_loop(); if ( !that ) return TQDialog::Rejected; diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index fcf960aa8..ef26821f0 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -219,7 +219,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); #endif - d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); + d = new KDockWidgetHeaderPrivate( this ); layout = new TQHBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); @@ -498,7 +498,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( TQT_TQOBJECT(this) ); + manager->childDock->append( this ); installEventFilter( manager ); eDocking = DockFullDocking; @@ -562,8 +562,8 @@ KDockWidget::~KDockWidget() } } emit iMBeingClosed(); - if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); - manager->childDock->remove(TQT_TQOBJECT(this)); + if (manager->d) manager->d->containerDocks.remove(this); + manager->childDock->remove(this); delete pix; delete d; // destroy private data d=0; @@ -930,7 +930,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) static_cast(((KDockSplitter*)(parent()))->getLast()); if (neighbor==this) - return (static_cast(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast(parent()->parent())->findNearestDockWidget(pos)); else if (neighbor->getWidget() && (::tqt_cast(neighbor->getWidget()))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); @@ -938,7 +938,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) return neighbor; } else - return (static_cast(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast(parent()->parent())->findNearestDockWidget(pos)); return 0; } @@ -1466,7 +1466,7 @@ void KDockWidget::setWidget( TQWidget* mw ) if (dc) { d->isContainer=true; - manager->d->containerDocks.append(TQT_TQOBJECT(this)); + manager->d->containerDocks.append(this); } else { @@ -1860,8 +1860,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L; if (dynamic_cast(w)) return 0L; if (!childDockWidgetList) return 0L; @@ -2512,7 +2512,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget) { if (!autoCreateDock) return; autoCreateDock->setAutoDelete(false); - autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); + autoCreateDock->removeRef(pDockWidget); autoCreateDock->setAutoDelete(true); } @@ -2890,7 +2890,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName ) if ( autoCreateDock ){ kdDebug(282)<<"Autocreating dock: "<append( TQT_TQOBJECT(autoCreate) ); + autoCreateDock->append( autoCreate ); } return autoCreate; } diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 703c8f030..685301ab8 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade void KJanusWidget::pageGone( TQObject *obj ) { - removePage( TQT_TQWIDGET( obj ) ); + removePage( static_cast( obj ) ); } void KJanusWidget::slotReopen( TQListViewItem * item ) @@ -435,14 +435,14 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, if( mFace == Tabbed ) { mTabControl->addTab (page, items.last()); - d->mIntToPage[d->mNextPageIndex] = static_cast(page); - d->mPageToInt[static_cast(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; d->mNextPageIndex++; } else if( mFace == TreeList || mFace == IconList ) { - d->mIntToPage[d->mNextPageIndex] = static_cast(page); - d->mPageToInt[static_cast(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; mPageStack->addWidget( page, 0 ); if (items.isEmpty()) { diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index 92cc5d0ca..ac3722a7a 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -1008,7 +1008,7 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) { if( o == this ) { - KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev ); + KCursor::autoHideEventFilter( this, ev ); if ( ev->type() == TQEvent::AccelOverride ) { TQKeyEvent *e = static_cast( ev ); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 4a16c97c6..fbbf4dd9a 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -901,7 +901,7 @@ class KDoubleSpinBoxValidator : public KDoubleValidator { public: KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name ) - : KDoubleValidator( bottom, top, decimals, TQT_TQOBJECT(sb), name ), spinBox( sb ) { } + : KDoubleValidator( bottom, top, decimals, sb, name ), spinBox( sb ) { } virtual State validate( TQString& str, int& pos ) const; diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp index 6cf486ad1..62099dd32 100644 --- a/tdeui/knumvalidator.cpp +++ b/tdeui/knumvalidator.cpp @@ -35,7 +35,7 @@ // KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _base = base; if (_base < 2) _base = 2; @@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) } KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _base = base; if (_base > 36) _base = 36; @@ -162,7 +162,7 @@ public: KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) } KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, } KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers = localeAware; diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index 64a190d77..22ca4428c 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -146,15 +146,15 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch) if (watch) { - if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) == -1) + if (d->watchedForFocus.find(widget) == -1) { - d->watchedForFocus.append(TQT_TQOBJECT(widget)); + d->watchedForFocus.append(widget); widget->installEventFilter(this); } } - else if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) != -1) + else if (d->watchedForFocus.find(widget) != -1) { - d->watchedForFocus.remove(TQT_TQOBJECT(widget)); + d->watchedForFocus.remove(widget); widget->removeEventFilter(this); } } diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp index c2adb7c1f..48ee280a0 100644 --- a/tdeui/kpixmapregionselectorwidget.cpp +++ b/tdeui/kpixmapregionselectorwidget.cpp @@ -141,13 +141,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), - TQT_TQOBJECT(popup), "rotateclockwise"); + 0, this, TQT_SLOT(rotateClockwise()), + popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), - TQT_TQOBJECT(popup), "rotatecounterclockwise"); + 0, this, TQT_SLOT(rotateCounterclockwise()), + popup, "rotatecounterclockwise"); action->plug(popup); /* diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 3dd9fbaf7..7d4497d5a 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -77,12 +77,12 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) menu = new TDEPopupMenu( this ); menu->insertTitle( kapp->miniIcon(), kapp->caption() ); move( -1000, -1000 ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection); if (parentWidget()) { new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), + this, TQT_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index e0208be82..ac0b567e8 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -351,7 +351,7 @@ void KTextEdit::checkSpelling() { delete d->spell; d->spell = new KSpell( this, i18n( "Spell Checking" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); connect( d->spell, TQT_SIGNAL( death() ), this, TQT_SLOT( spellCheckerFinished() ) ); diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index 5774be8c0..c3dd1c233 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -205,7 +205,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ TQCString name = element.attribute( d->attrName ).utf8(); - TDEToolBar *bar = static_cast(TQT_TQWIDGET(d->m_widget->child( name, "TDEToolBar" ))); + TDEToolBar *bar = static_cast(d->m_widget->child( name, "TDEToolBar" )); if( !bar ) { bar = new TDEToolBar( d->m_widget, name, honor, false ); diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 2429737ab..d1c3b004e 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -421,7 +421,7 @@ static int qxembed_x11_event_filter( XEvent* e) // L0671: Keep Qt message time up to date if ( msgtime > get_tqt_x_time() ) set_tqt_x_time(msgtime); - TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; switch ( message) { @@ -525,7 +525,7 @@ static int qxembed_x11_event_filter( XEvent* e) } } else if ( e->xclient.format == 32 && e->xclient.message_type ) { if ( e->xclient.message_type == tqt_wm_protocols ) { - TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; // L0690: This is for the embedding side! diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp index 9f6bf24b2..b2b09e6a2 100644 --- a/tdeui/tdeaboutdialog.cpp +++ b/tdeui/tdeaboutdialog.cpp @@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void ) { if( mShowHeader ) { - gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQt::AlignmentFlags)AlignLeft ); - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( mLabel[i], r, 0, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft ); mLabel[i]->show(); mText[i]->show(); } @@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void ) mLabel[i]->hide(); if( !i ) { - gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft ); + gbox->addMultiCellWidget( mText[i], r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft ); } else { - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft ); } mText[i]->show(); } @@ -800,7 +800,7 @@ void TDEAboutContainer::childEvent( TQChildEvent *e ) ++itr; if( o->isWidgetType() ) { - TQT_TQWIDGET(o)->setMinimumWidth( s.width() ); + static_cast(o)->setMinimumWidth( s.width() ); } } } @@ -826,7 +826,7 @@ TQSize TDEAboutContainer::sizeHint( void ) const if( o->isWidgetType() ) { ++numChild; - TQWidget* const w= TQT_TQWIDGET(o); + TQWidget* const w= static_cast(o); TQSize s = w->minimumSize(); if( s.isEmpty() ) diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 052382851..9905d2991 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -433,7 +433,7 @@ bool TDEMainWindow::restore( int number, bool show ) KXMLGUIFactory *TDEMainWindow::guiFactory() { if ( !factory_ ) - factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" ); + factory_ = new KXMLGUIFactory( this, this, "guifactory" ); return factory_; } @@ -467,7 +467,7 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & if( options & ToolBar ){ setStandardToolBarMenuEnabled( true ); - KStdAction::configureToolbars(TQT_TQOBJECT(this), + KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars() ), actionCollection()); } @@ -804,7 +804,7 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const void TDEMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp index 0404249b0..a18fb80ed 100644 --- a/tdeui/tdemainwindowiface.cpp +++ b/tdeui/tdemainwindowiface.cpp @@ -34,7 +34,7 @@ TDEMainWindowInterface::TDEMainWindowInterface(TDEMainWindow * mainWindow) { m_MainWindow = mainWindow; m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this ); - m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow)); + m_dcopPropertyProxy = new KDCOPPropertyProxy(m_MainWindow); } TDEMainWindowInterface::~TDEMainWindowInterface() diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp index f4fbc84bb..728540ede 100644 --- a/tdeui/tdemessagebox.cpp +++ b/tdeui/tdemessagebox.cpp @@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No, @@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownContinue(dontAskAgainName) ) return Continue; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -755,7 +755,7 @@ void KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes, @@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -832,7 +832,7 @@ void KMessageBox::sorryWId(WId parent_id, const TQString &text, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes, @@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri if ( !shouldBeShownContinue(dontShowAgainName) ) return; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Information") : caption, KDialogBase::Yes, diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 651e789a9..73d9ec2b8 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -1350,7 +1350,7 @@ TQSize TDEToolBar::sizeHint() const ncThis->polish(); - int margin = static_cast(ncThis)->layout()->margin() + frameWidth(); + int margin = ncThis->layout()->margin() + frameWidth(); switch( barPos() ) { case TDEToolBar::Top: diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp index bc2df2f66..8e07dde71 100644 --- a/tdeui/twindowlistmenu.cpp +++ b/tdeui/twindowlistmenu.cpp @@ -85,7 +85,7 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection: KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name) { - twin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(this); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); } diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp index eb7567a6d..73f6c471c 100644 --- a/tdeutils/kcmultidialog.cpp +++ b/tdeutils/kcmultidialog.cpp @@ -338,7 +338,7 @@ void KCMultiDialog::removeAllModules() { kdDebug( 710 ) << "remove 2" << endl; TDECModuleProxy * kcm = ( *it ).kcm; - TQObject * page = TQT_TQOBJECT(kcm->parent()); + TQObject * page = kcm->parent(); kcm->hide(); if( page ) { diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp index 6444595b3..9162d0ffc 100644 --- a/tdeutils/kfinddialog.cpp +++ b/tdeutils/kfinddialog.cpp @@ -439,7 +439,7 @@ void KFindDialog::showPatterns() { if ( !d->m_regexpDialogQueryDone ) { - d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString(), this ); d->m_regexpDialogQueryDone = true; } diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp index 174226ed2..907060ec7 100644 --- a/tdeutils/tdecmoduleloader.cpp +++ b/tdeutils/tdecmoduleloader.cpp @@ -72,7 +72,7 @@ TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &li KLibFactory *factory = lib->factory(); if ( factory ) { - TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args ); + TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory( factory, parent, name ? name : mod.handle().latin1(), args ); if (module) return module; } diff --git a/tdewallet/client/tdewallet.cpp b/tdewallet/client/tdewallet.cpp index c730f10d4..85205d7e3 100644 --- a/tdewallet/client/tdewallet.cpp +++ b/tdewallet/client/tdewallet.cpp @@ -179,7 +179,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) { } // avoid deadlock if the app has some popup open (#65978/#71048) - while( TQWidget* widget = TQT_TQWIDGET(tqApp->activePopupWidget())) + while( TQWidget* widget = tqApp->activePopupWidget()) widget->close(); bool isPath = ot == Path;